Changeset 76402 in vbox

Timestamp:

Dec 23, 2018 3:13:04 PM (6 years ago)

Author:

vboxsync

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

127701

Message:

VBox/vmm/apic.h: Try avoid dragging in pdmdev.h, so use function for APIC device registration rather than exposing g_DeviceAPIC. bugref:9344

Location:

trunk

Files:

• include/VBox/vmm/apic.h (modified) (3 diffs)
• include/VBox/vmm/pdmdev.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/APIC.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/GIMHv.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/include/APICInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/apic.h

@@ -27 +27 @@
 #define ___VBox_vmm_apic_h
 
-#include <VBox/vmm/pdmins.h>
-#include <VBox/vmm/pdmdev.h>
+#include <VBox/types.h>
+struct PDMDEVREGCB;
 
 /** @defgroup grp_apic   The local APIC VMM API
@@ -158 +158 @@
  * @{
  */
+VMMR3_INT_DECL(int)         APICR3RegisterDevice(struct PDMDEVREGCB *pCallbacks);
 VMMR3_INT_DECL(void)        APICR3InitIpi(PVMCPU pVCpu);
 VMMR3_INT_DECL(void)        APICR3HvEnable(PVM pVM);
@@ -201 +202 @@
 RT_C_DECLS_END
 
-extern const PDMDEVREG      g_DeviceAPIC;
 /** @} */
 

trunk/include/VBox/vmm/pdmdev.h

@@ -29 +29 @@
 #include <VBox/vmm/pdmqueue.h>
 #include <VBox/vmm/pdmcritsect.h>
-#include <VBox/vmm/pdmthread.h>
+#ifdef IN_RING3
+# include <VBox/vmm/pdmthread.h>
+#endif
 #include <VBox/vmm/pdmifs.h>
 #include <VBox/vmm/pdmins.h>
@@ -39 +41 @@
 #include <VBox/vmm/cfgm.h>
 #include <VBox/vmm/dbgf.h>
-#include <VBox/err.h>
-#include <VBox/pci.h>
-#include <VBox/sup.h>
+#include <VBox/err.h>  /* VINF_EM_DBG_STOP */
 #include <iprt/stdarg.h>
 

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

@@ -27 +27 @@
 #include <VBox/vmm/iem.h>
 #include <VBox/vmm/vm.h>
+
+#include <VBox/err.h>
 
 

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

@@ -35 +35 @@
 #include "HMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/err.h>
 #include "HMSVMR0.h"
 #include "dtrace/VBoxVMM.h"

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -1670 +1670 @@
  * APIC device registration structure.
  */
-const PDMDEVREG g_DeviceAPIC =
+static const PDMDEVREG g_DeviceAPIC =
 {
     /* u32Version */
@@ -1723 +1723 @@
 };
 
+
+/**
+ * Called by PDM to register the APIC device.
+ */
+VMMR3_INT_DECL(int) APICR3RegisterDevice(PPDMDEVREGCB pCallbacks)
+{
+    return pCallbacks->pfnRegister(pCallbacks, &g_DeviceAPIC);
+}
+
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
 

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -67 +67 @@
 #include <VBox/dis.h>
 #include <VBox/disopcode.h>
+#include <VBox/err.h>
 #include "VMMTracing.h"
 

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -32 +32 @@
 #include <VBox/vmm/vm.h>
 
+#include <VBox/err.h>
 #include <VBox/version.h>
 
 #include <iprt/assert.h>
-#include <iprt/err.h>
 #include <iprt/string.h>
 #include <iprt/mem.h>

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -495 +495 @@
      * Load the internal VMM APIC device.
      */
-    int rc2 = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceAPIC);
-    AssertRCReturn(rc2, rc2);
+    int rc = APICR3RegisterDevice(&RegCB.Core);
+    AssertRCReturn(rc, rc);
 
     /*
@@ -503 +503 @@
     PCFGMNODE pDevicesNode = CFGMR3GetChild(CFGMR3GetRoot(pVM), "PDM/Devices");
     bool fLoadBuiltin;
-    int rc = CFGMR3QueryBool(pDevicesNode, "LoadBuiltin", &fLoadBuiltin);
+    rc = CFGMR3QueryBool(pDevicesNode, "LoadBuiltin", &fLoadBuiltin);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
         fLoadBuiltin = true;

trunk/src/VBox/VMM/include/APICInternal.h

@@ -22 +22 @@
 #include <VBox/types.h>
 #include <VBox/vmm/apic.h>
+#include <VBox/vmm/pdmdev.h>
 
 /** @defgroup grp_apic_int       Internal