Changeset 82041 in vbox

Timestamp:

Nov 20, 2019 6:58:22 PM (5 years ago)

Author:

vboxsync

Message:

PIC,APIC,IOAPIC,PDM: The PIC, APIC, and IOAPIC cannot have their ring-0 bits disabled or PDM will get interrupt handling all wrong (left todo). bugref:9218

Location:

trunk/src/VBox

Files:

• Devices/PC/DevIoApic.cpp (modified) (1 diff)
• Devices/PC/DevPIC.cpp (modified) (1 diff)
• VMM/VMMAll/APICAll.cpp (modified) (1 diff)
• VMM/VMMAll/PDMAll.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -1405 +1405 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "ioapic",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE
+                                    | PDM_DEVREG_FLAGS_REQUIRE_R0 | PDM_DEVREG_FLAGS_REQUIRE_RC,
     /* .fClass = */                 PDM_DEVREG_CLASS_PIC,
     /* .cMaxInstances = */          1,

trunk/src/VBox/Devices/PC/DevPIC.cpp

@@ -1031 +1031 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "i8259",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE
+                                    | PDM_DEVREG_FLAGS_REQUIRE_R0 | PDM_DEVREG_FLAGS_REQUIRE_RC,
     /* .fClass = */                 PDM_DEVREG_CLASS_PIC,
     /* .cMaxInstances = */          1,

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

@@ -3533 +3533 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "apic",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE
+                                    | PDM_DEVREG_FLAGS_REQUIRE_R0 | PDM_DEVREG_FLAGS_REQUIRE_RC,
     /* .fClass = */                 PDM_DEVREG_CLASS_PIC,
     /* .cMaxInstances = */          1,

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

@@ -131 +131 @@
 
     int rc = VERR_PDM_NO_PIC_INSTANCE;
+/** @todo r=bird: This code is incorrect, as it ASSUMES the PIC and I/O APIC
+ *        are always ring-0 enabled! */
     if (pVM->pdm.s.Pic.CTX_SUFF(pDevIns))
     {
@@ -241 +243 @@
 VMM_INT_DECL(bool) PDMHasIoApic(PVM pVM)
 {
-    return pVM->pdm.s.IoApic.CTX_SUFF(pDevIns) != NULL;
+    return pVM->pdm.s.IoApic.pDevInsR3 != NULL;
 }
 
@@ -253 +255 @@
 VMM_INT_DECL(bool) PDMHasApic(PVM pVM)
 {
-    return pVM->pdm.s.Apic.CTX_SUFF(pDevIns) != NULL;
+    return pVM->pdm.s.Apic.pDevInsR3 != NIL_RTR3PTR;
 }