Changeset 30724 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jul 8, 2010 8:30:20 AM (15 years ago)

Author:

vboxsync

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

63489

Message:

Recommitted r63480 - VMMDev: Adding an optional (disabled by default) testing side to the device to assist simple guest benchmarks and tests. Started on a MMIO and IOPort benchmark (for comparison with network performance numbers).

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (10 diffs)
• VMMDevState.h (modified) (2 diffs)
• VMMDevTesting.cpp (copied) (copied from trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp )
• VMMDevTesting.h (copied) (copied from trunk/src/VBox/Devices/VMMDev/VMMDevTesting.h )

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

@@ -27 +27 @@
 #include <VBox/log.h>
 #include <VBox/param.h>
-#include <VBox/mm.h>
 #include <VBox/pgm.h>
 #include <VBox/err.h>
@@ -48 +47 @@
 #ifdef VBOX_WITH_HGCM
 # include "VMMDevHGCM.h"
+#endif
+#ifndef VBOX_WITHOUT_TESTING_FEATURES
+# include "VMMDevTesting.h"
 #endif
 
@@ -2728 +2730 @@
         pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);
 
-    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore. 
+    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore.
      * This can be used for restore detection inside the guest.
      */
     pThis->idSession = ASMReadTSC();
+}
+
+
+/**
+ * @interface_method_impl{PDMDEVREG,pfnRelocate}
+ */
+static DECLCALLBACK(void) vmmdevRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+{
+    NOREF(pDevIns);
+    NOREF(offDelta);
 }
 
@@ -2745 +2757 @@
     Assert(iInstance == 0);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-
-    /*
-     * Validate and read the configuration.
-     */
-    if (!CFGMR3AreValuesValid(pCfg,
-                              "GetHostTimeDisabled\0"
-                              "BackdoorLogDisabled\0"
-                              "KeepCredentials\0"
-                              "HeapEnabled\0"
-                              ))
-        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
-
-    rc = CFGMR3QueryBoolDef(pCfg, "GetHostTimeDisabled", &pThis->fGetHostTimeDisabled, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean"));
-
-    rc = CFGMR3QueryBoolDef(pCfg, "BackdoorLogDisabled", &pThis->fBackdoorLogDisabled, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
-
-    rc = CFGMR3QueryBoolDef(pCfg, "KeepCredentials", &pThis->fKeepCredentials, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed querying \"KeepCredentials\" as a boolean"));
-
-    rc = CFGMR3QueryBoolDef(pCfg, "HeapEnabled", &pThis->fHeapEnabled, true);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed querying \"HeapEnabled\" as a boolean"));
 
     /*
@@ -2828 +2809 @@
 #endif
 
-    /** @todo convert this into a config parameter like we do everywhere else! */
-    pThis->cbGuestRAM = MMR3PhysGetRamSize(PDMDevHlpGetVM(pDevIns));
+    /*
+     * Validate and read the configuration.
+     */
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns,
+                                  "GetHostTimeDisabled|"
+                                  "BackdoorLogDisabled|"
+                                  "KeepCredentials|"
+                                  "HeapEnabled|"
+                                  "RamSize|"
+                                  "TestingEnabled"
+                                  ,
+                                  "");
+
+    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbGuestRAM);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"RamSize\" as a 64-bit unsigned integer"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "GetHostTimeDisabled", &pThis->fGetHostTimeDisabled, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "BackdoorLogDisabled", &pThis->fBackdoorLogDisabled, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "KeepCredentials", &pThis->fKeepCredentials, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"KeepCredentials\" as a boolean"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "HeapEnabled", &pThis->fHeapEnabled, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"HeapEnabled\" as a boolean"));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "RZEnabled", &pThis->fRZEnabled, true);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"RZEnabled\" as a boolean"));
+
+#ifndef VBOX_WITHOUT_TESTING_FEATURES
+    rc = CFGMR3QueryBoolDef(pCfg, "TestingEnabled", &pThis->fTestingEnabled, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"TestingEnabled\" as a boolean"));
+# ifdef DEBUG_bird /* lazy bird */
+    pThis->fTestingEnabled = true;
+# endif
+    /** @todo image-to-load-filename? */
+#endif
 
     /*
@@ -2890 +2922 @@
     }
 
+#ifndef VBOX_WITHOUT_TESTING_FEATURES
+    /*
+     * Initialize testing.
+     */
+    rc = vmmdevTestingInitialize(pDevIns);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+
     /*
      * Get the corresponding connector interface
@@ -2949 +2990 @@
     pThis->u32HGCMEnabled = 0;
 #endif /* VBOX_WITH_HGCM */
+
     /* In this version of VirtualBox the GUI checks whether "needs host cursor"
      * changes. */
@@ -2955 +2997 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatMemBalloonChunks, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "Memory balloon size", "/Devices/VMMDev/BalloonChunks");
 
-    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore. 
+    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore.
      * This can be used for restore detection inside the guest.
      */
@@ -2972 +3014 @@
     "VMMDev",
     /* szRCMod */
-    "",
+    "VBoxDDGC.gc",
     /* szR0Mod */
-    "",
+    "VBoxDDR0.r0",
     /* pszDescription */
     "VirtualBox VMM Device\n",
     /* fFlags */
-    PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_DEFAULT,
+    PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DEVREG_FLAGS_GUEST_BITS_DEFAULT | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
     /* fClass */
     PDM_DEVREG_CLASS_VMM_DEV,
@@ -2990 +3032 @@
     NULL,
     /* pfnRelocate */
-    NULL,
+    vmmdevRelocate,
     /* pfnIOCtl */
     NULL,

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

@@ -164 +164 @@
     /* guest ram size */
     uint64_t    cbGuestRAM;
-    
+
     /* unique session id; the id will be different after each start, reset or restore of the VM. */
     uint64_t    idSession;
@@ -215 +215 @@
 
     /** FLag whether CPU hotplug events are monitored */
-    bool                 fCpuHotPlugEventsEnabled;
+    bool                fCpuHotPlugEventsEnabled;
     /** CPU hotplug event */
-    VMMDevCpuEventType   enmCpuHotPlugEvent;
+    VMMDevCpuEventType  enmCpuHotPlugEvent;
     /** Core id of the CPU to change */
-    uint32_t             idCpuCore;
+    uint32_t            idCpuCore;
     /** Package id of the CPU to changhe */
-    uint32_t             idCpuPackage;
-
-    uint32_t             StatMemBalloonChunks;
+    uint32_t            idCpuPackage;
+
+    uint32_t            StatMemBalloonChunks;
+
+    /** Set if RC/R0 is enabled. */
+    bool                fRZEnabled;
+    /** Set if testing is enabled. */
+    bool                fTestingEnabled;
+    /** The high timestamp value. */
+    uint32_t            u32TestingHighTimestamp;
+
 } VMMDevState;
 AssertCompileMemberAlignment(VMMDevState, CritSect, 8);