ia64/xen-unstable

changeset 15402:3624ba0caccc

hvm/x86: vendor-specific code can call vendor-specific routines directly
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Wed Jun 20 15:06:17 2007 +0100 (2007-06-20)
parents 2805246f6cac
children 499bab040137
files xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/vmx/vmx.c
line diff
     1.1 --- a/xen/arch/x86/hvm/svm/svm.c	Wed Jun 20 15:03:39 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Wed Jun 20 15:06:17 2007 +0100
     1.3 @@ -1476,7 +1476,7 @@ static void svm_io_instruction(struct vc
     1.4  
     1.5      /* Copy current guest state into io instruction state structure. */
     1.6      memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES);
     1.7 -    hvm_store_cpu_guest_regs(v, regs, NULL);
     1.8 +    svm_store_cpu_guest_regs(v, regs, NULL);
     1.9  
    1.10      info.bytes = vmcb->exitinfo1;
    1.11  
    1.12 @@ -2153,7 +2153,7 @@ static inline void svm_vmexit_do_hlt(str
    1.13  
    1.14      /* Check for interrupt not handled or new interrupt. */
    1.15      if ( vmcb->eventinj.fields.v ||
    1.16 -         ((type != hvm_intack_none) && hvm_interrupts_enabled(current, type)) )
    1.17 +         ((type != hvm_intack_none) && svm_interrupts_enabled(current, type)) )
    1.18      {
    1.19          HVMTRACE_1D(HLT, current, /*int pending=*/ 1);
    1.20          return;
     2.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Wed Jun 20 15:03:39 2007 +0100
     2.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Wed Jun 20 15:06:17 2007 +0100
     2.3 @@ -1854,7 +1854,7 @@ static void vmx_io_instruction(unsigned 
     2.4  
     2.5      /* Copy current guest state into io instruction state structure. */
     2.6      memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES);
     2.7 -    hvm_store_cpu_guest_regs(current, regs, NULL);
     2.8 +    vmx_store_cpu_guest_regs(current, regs, NULL);
     2.9  
    2.10      HVM_DBG_LOG(DBG_LEVEL_IO, "vm86 %d, eip=%x:%lx, "
    2.11                  "exit_qualification = %lx",