Mailing List Archive

# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Node ID 0db18b9c3efa5423998d4ffc15fc6e03b78b5a57
# Parent 777a4c4641955f8c672fcf64d20cbf77efbade98
Remove i386/x8664 differences in vmx reg store/load routines.
Signed-off-by: Keir Fraser <keir@xensource.com>
xen-unstable changeset: 9912:72d1cf383c679e1db24c92c7d89d7816b947eabe
xen-unstable date: Tue May 2 17:17:15 2006 +0100
---
xen/arch/x86/hvm/vmx/vmx.c | 30 ------------------------------
1 files changed, 30 deletions(-)

diff -r 777a4c464195 -r 0db18b9c3efa xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu May 18 16:07:49 2006 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c Thu May 18 17:24:16 2006 +0100
@@ -451,17 +451,6 @@ static void vmx_store_cpu_guest_regs(

if ( regs != NULL )
{
-#if defined (__x86_64__)
- __vmread(GUEST_RFLAGS, &regs->rflags);
- __vmread(GUEST_SS_SELECTOR, &regs->ss);
- __vmread(GUEST_CS_SELECTOR, &regs->cs);
- __vmread(GUEST_DS_SELECTOR, &regs->ds);
- __vmread(GUEST_ES_SELECTOR, &regs->es);
- __vmread(GUEST_GS_SELECTOR, &regs->gs);
- __vmread(GUEST_FS_SELECTOR, &regs->fs);
- __vmread(GUEST_RIP, &regs->rip);
- __vmread(GUEST_RSP, &regs->rsp);
-#elif defined (__i386__)
__vmread(GUEST_RFLAGS, &regs->eflags);
__vmread(GUEST_SS_SELECTOR, &regs->ss);
__vmread(GUEST_CS_SELECTOR, &regs->cs);
@@ -471,7 +460,6 @@ static void vmx_store_cpu_guest_regs(
__vmread(GUEST_FS_SELECTOR, &regs->fs);
__vmread(GUEST_RIP, &regs->eip);
__vmread(GUEST_RSP, &regs->esp);
-#endif
}

if ( crs != NULL )
@@ -548,23 +536,6 @@ void vmx_load_cpu_guest_regs(struct vcpu

ASSERT(v->arch.hvm_vmx.launch_cpu == smp_processor_id());

-#if defined (__x86_64__)
- __vmwrite(GUEST_SS_SELECTOR, regs->ss);
- __vmwrite(GUEST_DS_SELECTOR, regs->ds);
- __vmwrite(GUEST_ES_SELECTOR, regs->es);
- __vmwrite(GUEST_GS_SELECTOR, regs->gs);
- __vmwrite(GUEST_FS_SELECTOR, regs->fs);
- __vmwrite(GUEST_RSP, regs->rsp);
-
- __vmwrite(GUEST_RFLAGS, regs->rflags);
- if (regs->rflags & EF_TF)
- __vm_set_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
- else
- __vm_clear_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB);
-
- __vmwrite(GUEST_CS_SELECTOR, regs->cs);
- __vmwrite(GUEST_RIP, regs->rip);
-#elif defined (__i386__)
__vmwrite(GUEST_SS_SELECTOR, regs->ss);
__vmwrite(GUEST_DS_SELECTOR, regs->ds);
__vmwrite(GUEST_ES_SELECTOR, regs->es);
@@ -583,7 +554,6 @@ void vmx_load_cpu_guest_regs(struct vcpu

__vmwrite(GUEST_CS_SELECTOR, regs->cs);
__vmwrite(GUEST_RIP, regs->eip);
-#endif

/* Reload current VCPU's VMCS if it was temporarily unloaded. */
if ( (v != current) && hvm_guest(current) )

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