Changeset 61088 in vbox for trunk/src

Timestamp:

May 20, 2016 9:56:25 AM (9 years ago)

Author:

vboxsync

Message:

VMM/APIC: Disallow transition to x2APIC mode when the VM isn't configured with x2APIC CPUID bit set.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -2006 +2006 @@
     if (pApic->enmOriginalMode == APICMODE_DISABLED)
     {
-        LogRel(("APIC%u: Disallowing APIC base MSR write as the VM config is configured with APIC disabled!\n"));
+        LogRel(("APIC%u: Disallowing APIC base MSR write as the VM is configured with APIC disabled!\n"));
         return apicMsrAccessError(pVCpu, MSR_IA32_APICBASE, APICMSRACCESS_WRITE_DISALLOWED_CONFIG);
     }
@@ -2055 +2055 @@
             case APICMODE_X2APIC:
             {
+                if (pApic->enmOriginalMode != APICMODE_X2APIC)
+                {
+                    LogRel(("APIC%u: Disallowing transition to x2APIC mode as the VM is configured with the x2APIC disabled!\n",
+                            pVCpu->idCpu));
+                    return apicMsrAccessError(pVCpu, MSR_IA32_APICBASE, APICMSRACCESS_WRITE_INVALID);
+                }
+
                 if (enmOldMode != APICMODE_XAPIC)
                 {