Changeset 10542 in vbox

Timestamp:

Jul 11, 2008 6:03:56 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33230

Message:

Go directly to the halted state when encountering a hlt instruction with VT-x and AMD-V.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1748 +1748 @@
     case SVM_EXIT_HLT:
         /** Check if external interrupts are pending; if so, don't switch back. */
+        pCtx->rip++;    /* skip hlt */
         if (    pCtx->eflags.Bits.u1IF
             &&  VM_FF_ISPENDING(pVM, (VM_FF_INTERRUPT_APIC|VM_FF_INTERRUPT_PIC)))
         {
-            pCtx->rip++;    /* skip hlt */
             goto ResumeExecution;
         }
-
-        rc = VINF_EM_RAW_EMULATE_INSTR_HLT;
+        rc = VINF_EM_HALT;
         break;
 

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

@@ -2034 +2034 @@
     case VMX_EXIT_HLT:                  /* 12 Guest software attempted to execute HLT. */
         /** Check if external interrupts are pending; if so, don't switch back. */
+        pCtx->rip++;    /* skip hlt */
         if (    pCtx->eflags.Bits.u1IF
             &&  VM_FF_ISPENDING(pVM, (VM_FF_INTERRUPT_APIC|VM_FF_INTERRUPT_PIC)))
         {
-            pCtx->rip++;    /* skip hlt */
             goto ResumeExecution;
         }
 
-        rc = VINF_EM_RAW_EMULATE_INSTR_HLT;
+        rc = VINF_EM_HALT;
         break;