Changeset 46376 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 4, 2013 11:46:07 AM (12 years ago)

Author:

vboxsync

Message:

VMMDev: Added TestingMMIO config option as the MMIO range isn't generally needed.

Location:

trunk/src/VBox/Devices

Files:

• VMMDev/VMMDev.cpp (modified) (2 diffs)
• VMMDev/VMMDevState.h (modified) (1 diff)
• VMMDev/VMMDevTesting.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -3680 +3680 @@
                                   "GuestCoreDumpCount|"
                                   "TestingEnabled|"
+                                  "TestingMMIO|"
                                   "TestintXmlOutputFile"
                                   ,
@@ -3738 +3739 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"TestingEnabled\" as a boolean"));
+    rc = CFGMR3QueryBoolDef(pCfg, "TestingMMIO", &pThis->fTestingMMIO, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"TestingMMIO\" as a boolean"));
     rc = CFGMR3QueryStringAllocDef(pCfg, "TestintXmlOutputFile", &pThis->pszTestingXmlOutput, NULL);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed querying \"TestintXmlOutputFile\" as a string"));
+
     /** @todo image-to-load-filename? */
 #endif

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -316 +316 @@
     /** Set if testing is enabled. */
     bool                fTestingEnabled;
-    /** Alignment padding. */
-    bool                afPadding9[HC_ARCH_BITS == 32 ? 2 : 6];
+    /** Set if testing the MMIO testing range is enabled. */
+    bool                fTestingMMIO;
+    /** Alignment padding. */
+    bool                afPadding9[HC_ARCH_BITS == 32 ? 1 : 5];
 #ifndef VBOX_WITHOUT_TESTING_FEATURES
     /** The high timestamp value. */

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -495 +495 @@
 {
     VMMDevState *pThis = PDMINS_2_DATA(pDevIns, VMMDevState *);
+    int          rc;
+
     if (!pThis->fTestingEnabled)
         return VINF_SUCCESS;
 
-    /*
-     * Register a chunk of MMIO memory that we'll use for various
-     * tests interfaces.
-     */
-    int rc = PDMDevHlpMMIORegister(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NULL /*pvUser*/,
+    if (pThis->fTestingMMIO)
+    {
+        /*
+         * Register a chunk of MMIO memory that we'll use for various
+         * tests interfaces.  Optional, needs to be explicitly enabled.
+         */
+        rc = PDMDevHlpMMIORegister(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NULL /*pvUser*/,
                                    IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU,
                                    vmmdevTestingMmioWrite, vmmdevTestingMmioRead, "VMMDev Testing");
-    AssertRCReturn(rc, rc);
-    if (pThis->fRZEnabled)
-    {
-        rc = PDMDevHlpMMIORegisterR0(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NIL_RTR0PTR /*pvUser*/,
-                                     "vmmdevTestingMmioWrite", "vmmdevTestingMmioRead");
         AssertRCReturn(rc, rc);
-        rc = PDMDevHlpMMIORegisterRC(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NIL_RTRCPTR /*pvUser*/,
-                                     "vmmdevTestingMmioWrite", "vmmdevTestingMmioRead");
-        AssertRCReturn(rc, rc);
+        if (pThis->fRZEnabled)
+        {
+            rc = PDMDevHlpMMIORegisterR0(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NIL_RTR0PTR /*pvUser*/,
+                                         "vmmdevTestingMmioWrite", "vmmdevTestingMmioRead");
+            AssertRCReturn(rc, rc);
+            rc = PDMDevHlpMMIORegisterRC(pDevIns, VMMDEV_TESTING_MMIO_BASE, VMMDEV_TESTING_MMIO_SIZE, NIL_RTRCPTR /*pvUser*/,
+                                         "vmmdevTestingMmioWrite", "vmmdevTestingMmioRead");
+            AssertRCReturn(rc, rc);
+        }
     }
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1481 +1481 @@
     GEN_CHECK_OFF(VMMDEV, fRZEnabled);
     GEN_CHECK_OFF(VMMDEV, fTestingEnabled);
+    GEN_CHECK_OFF(VMMDEV, fTestingMMIO);
     GEN_CHECK_OFF(VMMDEV, u32TestingHighTimestamp);
     GEN_CHECK_OFF(VMMDEV, u32TestingCmd);