diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-04-16 13:36:44 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-04-16 13:36:44 +0100 |
| commit | a6a82232427382d33293c1594c99f4a43a406776 (patch) | |
| tree | 4277578fa6924fede08c293aae35a0062448e064 /xen/arch/x86/hvm/emulate.c | |
| parent | 5539f61f5bcfb9c20da2371750320439af330f1c (diff) | |
| download | xen-a6a82232427382d33293c1594c99f4a43a406776.tar.gz xen-a6a82232427382d33293c1594c99f4a43a406776.tar.bz2 xen-a6a82232427382d33293c1594c99f4a43a406776.zip | |
x86, hvm: Lots of MTRR/PAT emulation cleanup.
- Move MTRR MSR initialisation into hvmloader.
- Simplify initialisation logic by overlaying UC on default WB rather
than vice versa.
- Clean up hypervisor HVM MTRR/PAE code's interface with rest of
hypervisor.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index d7bf9f3f2f..b1d4bb8034 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -603,7 +603,7 @@ static int hvmemul_read_msr( _regs.ecx = (uint32_t)reg; - if ( (rc = hvm_funcs.msr_read_intercept(&_regs)) != 0 ) + if ( (rc = hvm_msr_read_intercept(&_regs)) != 0 ) return rc; *val = ((uint64_t)(uint32_t)_regs.edx << 32) || (uint32_t)_regs.eax; @@ -621,7 +621,7 @@ static int hvmemul_write_msr( _regs.eax = (uint32_t)val; _regs.ecx = (uint32_t)reg; - return hvm_funcs.msr_write_intercept(&_regs); + return hvm_msr_write_intercept(&_regs); } static int hvmemul_wbinvd( |