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

Timestamp:

Mar 13, 2013 3:58:02 PM (12 years ago)

Author:

vboxsync

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

84265

Message:

PDM,PGM,DevEFI,DevACPI,DevPcBios: Added memory setup phase after construction and reset to solve PGM/PDM reset order issue (PDM first, then PGM, only that wasn't possible previously since PDM reset would plant stuff in guest RAM).

Location:

trunk/include/VBox/vmm

Files:

• pdmapi.h (modified) (1 diff)
• pdmdev.h (modified) (3 diffs)
• pgm.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmapi.h

@@ -68 +68 @@
 VMMR3_INT_DECL(void)    PDMR3ResetCpu(PVMCPU pVCpu);
 VMMR3_INT_DECL(void)    PDMR3Reset(PVM pVM);
+VMMR3_INT_DECL(void)    PDMR3MemSetup(PVM pVM, bool fAtReset);
 VMMR3_INT_DECL(void)    PDMR3Suspend(PVM pVM);
 VMMR3_INT_DECL(void)    PDMR3Resume(PVM pVM);

trunk/include/VBox/vmm/pdmdev.h

@@ -241 +241 @@
 
 
+/**
+ * The context of a pfnMemSetup call.
+ */
+typedef enum PDMDEVMEMSETUPCTX
+{
+    /** Invalid zero value. */
+    PDMDEVMEMSETUPCTX_INVALID = 0,
+    /** After construction. */
+    PDMDEVMEMSETUPCTX_AFTER_CONSTRUCTION,
+    /** After reset. */
+    PDMDEVMEMSETUPCTX_AFTER_RESET,
+    /** Type size hack. */
+    PDMDEVMEMSETUPCTX_32BIT_HACK = 0x7fffffff
+} PDMDEVMEMSETUPCTX;
+
 
 /**
@@ -281 +296 @@
      * Critical section NOT entered. */
     PFNPDMDEVRELOCATE   pfnRelocate;
-    /** Unused member. (Was pfnIOCtl.) */
-    PFNRT               pfnUnused;
+
+    /**
+     * Memory setup callback.
+     *
+     * @param   pDevIns         The device instance data.
+     * @param   enmCtx          Indicates the context of the call.
+     * @remarks The critical section is entered prior to calling this method.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnMemSetup, (PPDMDEVINS pDevIns, PDMDEVMEMSETUPCTX enmCtx));
+
     /** Power on notification - optional.
      * Critical section is entered. */
@@ -321 +344 @@
 
 /** Current DEVREG version number. */
-#define PDM_DEVREG_VERSION                      PDM_VERSION_MAKE(0xffff, 1, 0)
+#define PDM_DEVREG_VERSION                      PDM_VERSION_MAKE(0xffff, 2, 0)
 
 /** PDM Device Flags.

trunk/include/VBox/vmm/pgm.h

@@ -457 +457 @@
 VMMR3DECL(void)     PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3DECL(void)     PGMR3ResetCpu(PVM pVM, PVMCPU pVCpu);
-VMMR3DECL(void)     PGMR3Reset(PVM pVM);
+VMMR3_INT_DECL(void)    PGMR3Reset(PVM pVM);
+VMMR3_INT_DECL(void)    PGMR3MemSetup(PVM pVM, bool fReset);
 VMMR3DECL(int)      PGMR3Term(PVM pVM);
 VMMR3DECL(int)      PGMR3LockCall(PVM pVM);