Changeset 83281 in vbox for trunk/include/VBox/vmm

Timestamp:

Mar 13, 2020 1:02:08 PM (5 years ago)

Author:

vboxsync

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

136437

Message:

PDMDevHlp,tstDevice: Create two more wrappers used by the graphics device to eliminate direct imports from the VMM library

File:

• trunk/include/VBox/vmm/pdmdev.h (modified) (6 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -44 +44 @@
 #include <VBox/vmm/ssm.h>
 #include <VBox/vmm/cfgm.h>
+#include <VBox/vmm/cpum.h>
 #include <VBox/vmm/dbgf.h>
+#include <VBox/vmm/pgm.h> /* PGMR3HandlerPhysicalTypeRegister() argument types. */
 #include <VBox/err.h>  /* VINF_EM_DBG_STOP, also 120+ source files expecting this. */
 #include <iprt/stdarg.h>
@@ -2086 +2088 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 42, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 43, 0)
 
 /**
@@ -3905 +3907 @@
     DECLR3CALLBACKMEMBER(void, pfnPhysBulkReleasePageMappingLocks,(PPDMDEVINS pDevIns, uint32_t cPages, PPGMPAGEMAPLOCK paLocks));
 
+    /**
+     * Returns the micro architecture used for the guest.
+     *
+     * @returns CPU micro architecture enum.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(CPUMMICROARCH, pfnCpuGetGuestMicroarch,(PPDMDEVINS pDevIns));
+
     /** Space reserved for future members.
      * @{ */
@@ -4115 +4125 @@
      */
     DECLR3CALLBACKMEMBER(void *, pfnQueryGenericUserObject,(PPDMDEVINS pDevIns, PCRTUUID pUuid));
+
+    /**
+     * Register a physical page access handler type.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns             The device instance.
+     * @param   enmKind             The kind of access handler.
+     * @param   pfnHandlerR3        Pointer to the ring-3 handler callback.
+     * @param   pszModR0            The name of the ring-0 module, NULL is an alias for
+     *                              the main ring-0 module.
+     * @param   pszHandlerR0        The name of the ring-0 handler, NULL if the ring-3
+     *                              handler should be called.
+     * @param   pszPfHandlerR0      The name of the ring-0 \#PF handler, NULL if the
+     *                              ring-3 handler should be called.
+     * @param   pszModRC            The name of the raw-mode context module, NULL is an
+     *                              alias for the main RC module.
+     * @param   pszHandlerRC        The name of the raw-mode context handler, NULL if
+     *                              the ring-3 handler should be called.
+     * @param   pszPfHandlerRC      The name of the raw-mode context \#PF handler, NULL
+     *                              if the ring-3 handler should be called.
+     * @param   pszDesc             The type description.
+     * @param   phType              Where to return the type handle (cross context
+     *                              safe).
+     */
+    DECLR3CALLBACKMEMBER(int, pfnPGMHandlerPhysicalTypeRegister, (PPDMDEVINS pDevIns, PGMPHYSHANDLERKIND enmKind,
+                                                                  R3PTRTYPE(PFNPGMPHYSHANDLER) pfnHandlerR3,
+                                                                  const char *pszHandlerR0, const char *pszPfHandlerR0,
+                                                                  const char *pszHandlerRC, const char *pszPfHandlerRC,
+                                                                  const char *pszDesc, PPGMPHYSHANDLERTYPE phType));
 
     /** @} */
@@ -6197 +6236 @@
 {
     pDevIns->CTX_SUFF(pHlp)->pfnPhysBulkReleasePageMappingLocks(pDevIns, cPages, paLocks);
+}
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnCpuGetGuestMicroarch
+ */
+DECLINLINE(CPUMMICROARCH) PDMDevHlpCpuGetGuestMicroarch(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnCpuGetGuestMicroarch(pDevIns);
 }
 
@@ -7684 +7731 @@
 }
 
+/**
+ * @copydoc PDMDEVHLPR3::pfnPGMHandlerPhysicalTypeRegister
+ */
+DECLINLINE(int) PDMDevHlpPGMHandlerPhysicalTypeRegister(PPDMDEVINS pDevIns, PGMPHYSHANDLERKIND enmKind,
+                                                        R3PTRTYPE(PFNPGMPHYSHANDLER) pfnHandlerR3,
+                                                        const char *pszHandlerR0, const char *pszPfHandlerR0,
+                                                        const char *pszHandlerRC, const char *pszPfHandlerRC,
+                                                        const char *pszDesc, PPGMPHYSHANDLERTYPE phType)
+{
+    return pDevIns->pHlpR3->pfnPGMHandlerPhysicalTypeRegister(pDevIns, enmKind, pfnHandlerR3,
+                                                              pszHandlerR0, pszPfHandlerR0,
+                                                              pszHandlerRC, pszPfHandlerRC,
+                                                              pszDesc, phType);
+}
+
 /** Wrapper around SSMR3GetU32 for simplifying getting enum values saved as uint32_t. */
 # define PDMDEVHLP_SSM_GET_ENUM32_RET(a_pHlp, a_pSSM, a_enmDst, a_EnumType) \