1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Mon Nov 13 09:46:05 2006 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Mon Nov 13 09:49:12 2006 +0000
     1.3 @@ -1814,7 +1814,7 @@ static inline void vmx_do_msr_read(struc
     1.4          msr_content = vcpu_vlapic(v)->apic_base_msr;
     1.5          break;
     1.6      default:
     1.7 -        if (long_mode_do_msr_read(regs))
     1.8 +        if ( long_mode_do_msr_read(regs) )
     1.9              return;
    1.10  
    1.11          if ( rdmsr_hypervisor_regs(regs->ecx, &eax, &edx) )
    1.12 @@ -2045,11 +2045,6 @@ asmlinkage void vmx_vmexit_handler(struc
    1.13  
    1.14      perfc_incra(vmexits, exit_reason);
    1.15  
    1.16 -    if ( (exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT) &&
    1.17 -         (exit_reason != EXIT_REASON_VMCALL) &&
    1.18 -         (exit_reason != EXIT_REASON_IO_INSTRUCTION) )
    1.19 -        HVM_DBG_LOG(DBG_LEVEL_0, "exit reason = %x", exit_reason);
    1.20 -
    1.21      if ( exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT )
    1.22          local_irq_enable();
    1.23  
    1.24 @@ -2121,8 +2116,6 @@ asmlinkage void vmx_vmexit_handler(struc
    1.25  #else
    1.26          case TRAP_debug:
    1.27          {
    1.28 -            void store_cpu_user_regs(struct cpu_user_regs *regs);
    1.29 -
    1.30              if ( test_bit(_DOMF_debugging, &v->domain->domain_flags) )
    1.31              {
    1.32                  store_cpu_user_regs(regs);