[Xen-changelog] [xen-unstable] hvm/x86: vendor-specific code can call vendor-specific routines directly

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1182348377 -3600
# Node ID 3624ba0caccc49011f73de90272a3b28e8a9ef43
# Parent  2805246f6caca3f3e7ea9b4f0574916de400f211
hvm/x86: vendor-specific code can call vendor-specific routines directly
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c |    4 ++--
 xen/arch/x86/hvm/vmx/vmx.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 2805246f6cac -r 3624ba0caccc xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Wed Jun 20 15:03:39 2007 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c        Wed Jun 20 15:06:17 2007 +0100
@@ -1476,7 +1476,7 @@ static void svm_io_instruction(struct vc
 
     /* Copy current guest state into io instruction state structure. */
     memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES);
-    hvm_store_cpu_guest_regs(v, regs, NULL);
+    svm_store_cpu_guest_regs(v, regs, NULL);
 
     info.bytes = vmcb->exitinfo1;
 
@@ -2153,7 +2153,7 @@ static inline void svm_vmexit_do_hlt(str
 
     /* Check for interrupt not handled or new interrupt. */
     if ( vmcb->eventinj.fields.v ||
-         ((type != hvm_intack_none) && hvm_interrupts_enabled(current, type)) )
+         ((type != hvm_intack_none) && svm_interrupts_enabled(current, type)) )
     {
         HVMTRACE_1D(HLT, current, /*int pending=*/ 1);
         return;
diff -r 2805246f6cac -r 3624ba0caccc xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Wed Jun 20 15:03:39 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Wed Jun 20 15:06:17 2007 +0100
@@ -1854,7 +1854,7 @@ static void vmx_io_instruction(unsigned 
 
     /* Copy current guest state into io instruction state structure. */
     memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES);
-    hvm_store_cpu_guest_regs(current, regs, NULL);
+    vmx_store_cpu_guest_regs(current, regs, NULL);
 
     HVM_DBG_LOG(DBG_LEVEL_IO, "vm86 %d, eip=%x:%lx, "
                 "exit_qualification = %lx",

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