diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-03-11 19:13:47 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-03-11 19:13:47 +0000 |
| commit | 740ba63f2b48b5773c9f7b362a52d5de06ca999a (patch) | |
| tree | 1ef4ee0d242bc165937bc47df520c6d87967a3bb /xen/arch/x86/hvm/emulate.c | |
| parent | e57bcd97a394f8bfe8fe3080ec9b04889a6950ba (diff) | |
| download | xen-740ba63f2b48b5773c9f7b362a52d5de06ca999a.tar.gz xen-740ba63f2b48b5773c9f7b362a52d5de06ca999a.tar.bz2 xen-740ba63f2b48b5773c9f7b362a52d5de06ca999a.zip | |
x86 hvm: Fix hvmemul_read_msr().
Original patch by Christoph Egger <christoph.egger@amd.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/emulate.c')
| -rw-r--r-- | xen/arch/x86/hvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 1e583bc2dc..6fbce84e90 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -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; } |