Changeset 106022 in vbox for trunk/include

Timestamp:

Sep 12, 2024 9:44:36 AM (3 months ago)

Author:

vboxsync

Message:

VMM/PDM: Added PDMR3DriverEnumInstances for use by Console::i_onNATDnsChanged, introducing a read/write lock for the core PDM lists (devices, drivers, usb devices, and more). Medium risk since it involves new locking.

Location:

trunk/include/VBox/vmm

Files:

• pdmapi.h (modified) (2 diffs)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (1 diff)
• vmmr3vtable-def.h (modified) (1 diff)
• vmmr3vtable.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmapi.h

@@ -169 +169 @@
 VMMR3DECL(int)          PDMR3QueryDriverOnLun(PUVM pUVM, const char *pszDevice, unsigned iInstance, unsigned iLun,
                                               const char *pszDriver, PPPDMIBASE ppBase);
+
 VMMR3DECL(int)          PDMR3DeviceAttach(PUVM pUVM, const char *pszDevice, unsigned iInstance, unsigned iLun, uint32_t fFlags,
                                           PPDMIBASE *ppBase);
@@ -180 +181 @@
                                             const char *pszDriver, unsigned iOccurrence, uint32_t fFlags, PCFGMNODE pCfg,
                                             PPPDMIBASE ppBase);
+/**
+ * Driver instance enumeration callback function.
+ *
+ * @returns VBox status code. Failures will stop the enumeration and be
+ *          returned, informational statuses will be ignored and not returned.
+ * @param   pIBase          The base interface of the driver.
+ * @param   uDrvInstance    The driver instance number.
+ * @param   fUsbDev         Set if @a pszDevice is a USB device, clear if a
+ *                          regular device.
+ * @param   pszDevice       The device the driver is attached to.
+ * @param   uDevInstance    The device instance number.
+ * @param   uLun            The LUN on the device this instance is attached to.
+ * @param   pvUser          User argument.
+ *
+ * @note    Called owning the core PDM list lock in shared mode.
+ */
+typedef DECLCALLBACKTYPE(int, FNPDMENUMDRVINS,(PPDMIBASE pIBase, uint32_t uDrvInstance, bool fUsbDev, const char *pszDevice,
+                                               uint32_t uDevInstance, unsigned uLun, void *pvUser));
+/** Pointer to a FNPDMENUMDRVINS() function. */
+typedef FNPDMENUMDRVINS *PFNPDMENUMDRVINS;
+VMMR3DECL(int)          PDMR3DriverEnumInstances(PUVM pUVM, const char *pszDriver, PFNPDMENUMDRVINS pfnCallback, void *pvUser);
+
 VMMR3DECL(void)         PDMR3DmaRun(PVM pVM);
 

trunk/include/VBox/vmm/vm.h

@@ -1412 +1412 @@
         struct PDM s;
 #endif
-        uint8_t     padding[22400];     /* multiple of 64 */
+        uint8_t     padding[22528];     /* multiple of 64 */
     } pdm;
 
@@ -1574 +1574 @@
 
     /** Padding for aligning the structure size on a page boundrary. */
-    uint8_t         abAlignment2[0x3A80 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[0x3A00 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -157 +157 @@
     .mm                     resb 192
     alignb 64
-    .pdm                    resb 22400
+    .pdm                    resb 22528
     alignb 64
     .iom                    resb 1152

trunk/include/VBox/vmm/vmmr3vtable-def.h

@@ -639 +639 @@
 VTABLE_ENTRY(PDMR3UsbQueryDriverOnLun)
 
-VTABLE_RESERVED(pfnPDMR3Reserved1)
+VTABLE_ENTRY(PDMR3DriverEnumInstances)
+
 VTABLE_RESERVED(pfnPDMR3Reserved2)
 VTABLE_RESERVED(pfnPDMR3Reserved3)

trunk/include/VBox/vmm/vmmr3vtable.h

@@ -72 +72 @@
 
 /** Magic and version for the VMM vtable.  (Magic: Emmet Cohen)   */
-#define VMMR3VTABLE_MAGIC_VERSION         RT_MAKE_U64(0x19900525, 0x00050000)
+#define VMMR3VTABLE_MAGIC_VERSION         RT_MAKE_U64(0x19900525, 0x00050001)
 /** Compatibility mask: These bits must match - magic and major version. */
 #define VMMR3VTABLE_MAGIC_VERSION_MASK    RT_MAKE_U64(0xffffffff, 0xffff0000)