[Xen-changelog] [xen-unstable] x86 hvm: Fix hvmemul_read_msr().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236798827 0
# Node ID 5b8f9ef92e00fe5070f5470fc1e3e32b9e85efd5
# Parent  a4274d1e85a3de5444ed66d5fbef6eceae014d15
x86 hvm: Fix hvmemul_read_msr().

Original patch by Christoph Egger <christoph.egger@xxxxxxx>

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/emulate.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r a4274d1e85a3 -r 5b8f9ef92e00 xen/arch/x86/hvm/emulate.c
--- a/xen/arch/x86/hvm/emulate.c        Wed Mar 11 13:11:21 2009 +0000
+++ b/xen/arch/x86/hvm/emulate.c        Wed Mar 11 19:13:47 2009 +0000
@@ -793,7 +793,7 @@ static int hvmemul_read_msr(
     if ( (rc = hvm_msr_read_intercept(&_regs)) != 0 )
         return rc;
 
-    *val = ((uint64_t)(uint32_t)_regs.edx << 32) || (uint32_t)_regs.eax;
+    *val = ((uint64_t)(uint32_t)_regs.edx << 32) | (uint32_t)_regs.eax;
     return X86EMUL_OKAY;
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog