ia64/xen-unstable

changeset 19318:5b8f9ef92e00

x86 hvm: Fix hvmemul_read_msr().

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

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Mar 11 19:13:47 2009 +0000 (2009-03-11)
parents a4274d1e85a3
children 131c799580cb
files xen/arch/x86/hvm/emulate.c
line diff
     1.1 --- a/xen/arch/x86/hvm/emulate.c	Wed Mar 11 13:11:21 2009 +0000
     1.2 +++ b/xen/arch/x86/hvm/emulate.c	Wed Mar 11 19:13:47 2009 +0000
     1.3 @@ -793,7 +793,7 @@ static int hvmemul_read_msr(
     1.4      if ( (rc = hvm_msr_read_intercept(&_regs)) != 0 )
     1.5          return rc;
     1.6  
     1.7 -    *val = ((uint64_t)(uint32_t)_regs.edx << 32) || (uint32_t)_regs.eax;
     1.8 +    *val = ((uint64_t)(uint32_t)_regs.edx << 32) | (uint32_t)_regs.eax;
     1.9      return X86EMUL_OKAY;
    1.10  }
    1.11