Changeset 9188 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 28, 2008 7:44:21 AM (17 years ago)

Author:

vboxsync

Message:

Same IF fix for halt instructions in VT-x.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -450 +450 @@
         TRPMEVENT   enmType;
         SVM_EVENT   Event;
-        uint32_t    u32ErrorCode;
+        RTGCUINT    u32ErrorCode;
 
         Event.au64[0] = 0;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -512 +512 @@
         int         rc;
         TRPMEVENT   enmType;
-        RTGCUINTPTR intInfo, errCode;
+        RTGCUINTPTR intInfo;
+        RTGCUINT    errCode;
 
         /* If a new event is pending, then dispatch it now. */
@@ -1921 +1922 @@
     case VMX_EXIT_HLT:                  /* 12 Guest software attempted to execute HLT. */
         /** Check if external interrupts are pending; if so, don't switch back. */
-        if (VM_FF_ISPENDING(pVM, (VM_FF_INTERRUPT_APIC|VM_FF_INTERRUPT_PIC)))
+        if (    pCtx->eflags.Bits.u1IF
+            &&  VM_FF_ISPENDING(pVM, (VM_FF_INTERRUPT_APIC|VM_FF_INTERRUPT_PIC)))
         {
             pCtx->eip++;    /* skip hlt */