Changeset 49549 in vbox

Timestamp:

Nov 19, 2013 1:28:01 PM (11 years ago)

Author:

vboxsync

Message:

VMM/CPUM/MSRs: when returning the APIC base, don't rely upon the CPUID feature bits but check if a Local APIC is present

Location:

trunk

Files:

• include/VBox/vmm/pdmapi.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmapi.h

@@ -43 +43 @@
 VMMDECL(int)            PDMGetInterrupt(PVMCPU pVCpu, uint8_t *pu8Interrupt);
 VMMDECL(int)            PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, uint32_t uTagSrc);
+VMM_INT_DECL(bool)      PDMHasIoApic(PVM pVM);
 VMM_INT_DECL(int)       PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, uint32_t uTagSrc);
 VMM_INT_DECL(int)       PDMIoApicSendMsi(PVM pVM, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc);
-VMM_INT_DECL(bool)      PDMHasIoApic(PVM pVM);
+VMM_INT_DECL(bool)      PDMHasApic(PVM pVM);
 VMM_INT_DECL(int)       PDMApicHasPendingIrq(PVM pVM, bool *pfPending);
 VMMDECL(int)            PDMApicSetBase(PVMCPU pVCpu, uint64_t u64Base);

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

@@ -902 +902 @@
         case MSR_IA32_APICBASE:
         {
+            /* See @bugref{7097} comment 6. */
             PVM pVM = pVCpu->CTX_SUFF(pVM);
-            if (   (    pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1                                  /* APIC Std feature */
-                    && (pVM->cpum.s.aGuestCpuIdStd[1].edx & X86_CPUID_FEATURE_EDX_APIC))
-                || (   pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001                          /* APIC Ext feature (AMD) */
-                    && pVM->cpum.s.enmGuestCpuVendor == CPUMCPUVENDOR_AMD
-                    && (pVM->cpum.s.aGuestCpuIdExt[1].edx & X86_CPUID_AMD_FEATURE_EDX_APIC))
-                || (    pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1                                  /* x2APIC */
-                    && (pVM->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_X2APIC)))
-            {
+            if (PDMHasApic(pVM))
                 *puValue = pVCpu->cpum.s.Guest.msrApicBase;
-            }
             else
             {
+                rc = VERR_CPUM_RAISE_GP_0;
                 *puValue = 0;
-                rc = VERR_CPUM_RAISE_GP_0;
             }
             break;

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

@@ -212 +212 @@
 
 /**
+ * Returns presence of an IO-APIC
+ *
+ * @returns VBox true if IO-APIC is present
+ * @param   pVM             Pointer to the VM.
+ */
+VMM_INT_DECL(bool) PDMHasApic(PVM pVM)
+{
+    return pVM->pdm.s.Apic.CTX_SUFF(pDevIns) != NULL;
+}
+
+
+/**
  * Set the APIC base.
  *