Changeset 19995 in vbox

Timestamp:

May 25, 2009 12:31:34 PM (15 years ago)

Author:

vboxsync

Message:

Introduced PDMHasIoApic.

Location:

trunk

Files:

• include/VBox/pdmapi.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/pdmapi.h

@@ -46 +46 @@
 VMMDECL(int)    PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level);
 VMMDECL(int)    PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level);
+VMMDECL(bool)   PDMHasIoApic(PVM pVM);
 VMMDECL(int)    PDMApicHasPendingIrq(PVM pVM, bool *pfPending);
 VMMDECL(int)    PDMApicSetBase(PVM pVM, uint64_t u64Base);

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

@@ -147 +147 @@
 
 /**
+ * Returns presence of an IO-APIC
+ *
+ * @returns VBox true if IO-APIC is present
+ * @param   pVM             VM handle.
+ */
+VMMDECL(bool) PDMHasIoApic(PVM pVM)
+{
+    return pVM->pdm.s.IoApic.CTX_SUFF(pDevIns) != NULL;
+}
+
+
+/**
  * Set the APIC base.
  *

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

@@ -2163 +2163 @@
      * @todo reduce overhead
      */
-    if (    CPUMIsGuestInLongModeEx(pCtx)
+    if (    PDMHasIoApic(pVM)
         &&  pVM->hwaccm.s.vmx.pAPIC)
     {
@@ -3424 +3424 @@
             RTGCPHYS GCPhys;
             PDMApicGetBase(pVM, &GCPhys);
+            GCPhys &= PAGE_BASE_GC_MASK;
             GCPhys += VMX_EXIT_QUALIFICATION_APIC_ACCESS_OFFSET(exitQualification);