Changeset 49512 in vbox for trunk

Timestamp:

Nov 15, 2013 4:42:02 PM (11 years ago)

Author:

vboxsync

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

90678

Message:

Main/src-client, VMM/HMSVMR0: Enable TPR patching regardless of guest bitness for certain guests types.

Location:

trunk/src/VBox

Files:

• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -117 +117 @@
 
 #include <string>
-/* XXX: We don't need class declared in NetworkServiceRunner, this file included because of 
+/* XXX: We don't need class declared in NetworkServiceRunner, this file included because of
  * mcrodefintions TRUNKTYPE_*
  */
@@ -1055 +1055 @@
 
             /** @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
-            if (    !fIsGuest64Bit
-                &&  fIOAPIC
+            if (    fIOAPIC
                 &&  (   osTypeId == "WindowsNT4"
                      || osTypeId == "Windows2000"

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

@@ -4671 +4671 @@
         && (   !(u32ErrCode & X86_TRAP_PF_P)                                                             /* Not present */
             || (u32ErrCode & (X86_TRAP_PF_P | X86_TRAP_PF_RSVD)) == (X86_TRAP_PF_P | X86_TRAP_PF_RSVD))  /* MMIO page. */
+        && !CPUMIsGuestInLongModeEx(pCtx)
         && !CPUMGetGuestCPL(pVCpu)
-        && !CPUMIsGuestInLongModeEx(pCtx)
         && pVM->hm.s.cPatches < RT_ELEMENTS(pVM->hm.s.aPatches))
     {
@@ -4871 +4871 @@
         && (uFaultAddress & 0xfff) == 0x80  /* TPR offset. */
         && !(u32ErrCode & X86_TRAP_PF_P)    /* Not present. */
+        && !CPUMIsGuestInLongModeEx(pCtx)
         && !CPUMGetGuestCPL(pVCpu)
-        && !CPUMIsGuestInLongModeEx(pCtx)
         && pVM->hm.s.cPatches < RT_ELEMENTS(pVM->hm.s.aPatches))
     {