1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Thu Aug 03 13:55:41 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Thu Aug 03 14:01:09 2006 +0100
     1.3 @@ -2184,11 +2184,10 @@ asmlinkage void vmx_vmexit_handler(struc
     1.4           * (1) We can get an exception (e.g. #PG) in the guest, or
     1.5           * (2) NMI
     1.6           */
     1.7 -        int error;
     1.8          unsigned int vector;
     1.9          unsigned long va;
    1.10  
    1.11 -        if ((error = __vmread(VM_EXIT_INTR_INFO, &vector))
    1.12 +        if (__vmread(VM_EXIT_INTR_INFO, &vector)
    1.13              || !(vector & INTR_INFO_VALID_MASK))
    1.14              __hvm_bug(&regs);
    1.15          vector &= INTR_INFO_VECTOR_MASK;
    1.16 @@ -2261,7 +2260,7 @@ asmlinkage void vmx_vmexit_handler(struc
    1.17                          (unsigned long)regs.ecx, (unsigned long)regs.edx,
    1.18                          (unsigned long)regs.esi, (unsigned long)regs.edi);
    1.19  
    1.20 -            if (!(error = vmx_do_page_fault(va, &regs))) {
    1.21 +            if (!vmx_do_page_fault(va, &regs)) {
    1.22                  /*
    1.23                   * Inject #PG using Interruption-Information Fields
    1.24                   */