From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCHv3 0/4] Add support for some HYPER-V PV features Date: Tue, 19 Jan 2010 15:06:38 +0200 Message-ID: <20100119130638.GO14345@redhat.com> References: <1263736284-18780-1-git-send-email-gleb@redhat.com> <4B559A84.1040509@siemens.com> <20100119125024.GN14345@redhat.com> <4B55AB48.60900@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jan Kiszka , mtosatti@redhat.com, kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from mx1.redhat.com ([209.132.183.28]:26355 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323Ab0ASNGm (ORCPT ); Tue, 19 Jan 2010 08:06:42 -0500 Content-Disposition: inline In-Reply-To: <4B55AB48.60900@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, Jan 19, 2010 at 02:53:28PM +0200, Avi Kivity wrote: > On 01/19/2010 02:50 PM, Gleb Natapov wrote: > > > >This should fix it: > > Unrelated, but important: > > >diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > >index 47c6e23..147bda7 100644 > >--- a/arch/x86/kvm/x86.c > >+++ b/arch/x86/kvm/x86.c > >@@ -3807,11 +3807,11 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) > > longmode = is_long_mode(vcpu)&& cs_l == 1; > > > > if (!longmode) { > >- param = (kvm_register_read(vcpu, VCPU_REGS_RDX)<< 32) | > >+ param = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDX)<< 32) | > > (kvm_register_read(vcpu, VCPU_REGS_RAX)& 0xffffff); > > This seems to be written for a 24-bit machine... > I have plenty of those around. --- Fix compilation warnings and wrong mask value. Signed-off-by: Gleb Natapov diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 47c6e23..a311751 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3807,12 +3807,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) longmode = is_long_mode(vcpu) && cs_l == 1; if (!longmode) { - param = (kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) | - (kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffff); - ingpa = (kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) | - (kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffff); - outgpa = (kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) | - (kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffff); + param = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) | + (kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffffff); + ingpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) | + (kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffffff); + outgpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) | + (kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffffff); } #ifdef CONFIG_X86_64 else { -- Gleb.