aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2010-01-19 08:06:38 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2010-03-01 10:36:01 -0500
commitccd469362e826261ccc261c4c36fb0a346338222 (patch)
treef21c1ac77d47a9434e029ec823d4d293165058f2 /arch
parent7062dcaa369cae40c1a59949a5654985d0ae26ea (diff)
KVM: fix Hyper-V hypercall warnings and wrong mask value
Fix compilation warnings and wrong mask value. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9f72a443455b..9b0758b4d550 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3806,12 +3806,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
3806 longmode = is_long_mode(vcpu) && cs_l == 1; 3806 longmode = is_long_mode(vcpu) && cs_l == 1;
3807 3807
3808 if (!longmode) { 3808 if (!longmode) {
3809 param = (kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) | 3809 param = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDX) << 32) |
3810 (kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffff); 3810 (kvm_register_read(vcpu, VCPU_REGS_RAX) & 0xffffffff);
3811 ingpa = (kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) | 3811 ingpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RBX) << 32) |
3812 (kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffff); 3812 (kvm_register_read(vcpu, VCPU_REGS_RCX) & 0xffffffff);
3813 outgpa = (kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) | 3813 outgpa = ((u64)kvm_register_read(vcpu, VCPU_REGS_RDI) << 32) |
3814 (kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffff); 3814 (kvm_register_read(vcpu, VCPU_REGS_RSI) & 0xffffffff);
3815 } 3815 }
3816#ifdef CONFIG_X86_64 3816#ifdef CONFIG_X86_64
3817 else { 3817 else {