Changeset 26173 in vbox for trunk/src/VBox/Devices/EFI/DevEFI.cpp

Timestamp:

Feb 2, 2010 9:11:09 PM (15 years ago)

Author:

vboxsync

Message:

PDM: s/pCfgHandle/pCfg/g - part 2.

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -710 +710 @@
  * @returns VBox status.
  * @param   pThis       The device instance data.
- * @param   pCfgHandle  Configuration node handle for the device.
- */
-static int efiLoadRom(PDEVEFI pThis, PCFGMNODE pCfgHandle)
+ * @param   pCfg        Configuration node handle for the device.
+ */
+static int efiLoadRom(PDEVEFI pThis, PCFGMNODE pCfg)
 {
     /*
@@ -791 +791 @@
  * @returns VBox status code.
  * @param   pThis       The device instance data.
- * @param   pCfgHandle  Configuration node handle for the device.
- */
-static int efiLoadThunk(PDEVEFI pThis, PCFGMNODE pCfgHandle)
+ * @param   pCfg        Configuration node handle for the device.
+ */
+static int efiLoadThunk(PDEVEFI pThis, PCFGMNODE pCfg)
 {
     uint8_t f64BitEntry = 0;
     int rc;
 
-    rc = CFGMR3QueryU8Def(pCfgHandle, "64BitEntry", &f64BitEntry, 0);
+    rc = CFGMR3QueryU8Def(pCfg, "64BitEntry", &f64BitEntry, 0);
     if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pThis->pDevIns, rc,
@@ -864 +864 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
+static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PDEVEFI     pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
@@ -876 +876 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle,
+    if (!CFGMR3AreValuesValid(pCfg,
                               "EfiRom\0"
                               "RamSize\0"
@@ -911 +911 @@
 
     /* CPU count (optional). */
-    rc = CFGMR3QueryU32Def(pCfgHandle, "NumCPUs", &pThis->cCpus, 1);
+    rc = CFGMR3QueryU32Def(pCfg, "NumCPUs", &pThis->cCpus, 1);
     AssertLogRelRCReturn(rc, rc);
 
-    rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &pThis->u8IOAPIC, 1);
+    rc = CFGMR3QueryU8Def(pCfg, "IOAPIC", &pThis->u8IOAPIC, 1);
     if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -923 +923 @@
      */
     RTUUID  uuid;
-    rc = CFGMR3QueryBytes(pCfgHandle, "UUID", &uuid, sizeof(uuid));
+    rc = CFGMR3QueryBytes(pCfg, "UUID", &uuid, sizeof(uuid));
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -936 +936 @@
 
     /* RAM sizes */
-    rc = CFGMR3QueryU64(pCfgHandle, "RamSize", &pThis->cbRam);
+    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbRam);
     AssertLogRelRCReturn(rc, rc);
-    rc = CFGMR3QueryU64(pCfgHandle, "RamHoleSize", &pThis->cbRamHole);
+    rc = CFGMR3QueryU64(pCfg, "RamHoleSize", &pThis->cbRamHole);
     AssertLogRelRCReturn(rc, rc);
     pThis->cbBelow4GB = RT_MIN(pThis->cbRam, _4G - pThis->cbRamHole);
@@ -947 +947 @@
      * Get the system EFI ROM file name.
      */
-    rc = CFGMR3QueryStringAlloc(pCfgHandle, "EfiRom", &pThis->pszEfiRomFile);
+    rc = CFGMR3QueryStringAlloc(pCfg, "EfiRom", &pThis->pszEfiRomFile);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
@@ -973 +973 @@
      * Get boot args.
      */
-    rc = CFGMR3QueryString(pCfgHandle, "BootArgs",
+    rc = CFGMR3QueryString(pCfg, "BootArgs",
                            pThis->pszBootArgs, sizeof pThis->pszBootArgs);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
@@ -996 +996 @@
      * Load firmware volume and thunk ROM.
      */
-    rc = efiLoadRom(pThis, pCfgHandle);
+    rc = efiLoadRom(pThis, pCfg);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = efiLoadThunk(pThis, pCfgHandle);
+    rc = efiLoadThunk(pThis, pCfg);
     if (RT_FAILURE(rc))
         return rc;