File 19313-hvmemul-read-msr-fix.patch of Package xen

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1237301478 0
# Node ID 467b017ec7544e77ea3a0d3db0f9394eeca0ba2d
# Parent  ef7616ff29ad4c6d3ecca487e720d4507ccbe7d8
x86 hvm: Fix hvmemul_read_msr().

Original patch by Christoph Egger <christoph.egger@amd.com>

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset:   19313:5b8f9ef92e00fe5070f5470fc1e3e32b9e85efd5
xen-unstable date:        Wed Mar 11 19:13:47 2009 +0000

Index: xen-3.3.1-testing/xen/arch/x86/hvm/emulate.c
===================================================================
--- xen-3.3.1-testing.orig/xen/arch/x86/hvm/emulate.c
+++ xen-3.3.1-testing/xen/arch/x86/hvm/emulate.c
@@ -763,7 +763,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;
 }