From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH RFC V6 2/5] kvm : Fold pv_unhalt flag into GET_MP_STATE ioctl to aid migration Date: Sun, 29 Apr 2012 16:27:58 +0300 Message-ID: <4F9D41DE.3080100@redhat.com> References: <20120423095937.30893.14776.sendpatchset@codeblue.in.ibm.com> <20120423100002.30893.60584.sendpatchset@codeblue.in.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120423100002.30893.60584.sendpatchset@codeblue.in.ibm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Raghavendra K T Cc: Jeremy Fitzhardinge , X86 , KVM , linux-doc@vger.kernel.org, LKML , Greg Kroah-Hartman , Konrad Rzeszutek Wilk , Ingo Molnar , Srivatsa Vaddagiri , Sasha Levin , "H. Peter Anvin" , Virtualization , Xen , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On 04/23/2012 01:00 PM, Raghavendra K T wrote: > From: Raghavendra K T > > Signed-off-by: Raghavendra K T > --- > 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; > } Not pretty. Suggest rewriting using an if. -- error compiling committee.c: too many arguments to function