Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1276155096 -3600
# Node ID b522d6148f445c2da41d5a5dee1e20a14a2d13f8
# Parent c3c2bcafe4712e62c13b8f1e55f5fb80f54967b2
x86_32 vmx: Fix build after msr cleanups

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---
xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)

diff -r c3c2bcafe471 -r b522d6148f44 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Jun 10 08:28:02 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Jun 10 08:31:36 2010 +0100
@@ -344,32 +344,28 @@ void vmx_save_host_msrs(void) {}
#define vmx_save_guest_msrs(v) ((void)0)
#define vmx_restore_guest_msrs(v) ((void)0)

-static enum handler_return long_mode_do_msr_read(struct cpu_user_regs *regs)
-{
- u64 msr_content = 0;
+static enum handler_return
+long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content)
+{
struct vcpu *v = current;

- switch ( regs->ecx )
+ switch ( msr )
{
case MSR_EFER:
- msr_content = v->arch.hvm_vcpu.guest_efer;
+ *msr_content = v->arch.hvm_vcpu.guest_efer;
break;

default:
return HNDL_unhandled;
}

- regs->eax = msr_content >> 0;
- regs->edx = msr_content >> 32;
-
return HNDL_done;
}

-static enum handler_return long_mode_do_msr_write(struct cpu_user_regs *regs)
-{
- u64 msr_content = regs->eax | ((u64)regs->edx << 32);
-
- switch ( regs->ecx )
+static enum handler_return
+long_mode_do_msr_write(unsigned int msr, uint64_t msr_content)
+{
+ switch ( msr )
{
case MSR_EFER:
if ( hvm_set_efer(msr_content) )

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