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<gleb@xxxxxxxxxx>
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.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
