[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120423100002.30893.60584.sendpatchset@codeblue.in.ibm.com>
Date: Mon, 23 Apr 2012 15:30:02 +0530
From: Raghavendra K T <raghavendra.kt@...ux.vnet.ibm.com>
To: Jeremy Fitzhardinge <jeremy@...p.org>,
Greg Kroah-Hartman <gregkh@...e.de>,
Alexander Graf <agraf@...e.de>,
Randy Dunlap <rdunlap@...otime.net>, linux-doc@...r.kernel.org,
KVM <kvm@...r.kernel.org>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>,
Stefano Stabellini <stefano.stabellini@...citrix.com>,
X86 <x86@...nel.org>, Gleb Natapov <gleb@...hat.com>,
Virtualization <virtualization@...ts.linux-foundation.org>,
Marcelo Tosatti <mtosatti@...hat.com>,
Avi Kivity <avi@...hat.com>,
LKML <linux-kernel@...r.kernel.org>
Cc: Raghavendra K T <raghavendra.kt@...ux.vnet.ibm.com>,
Xen <xen-devel@...ts.xensource.com>,
Srivatsa Vaddagiri <vatsa@...ux.vnet.ibm.com>,
Sasha Levin <levinsasha928@...il.com>
Subject: [PATCH RFC V6 2/5] kvm : Fold pv_unhalt flag into GET_MP_STATE ioctl to aid migration
From: Raghavendra K T <raghavendra.kt@...ux.vnet.ibm.com>
Signed-off-by: Raghavendra K T <raghavendra.kt@...ux.vnet.ibm.com>
---
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6faa550..7354c1b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5691,7 +5691,9 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
- mp_state->mp_state = vcpu->arch.mp_state;
+ mp_state->mp_state = (vcpu->arch.mp_state == KVM_MP_STATE_HALTED &&
+ vcpu->arch.pv.pv_unhalted) ?
+ KVM_MP_STATE_RUNNABLE : vcpu->arch.mp_state;
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists