VirtualBox

Changeset 26173 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Feb 2, 2010 9:11:09 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
57187
Message:

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

Location:
trunk/src/VBox
Files:
71 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Bus/DevPCI.cpp

    r26169 r26173  
    19791979 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    19801980 */
    1981 static DECLCALLBACK(int)   pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     1981static DECLCALLBACK(int)   pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    19821982{
    19831983    int rc;
    … …  
    19871987     * Validate and read configuration.
    19881988     */
    1989     if (!CFGMR3AreValuesValid(pCfgHandle, "IOAPIC\0" "GCEnabled\0" "R0Enabled\0"))
     1989    if (!CFGMR3AreValuesValid(pCfg, "IOAPIC\0" "GCEnabled\0" "R0Enabled\0"))
    19901990        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    19911991
    19921992    /* query whether we got an IOAPIC */
    19931993    bool fUseIoApic;
    1994     rc = CFGMR3QueryBoolDef(pCfgHandle, "IOAPIC", &fUseIoApic, false);
     1994    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
    19951995    if (RT_FAILURE(rc))
    19961996        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    19991999    /* check if RC code is enabled. */
    20002000    bool fGCEnabled;
    2001     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     2001    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    20022002    if (RT_FAILURE(rc))
    20032003        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    20062006    /* check if R0 code is enabled. */
    20072007    bool fR0Enabled;
    2008     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     2008    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    20092009    if (RT_FAILURE(rc))
    20102010        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    23692369 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    23702370 */
    2371 static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     2371static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    23722372{
    23732373    int rc;
    … …  
    23762376     * Validate and read configuration.
    23772377     */
    2378     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0" "R0Enabled\0"))
     2378    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0" "R0Enabled\0"))
    23792379        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    23802380
    23812381    /* check if RC code is enabled. */
    23822382    bool fGCEnabled;
    2383     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     2383    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    23842384    if (RT_FAILURE(rc))
    23852385        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    23882388    /* check if R0 code is enabled. */
    23892389    bool fR0Enabled;
    2390     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     2390    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    23912391    if (RT_FAILURE(rc))
    23922392        return PDMDEV_SET_ERROR(pDevIns, rc,

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

    r26172 r26173  
    710710 * @returns VBox status.
    711711 * @param   pThis       The device instance data.
    712  * @param   pCfgHandle  Configuration node handle for the device.
    713  */
    714 static int efiLoadRom(PDEVEFI pThis, PCFGMNODE pCfgHandle)
     712 * @param   pCfg        Configuration node handle for the device.
     713 */
     714static int efiLoadRom(PDEVEFI pThis, PCFGMNODE pCfg)
    715715{
    716716    /*
    … …  
    791791 * @returns VBox status code.
    792792 * @param   pThis       The device instance data.
    793  * @param   pCfgHandle  Configuration node handle for the device.
    794  */
    795 static int efiLoadThunk(PDEVEFI pThis, PCFGMNODE pCfgHandle)
     793 * @param   pCfg        Configuration node handle for the device.
     794 */
     795static int efiLoadThunk(PDEVEFI pThis, PCFGMNODE pCfg)
    796796{
    797797    uint8_t f64BitEntry = 0;
    798798    int rc;
    799799
    800     rc = CFGMR3QueryU8Def(pCfgHandle, "64BitEntry", &f64BitEntry, 0);
     800    rc = CFGMR3QueryU8Def(pCfg, "64BitEntry", &f64BitEntry, 0);
    801801    if (RT_FAILURE (rc))
    802802        return PDMDEV_SET_ERROR(pThis->pDevIns, rc,
    … …  
    864864 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    865865 */
    866 static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     866static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    867867{
    868868    PDEVEFI     pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
    … …  
    876876     * Validate and read the configuration.
    877877     */
    878     if (!CFGMR3AreValuesValid(pCfgHandle,
     878    if (!CFGMR3AreValuesValid(pCfg,
    879879                              "EfiRom\0"
    880880                              "RamSize\0"
    … …  
    911911
    912912    /* CPU count (optional). */
    913     rc = CFGMR3QueryU32Def(pCfgHandle, "NumCPUs", &pThis->cCpus, 1);
     913    rc = CFGMR3QueryU32Def(pCfg, "NumCPUs", &pThis->cCpus, 1);
    914914    AssertLogRelRCReturn(rc, rc);
    915915
    916     rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &pThis->u8IOAPIC, 1);
     916    rc = CFGMR3QueryU8Def(pCfg, "IOAPIC", &pThis->u8IOAPIC, 1);
    917917    if (RT_FAILURE (rc))
    918918        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    923923     */
    924924    RTUUID  uuid;
    925     rc = CFGMR3QueryBytes(pCfgHandle, "UUID", &uuid, sizeof(uuid));
     925    rc = CFGMR3QueryBytes(pCfg, "UUID", &uuid, sizeof(uuid));
    926926    if (RT_FAILURE(rc))
    927927        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    936936
    937937    /* RAM sizes */
    938     rc = CFGMR3QueryU64(pCfgHandle, "RamSize", &pThis->cbRam);
     938    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbRam);
    939939    AssertLogRelRCReturn(rc, rc);
    940     rc = CFGMR3QueryU64(pCfgHandle, "RamHoleSize", &pThis->cbRamHole);
     940    rc = CFGMR3QueryU64(pCfg, "RamHoleSize", &pThis->cbRamHole);
    941941    AssertLogRelRCReturn(rc, rc);
    942942    pThis->cbBelow4GB = RT_MIN(pThis->cbRam, _4G - pThis->cbRamHole);
    … …  
    947947     * Get the system EFI ROM file name.
    948948     */
    949     rc = CFGMR3QueryStringAlloc(pCfgHandle, "EfiRom", &pThis->pszEfiRomFile);
     949    rc = CFGMR3QueryStringAlloc(pCfg, "EfiRom", &pThis->pszEfiRomFile);
    950950    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    951951    {
    … …  
    973973     * Get boot args.
    974974     */
    975     rc = CFGMR3QueryString(pCfgHandle, "BootArgs",
     975    rc = CFGMR3QueryString(pCfg, "BootArgs",
    976976                           pThis->pszBootArgs, sizeof pThis->pszBootArgs);
    977977    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    … …  
    996996     * Load firmware volume and thunk ROM.
    997997     */
    998     rc = efiLoadRom(pThis, pCfgHandle);
     998    rc = efiLoadRom(pThis, pCfg);
    999999    if (RT_FAILURE(rc))
    10001000        return rc;
    10011001
    1002     rc = efiLoadThunk(pThis, pCfgHandle);
     1002    rc = efiLoadThunk(pThis, pCfg);
    10031003    if (RT_FAILURE(rc))
    10041004        return rc;

  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r26165 r26173  
    58455845 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    58465846 */
    5847 static DECLCALLBACK(int)   vgaR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     5847static DECLCALLBACK(int)   vgaR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    58485848{
    58495849
    … …  
    58775877     * Validate configuration.
    58785878     */
    5879     if (!CFGMR3AreValuesValid(pCfgHandle, "VRamSize\0"
     5879    if (!CFGMR3AreValuesValid(pCfg, "VRamSize\0"
    58805880                                          "MonitorCount\0"
    58815881                                          "GCEnabled\0"
    … …  
    59105910     * Init state data.
    59115911     */
    5912     rc = CFGMR3QueryU32Def(pCfgHandle, "VRamSize", &pThis->vram_size, VGA_VRAM_DEFAULT);
     5912    rc = CFGMR3QueryU32Def(pCfg, "VRamSize", &pThis->vram_size, VGA_VRAM_DEFAULT);
    59135913    AssertLogRelRCReturn(rc, rc);
    59145914    if (pThis->vram_size > VGA_VRAM_MAX)
    … …  
    59195919                                   "VRamSize is too small, %#x, max %#x", pThis->vram_size, VGA_VRAM_MIN);
    59205920
    5921     rc = CFGMR3QueryU32Def(pCfgHandle, "MonitorCount", &pThis->cMonitors, 1);
     5921    rc = CFGMR3QueryU32Def(pCfg, "MonitorCount", &pThis->cMonitors, 1);
    59225922    AssertLogRelRCReturn(rc, rc);
    59235923
    5924     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     5924    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    59255925    AssertLogRelRCReturn(rc, rc);
    59265926
    5927     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     5927    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    59285928    AssertLogRelRCReturn(rc, rc);
    59295929    Log(("VGA: VRamSize=%#x fGCenabled=%RTbool fR0Enabled=%RTbool\n", pThis->vram_size, pThis->fGCEnabled, pThis->fR0Enabled));
    … …  
    62106210    cb = sizeof(mode_info_list) + sizeof(ModeInfoListItem);
    62116211
    6212     rc = CFGMR3QueryU32(pCfgHandle, "HeightReduction", &cyReduction);
     6212    rc = CFGMR3QueryU32(pCfg, "HeightReduction", &cyReduction);
    62136213    if (RT_SUCCESS(rc) && cyReduction)
    62146214        cb *= 2;                            /* Default mode list will be twice long */
    … …  
    62166216        cyReduction = 0;
    62176217
    6218     rc = CFGMR3QueryU32(pCfgHandle, "CustomVideoModes", &cCustomModes);
     6218    rc = CFGMR3QueryU32(pCfg, "CustomVideoModes", &cCustomModes);
    62196219    if (RT_SUCCESS(rc) && cCustomModes)
    62206220        cb += sizeof(ModeInfoListItem) * cCustomModes;
    … …  
    63046304            /* query and decode the custom mode string. */
    63056305            RTStrPrintf(szExtraDataKey, sizeof(szExtraDataKey), "CustomVideoMode%d", i);
    6306             rc = CFGMR3QueryStringAlloc(pCfgHandle, szExtraDataKey, &pszExtraData);
     6306            rc = CFGMR3QueryStringAlloc(pCfg, szExtraDataKey, &pszExtraData);
    63076307            if (RT_SUCCESS(rc))
    63086308            {
    … …  
    64266426    LOGOHDR LogoHdr = { LOGO_HDR_MAGIC, 0, 0, 0, 0, 0, 0 };
    64276427
    6428     rc = CFGMR3QueryU8(pCfgHandle, "FadeIn", &LogoHdr.fu8FadeIn);
     6428    rc = CFGMR3QueryU8(pCfg, "FadeIn", &LogoHdr.fu8FadeIn);
    64296429    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    64306430        LogoHdr.fu8FadeIn = 1;
    … …  
    64336433                                N_("Configuration error: Querying \"FadeIn\" as integer failed"));
    64346434
    6435     rc = CFGMR3QueryU8(pCfgHandle, "FadeOut", &LogoHdr.fu8FadeOut);
     6435    rc = CFGMR3QueryU8(pCfg, "FadeOut", &LogoHdr.fu8FadeOut);
    64366436    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    64376437        LogoHdr.fu8FadeOut = 1;
    … …  
    64406440                                N_("Configuration error: Querying \"FadeOut\" as integer failed"));
    64416441
    6442     rc = CFGMR3QueryU16(pCfgHandle, "LogoTime", &LogoHdr.u16LogoMillies);
     6442    rc = CFGMR3QueryU16(pCfg, "LogoTime", &LogoHdr.u16LogoMillies);
    64436443    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    64446444        LogoHdr.u16LogoMillies = 0;
    … …  
    64516451        LogoHdr.u16LogoMillies = RT_MAX(LogoHdr.u16LogoMillies, LOGO_DELAY_TIME);
    64526452
    6453     rc = CFGMR3QueryU8(pCfgHandle, "ShowBootMenu", &LogoHdr.fu8ShowBootMenu);
     6453    rc = CFGMR3QueryU8(pCfg, "ShowBootMenu", &LogoHdr.fu8ShowBootMenu);
    64546454    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    64556455        LogoHdr.fu8ShowBootMenu = 0;
    … …  
    64616461     * Get the Logo file name.
    64626462     */
    6463     rc = CFGMR3QueryStringAlloc(pCfgHandle, "LogoFile", &pThis->pszLogoFile);
     6463    rc = CFGMR3QueryStringAlloc(pCfg, "LogoFile", &pThis->pszLogoFile);
    64646464    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    64656465        pThis->pszLogoFile = NULL;

  • trunk/src/VBox/Devices/Input/DevPS2.cpp

    r26169 r26173  
    15831583 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    15841584 */
    1585 static DECLCALLBACK(int) kbdConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     1585static DECLCALLBACK(int) kbdConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    15861586{
    15871587    KBDState   *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
    … …  
    15961596     * Validate and read the configuration.
    15971597     */
    1598     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0R0Enabled\0"))
     1598    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0R0Enabled\0"))
    15991599        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    1600     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     1600    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    16011601    if (RT_FAILURE(rc))
    16021602        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"GCEnabled\" from the config"));
    1603     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     1603    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    16041604    if (RT_FAILURE(rc))
    16051605        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"R0Enabled\" from the config"));

  • trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

    r26166 r26173  
    234234 * @copydoc FNPDMDRVCONSTRUCT
    235235 */
    236 static DECLCALLBACK(int) drvKbdQueueConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     236static DECLCALLBACK(int) drvKbdQueueConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    237237{
    238238    PDRVKBDQUEUE pDrv = PDMINS_2_DATA(pDrvIns, PDRVKBDQUEUE);
    … …  
    243243     * Validate configuration.
    244244     */
    245     if (!CFGMR3AreValuesValid(pCfgHandle, "QueueSize\0Interval\0"))
     245    if (!CFGMR3AreValuesValid(pCfg, "QueueSize\0Interval\0"))
    246246        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    247247
    … …  
    288288     */
    289289    uint32_t cMilliesInterval = 0;
    290     rc = CFGMR3QueryU32(pCfgHandle, "Interval", &cMilliesInterval);
     290    rc = CFGMR3QueryU32(pCfg, "Interval", &cMilliesInterval);
    291291    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    292292        cMilliesInterval = 0;
    … …  
    298298
    299299    uint32_t cItems = 0;
    300     rc = CFGMR3QueryU32(pCfgHandle, "QueueSize", &cItems);
     300    rc = CFGMR3QueryU32(pCfg, "QueueSize", &cItems);
    301301    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    302302        cItems = 128;

  • trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

    r26166 r26173  
    223223 * @copydoc FNPDMDRVCONSTRUCT
    224224 */
    225 static DECLCALLBACK(int) drvMouseQueueConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     225static DECLCALLBACK(int) drvMouseQueueConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    226226{
    227227    PDRVMOUSEQUEUE pDrv = PDMINS_2_DATA(pDrvIns, PDRVMOUSEQUEUE);
    … …  
    232232     * Validate configuration.
    233233     */
    234     if (!CFGMR3AreValuesValid(pCfgHandle, "QueueSize\0Interval\0"))
     234    if (!CFGMR3AreValuesValid(pCfg, "QueueSize\0Interval\0"))
    235235        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    236236
    … …  
    275275     */
    276276    uint32_t cMilliesInterval = 0;
    277     rc = CFGMR3QueryU32(pCfgHandle, "Interval", &cMilliesInterval);
     277    rc = CFGMR3QueryU32(pCfg, "Interval", &cMilliesInterval);
    278278    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    279279        cMilliesInterval = 0;
    … …  
    285285
    286286    uint32_t cItems = 0;
    287     rc = CFGMR3QueryU32(pCfgHandle, "QueueSize", &cItems);
     287    rc = CFGMR3QueryU32(pCfg, "QueueSize", &cItems);
    288288    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    289289        cItems = 128;

  • trunk/src/VBox/Devices/Network/DevE1000.cpp

    r26160 r26173  
    50255025 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    50265026 */
    5027 static DECLCALLBACK(int) e1kConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     5027static DECLCALLBACK(int) e1kConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    50285028{
    50295029    E1KSTATE* pState = PDMINS_2_DATA(pDevIns, E1KSTATE*);
    … …  
    50405040     * Validate configuration.
    50415041     */
    5042     if (!CFGMR3AreValuesValid(pCfgHandle, "MAC\0" "CableConnected\0" "AdapterType\0" "LineSpeed\0"))
     5042    if (!CFGMR3AreValuesValid(pCfg, "MAC\0" "CableConnected\0" "AdapterType\0" "LineSpeed\0"))
    50435043        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    50445044                                N_("Invalid configuration for E1000 device"));
    … …  
    50475047
    50485048    /* Get config params */
    5049     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", pState->macConfigured.au8,
     5049    rc = CFGMR3QueryBytes(pCfg, "MAC", pState->macConfigured.au8,
    50505050                          sizeof(pState->macConfigured.au8));
    50515051    if (RT_FAILURE(rc))
    50525052        return PDMDEV_SET_ERROR(pDevIns, rc,
    50535053                                N_("Configuration error: Failed to get MAC address"));
    5054     rc = CFGMR3QueryBool(pCfgHandle, "CableConnected", &pState->fCableConnected);
     5054    rc = CFGMR3QueryBool(pCfg, "CableConnected", &pState->fCableConnected);
    50555055    if (RT_FAILURE(rc))
    50565056        return PDMDEV_SET_ERROR(pDevIns, rc,
    50575057                                N_("Configuration error: Failed to get the value of 'CableConnected'"));
    5058     rc = CFGMR3QueryU32(pCfgHandle, "AdapterType", (uint32_t*)&pState->eChip);
     5058    rc = CFGMR3QueryU32(pCfg, "AdapterType", (uint32_t*)&pState->eChip);
    50595059    if (RT_FAILURE(rc))
    50605060        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/Network/DevINIP.cpp

    r26165 r26173  
    446446 */
    447447static DECLCALLBACK(int) devINIPConstruct(PPDMDEVINS pDevIns, int iInstance,
    448                                           PCFGMNODE pCfgHandle)
     448                                          PCFGMNODE pCfg)
    449449{
    450450    PDEVINTNETIP pThis = PDMINS_2_DATA(pDevIns, PDEVINTNETIP);
    451451    int rc = VINF_SUCCESS;
    452     LogFlow(("%s: pDevIns=%p iInstance=%d pCfgHandle=%p\n", __FUNCTION__,
    453              pDevIns, iInstance, pCfgHandle));
     452    LogFlow(("%s: pDevIns=%p iInstance=%d pCfg=%p\n", __FUNCTION__,
     453             pDevIns, iInstance, pCfg));
    454454
    455455    Assert(iInstance == 0);
    … …  
    459459     * Validate the config.
    460460     */
    461     if (!CFGMR3AreValuesValid(pCfgHandle, "MAC\0IP\0Netmask\0Gateway\0"))
     461    if (!CFGMR3AreValuesValid(pCfg, "MAC\0IP\0Netmask\0Gateway\0"))
    462462    {
    463463        rc = PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    … …  
    483483     * Get the configuration settings.
    484484     */
    485     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", &pThis->MAC, sizeof(pThis->MAC));
     485    rc = CFGMR3QueryBytes(pCfg, "MAC", &pThis->MAC, sizeof(pThis->MAC));
    486486    if (rc == VERR_CFGM_NOT_BYTES)
    487487    {
    488488        char szMAC[64];
    489         rc = CFGMR3QueryString(pCfgHandle, "MAC", &szMAC[0], sizeof(szMAC));
     489        rc = CFGMR3QueryString(pCfg, "MAC", &szMAC[0], sizeof(szMAC));
    490490        if (RT_SUCCESS(rc))
    491491        {
    … …  
    520520        goto out;
    521521    }
    522     rc = CFGMR3QueryStringAlloc(pCfgHandle, "IP", &pThis->pszIP);
     522    rc = CFGMR3QueryStringAlloc(pCfg, "IP", &pThis->pszIP);
    523523    if (RT_FAILURE(rc))
    524524    {
    … …  
    527527        goto out;
    528528    }
    529     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Netmask", &pThis->pszNetmask);
     529    rc = CFGMR3QueryStringAlloc(pCfg, "Netmask", &pThis->pszNetmask);
    530530    if (RT_FAILURE(rc))
    531531    {
    … …  
    534534        goto out;
    535535    }
    536     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Gateway", &pThis->pszGateway);
     536    rc = CFGMR3QueryStringAlloc(pCfg, "Gateway", &pThis->pszGateway);
    537537    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    538538        rc = VINF_SUCCESS;

  • trunk/src/VBox/Devices/Network/DevPCNet.cpp

    r26165 r26173  
    49334933 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    49344934 */
    4935 static DECLCALLBACK(int) pcnetConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     4935static DECLCALLBACK(int) pcnetConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    49364936{
    49374937    PCNetState     *pThis = PDMINS_2_DATA(pDevIns, PCNetState *);
    … …  
    49574957     * Validate configuration.
    49584958     */
    4959     if (!CFGMR3AreValuesValid(pCfgHandle, "MAC\0" "CableConnected\0" "Am79C973\0" "LineSpeed\0" "GCEnabled\0" "R0Enabled\0" "PrivIfEnabled\0"))
     4959    if (!CFGMR3AreValuesValid(pCfg, "MAC\0" "CableConnected\0" "Am79C973\0" "LineSpeed\0" "GCEnabled\0" "R0Enabled\0" "PrivIfEnabled\0"))
    49604960        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    49614961                                N_("Invalid configuration for pcnet device"));
    … …  
    49644964     * Read the configuration.
    49654965     */
    4966     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", &pThis->MacConfigured, sizeof(pThis->MacConfigured));
     4966    rc = CFGMR3QueryBytes(pCfg, "MAC", &pThis->MacConfigured, sizeof(pThis->MacConfigured));
    49674967    if (RT_FAILURE(rc))
    49684968        return PDMDEV_SET_ERROR(pDevIns, rc,
    49694969                                N_("Configuration error: Failed to get the \"MAC\" value"));
    4970     rc = CFGMR3QueryBoolDef(pCfgHandle, "CableConnected", &pThis->fLinkUp, true);
     4970    rc = CFGMR3QueryBoolDef(pCfg, "CableConnected", &pThis->fLinkUp, true);
    49714971    if (RT_FAILURE(rc))
    49724972        return PDMDEV_SET_ERROR(pDevIns, rc,
    49734973                                N_("Configuration error: Failed to get the \"CableConnected\" value"));
    49744974
    4975     rc = CFGMR3QueryBoolDef(pCfgHandle, "Am79C973", &pThis->fAm79C973, false);
     4975    rc = CFGMR3QueryBoolDef(pCfg, "Am79C973", &pThis->fAm79C973, false);
    49764976    if (RT_FAILURE(rc))
    49774977        return PDMDEV_SET_ERROR(pDevIns, rc,
    49784978                                N_("Configuration error: Failed to get the \"Am79C973\" value"));
    49794979
    4980     rc = CFGMR3QueryU32Def(pCfgHandle, "LineSpeed", &pThis->u32LinkSpeed, 1000000); /* 1GBit/s (in kbps units)*/
     4980    rc = CFGMR3QueryU32Def(pCfg, "LineSpeed", &pThis->u32LinkSpeed, 1000000); /* 1GBit/s (in kbps units)*/
    49814981    if (RT_FAILURE(rc))
    49824982        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    49844984
    49854985#ifdef PCNET_GC_ENABLED
    4986     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     4986    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    49874987    if (RT_FAILURE(rc))
    49884988        return PDMDEV_SET_ERROR(pDevIns, rc,
    49894989                                N_("Configuration error: Failed to get the \"GCEnabled\" value"));
    49904990
    4991     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     4991    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    49924992    if (RT_FAILURE(rc))
    49934993        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    50665066
    50675067    bool fPrivIfEnabled;
    5068     rc = CFGMR3QueryBool(pCfgHandle, "PrivIfEnabled", &fPrivIfEnabled);
     5068    rc = CFGMR3QueryBool(pCfg, "PrivIfEnabled", &fPrivIfEnabled);
    50695069    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    50705070        fPrivIfEnabled = true;

  • trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

    r26160 r26173  
    16211621 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    16221622 */
    1623 static DECLCALLBACK(int) vnetConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     1623static DECLCALLBACK(int) vnetConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    16241624{
    16251625    VNETSTATE* pState = PDMINS_2_DATA(pDevIns, VNETSTATE*);
    … …  
    16431643     * Validate configuration.
    16441644     */
    1645     if (!CFGMR3AreValuesValid(pCfgHandle, "MAC\0" "CableConnected\0" "LineSpeed\0"))
     1645    if (!CFGMR3AreValuesValid(pCfg, "MAC\0" "CableConnected\0" "LineSpeed\0"))
    16461646                    return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    16471647                                            N_("Invalid configuration for VirtioNet device"));
    16481648
    16491649    /* Get config params */
    1650     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", pState->macConfigured.au8,
     1650    rc = CFGMR3QueryBytes(pCfg, "MAC", pState->macConfigured.au8,
    16511651                          sizeof(pState->macConfigured));
    16521652    if (RT_FAILURE(rc))
    16531653        return PDMDEV_SET_ERROR(pDevIns, rc,
    16541654                                N_("Configuration error: Failed to get MAC address"));
    1655     rc = CFGMR3QueryBool(pCfgHandle, "CableConnected", &pState->fCableConnected);
     1655    rc = CFGMR3QueryBool(pCfg, "CableConnected", &pState->fCableConnected);
    16561656    if (RT_FAILURE(rc))
    16571657        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/Network/DrvIntNet.cpp

    r26166 r26173  
    808808 * @copydoc FNPDMDRVCONSTRUCT
    809809 */
    810 static DECLCALLBACK(int) drvR3IntNetConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     810static DECLCALLBACK(int) drvR3IntNetConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    811811{
    812812    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    … …  
    835835     * Validate the config.
    836836     */
    837     if (!CFGMR3AreValuesValid(pCfgHandle,
     837    if (!CFGMR3AreValuesValid(pCfg,
    838838                              "Network\0"
    839839                              "Trunk\0"
    … …  
    884884     * The name of the internal network to connect to.
    885885     */
    886     int rc = CFGMR3QueryString(pCfgHandle, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
     886    int rc = CFGMR3QueryString(pCfg, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
    887887    if (RT_FAILURE(rc))
    888888        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    894894     */
    895895    uint32_t u32TrunkType;
    896     rc = CFGMR3QueryU32(pCfgHandle, "TrunkType", &u32TrunkType);
     896    rc = CFGMR3QueryU32(pCfg, "TrunkType", &u32TrunkType);
    897897    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    898898        u32TrunkType = kIntNetTrunkType_None;
    … …  
    905905     * The name of the trunk connection.
    906906     */
    907     rc = CFGMR3QueryString(pCfgHandle, "Trunk", OpenReq.szTrunk, sizeof(OpenReq.szTrunk));
     907    rc = CFGMR3QueryString(pCfg, "Trunk", OpenReq.szTrunk, sizeof(OpenReq.szTrunk));
    908908    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    909909        OpenReq.szTrunk[0] = '\0';
    … …  
    917917     */
    918918    bool fRestrictAccess;
    919     rc = CFGMR3QueryBool(pCfgHandle, "RestrictAccess", &fRestrictAccess);
     919    rc = CFGMR3QueryBool(pCfg, "RestrictAccess", &fRestrictAccess);
    920920    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    921921        fRestrictAccess = true;
    … …  
    928928     * When set all request for operating any interface or trunk in promiscuous
    929929     * mode will be ignored. */
    930     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreAllPromisc", &f, false);
     930    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreAllPromisc", &f, false);
    931931    if (RT_FAILURE(rc))
    932932        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    939939     * mode will be ignored.  This differs from IgnoreAllPromisc in that clients
    940940     * won't get VERR_INTNET_INCOMPATIBLE_FLAGS. */
    941     rc = CFGMR3QueryBoolDef(pCfgHandle, "QuietlyIgnoreAllPromisc", &f, false);
     941    rc = CFGMR3QueryBoolDef(pCfg, "QuietlyIgnoreAllPromisc", &f, false);
    942942    if (RT_FAILURE(rc))
    943943        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    949949     * When set all request for operating any non-trunk interface in promiscuous
    950950     * mode will be ignored. */
    951     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreClientPromisc", &f, false);
     951    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreClientPromisc", &f, false);
    952952    if (RT_FAILURE(rc))
    953953        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    960960     * will be ignored.  This differs from IgnoreClientPromisc in that clients won't
    961961     * get VERR_INTNET_INCOMPATIBLE_FLAGS. */
    962     rc = CFGMR3QueryBoolDef(pCfgHandle, "QuietlyIgnoreClientPromisc", &f, false);
     962    rc = CFGMR3QueryBoolDef(pCfg, "QuietlyIgnoreClientPromisc", &f, false);
    963963    if (RT_FAILURE(rc))
    964964        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    970970     * When set all request for operating the trunk-wire connection in promiscuous
    971971     * mode will be ignored. */
    972     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreTrunkWirePromisc", &f, false);
     972    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreTrunkWirePromisc", &f, false);
    973973    if (RT_FAILURE(rc))
    974974        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    981981     * will be ignored.  This differs from IgnoreTrunkWirePromisc in that clients
    982982     * won't get VERR_INTNET_INCOMPATIBLE_FLAGS. */
    983     rc = CFGMR3QueryBoolDef(pCfgHandle, "QuietlyIgnoreTrunkWirePromisc", &f, false);
     983    rc = CFGMR3QueryBoolDef(pCfg, "QuietlyIgnoreTrunkWirePromisc", &f, false);
    984984    if (RT_FAILURE(rc))
    985985        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    991991     * When set all request for operating the trunk-host connection in promiscuous
    992992     * mode will be ignored. */
    993     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreTrunkHostPromisc", &f, false);
     993    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreTrunkHostPromisc", &f, false);
    994994    if (RT_FAILURE(rc))
    995995        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    10021002     * will be ignored.  This differs from IgnoreTrunkHostPromisc in that clients
    10031003     * won't get VERR_INTNET_INCOMPATIBLE_FLAGS. */
    1004     rc = CFGMR3QueryBoolDef(pCfgHandle, "QuietlyIgnoreTrunkHostPromisc", &f, false);
     1004    rc = CFGMR3QueryBoolDef(pCfg, "QuietlyIgnoreTrunkHostPromisc", &f, false);
    10051005    if (RT_FAILURE(rc))
    10061006        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    10181018     */
    10191019    bool fSharedMacOnWire;
    1020     rc = CFGMR3QueryBoolDef(pCfgHandle, "SharedMacOnWire", &fSharedMacOnWire, false);
     1020    rc = CFGMR3QueryBoolDef(pCfg, "SharedMacOnWire", &fSharedMacOnWire, false);
    10211021    if (RT_FAILURE(rc))
    10221022        return PDMDRV_SET_ERROR(pDrvIns, rc,
    … …  
    10281028     * The size of the receive buffer.
    10291029     */
    1030     rc = CFGMR3QueryU32(pCfgHandle, "ReceiveBufferSize", &OpenReq.cbRecv);
     1030    rc = CFGMR3QueryU32(pCfg, "ReceiveBufferSize", &OpenReq.cbRecv);
    10311031    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    10321032        OpenReq.cbRecv = 218 * _1K ;
    … …  
    10431043     * side of it and the code will get very upset about it all.
    10441044     */
    1045     rc = CFGMR3QueryU32(pCfgHandle, "SendBufferSize", &OpenReq.cbSend);
     1045    rc = CFGMR3QueryU32(pCfg, "SendBufferSize", &OpenReq.cbSend);
    10461046    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    10471047        OpenReq.cbSend = 36*_1K;
    … …  
    10591059     * a service such as LWIP/iSCSI it shouldn't suspend immediately like for a NIC.
    10601060     */
    1061     rc = CFGMR3QueryBool(pCfgHandle, "IsService", &pThis->fActivateEarlyDeactivateLate);
     1061    rc = CFGMR3QueryBool(pCfg, "IsService", &pThis->fActivateEarlyDeactivateLate);
    10621062    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    10631063        pThis->fActivateEarlyDeactivateLate = false;

  • trunk/src/VBox/Devices/Network/DrvNAT.cpp

    r26166 r26173  
    863863 *
    864864 * @returns VBox status code.
    865  * @param   pCfgHandle      The drivers configuration handle.
    866  */
    867 static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfgHandle, RTIPV4ADDR Network)
     865 * @param   pCfg            The configuration handle.
     866 */
     867static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfg, RTIPV4ADDR Network)
    868868{
    869869     RTMAC Mac;
    … …  
    872872     * Enumerate redirections.
    873873     */
    874     for (PCFGMNODE pNode = CFGMR3GetFirstChild(pCfgHandle); pNode; pNode = CFGMR3GetNextChild(pNode))
     874    for (PCFGMNODE pNode = CFGMR3GetFirstChild(pCfg); pNode; pNode = CFGMR3GetNextChild(pNode))
    875875    {
    876876        /*
    … …  
    966966 * @copydoc FNPDMDRVCONSTRUCT
    967967 */
    968 static DECLCALLBACK(int) drvNATConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     968static DECLCALLBACK(int) drvNATConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    969969{
    970970    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    … …  
    975975     * Validate the config.
    976976     */
    977     if (!CFGMR3AreValuesValid(pCfgHandle,
     977    if (!CFGMR3AreValuesValid(pCfg,
    978978                              "PassDomain\0TFTPPrefix\0BootFile\0Network"
    979979                              "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
    … …  
    10061006    int rc;
    10071007    bool fPassDomain = true;
    1008     GET_BOOL(rc, pThis, pCfgHandle, "PassDomain", fPassDomain);
    1009 
    1010     GET_STRING_ALLOC(rc, pThis, pCfgHandle, "TFTPPrefix", pThis->pszTFTPPrefix);
    1011     GET_STRING_ALLOC(rc, pThis, pCfgHandle, "BootFile", pThis->pszBootFile);
    1012     GET_STRING_ALLOC(rc, pThis, pCfgHandle, "NextServer", pThis->pszNextServer);
     1008    GET_BOOL(rc, pThis, pCfg, "PassDomain", fPassDomain);
     1009
     1010    GET_STRING_ALLOC(rc, pThis, pCfg, "TFTPPrefix", pThis->pszTFTPPrefix);
     1011    GET_STRING_ALLOC(rc, pThis, pCfg, "BootFile", pThis->pszBootFile);
     1012    GET_STRING_ALLOC(rc, pThis, pCfg, "NextServer", pThis->pszNextServer);
    10131013
    10141014    int fDNSProxy = 0;
    1015     GET_S32(rc, pThis, pCfgHandle, "DNSProxy", fDNSProxy);
     1015    GET_S32(rc, pThis, pCfg, "DNSProxy", fDNSProxy);
    10161016    int fUseHostResolver = 0;
    1017     GET_S32(rc, pThis, pCfgHandle, "UseHostResolver", fUseHostResolver);
     1017    GET_S32(rc, pThis, pCfg, "UseHostResolver", fUseHostResolver);
    10181018#ifdef VBOX_WITH_SLIRP_BSD_MBUF
    10191019    int MTU = 1500;
    1020     GET_S32(rc, pThis, pCfgHandle, "SlirpMTU", MTU);
     1020    GET_S32(rc, pThis, pCfg, "SlirpMTU", MTU);
    10211021#endif
    10221022
    … …  
    10371037    /* Generate a network address for this network card. */
    10381038    char szNetwork[32]; /* xxx.xxx.xxx.xxx/yy */
    1039     GET_STRING(rc, pThis, pCfgHandle, "Network", szNetwork[0], sizeof(szNetwork));
     1039    GET_STRING(rc, pThis, pCfg, "Network", szNetwork[0], sizeof(szNetwork));
    10401040    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    10411041        RTStrPrintf(szNetwork, sizeof(szNetwork), "10.0.%d.0/24", pDrvIns->iInstance + 2);
    … …  
    10681068#endif
    10691069        char *pszBindIP = NULL;
    1070         GET_STRING_ALLOC(rc, pThis, pCfgHandle, "BindIP", pszBindIP);
     1070        GET_STRING_ALLOC(rc, pThis, pCfg, "BindIP", pszBindIP);
    10711071        rc = slirp_set_binding_address(pThis->pNATState, pszBindIP);
    10721072        if (rc != 0)
    … …  
    10791079            {                                                   \
    10801080                int len = 0;                                    \
    1081                 rc = CFGMR3QueryS32(pCfgHandle, name, &len);    \
     1081                rc = CFGMR3QueryS32(pCfg, name, &len);    \
    10821082                if (RT_SUCCESS(rc))                             \
    10831083                    setter(pThis->pNATState, len);              \
    … …  
    10961096#endif
    10971097
    1098         int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfgHandle, Network);
     1098        int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfg, Network);
    10991099        if (RT_SUCCESS(rc2))
    11001100        {

  • trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

    r26166 r26173  
    350350 * @copydoc FNPDMDRVCONSTRUCT
    351351 */
    352 static DECLCALLBACK(int) drvNetSnifferConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     352static DECLCALLBACK(int) drvNetSnifferConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    353353{
    354354    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
    … …  
    359359     * Validate the config.
    360360     */
    361     if (!CFGMR3AreValuesValid(pCfgHandle, "File\0"))
     361    if (!CFGMR3AreValuesValid(pCfg, "File\0"))
    362362        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    363363
    364     if (CFGMR3GetFirstChild(pCfgHandle))
     364    if (CFGMR3GetFirstChild(pCfg))
    365365        LogRel(("NetSniffer: Found child config entries -- are you trying to redirect ports?\n"));
    366366
    … …  
    389389     * Get the filename.
    390390     */
    391     int rc = CFGMR3QueryString(pCfgHandle, "File", pThis->szFilename, sizeof(pThis->szFilename));
     391    int rc = CFGMR3QueryString(pCfg, "File", pThis->szFilename, sizeof(pThis->szFilename));
    392392    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    393393    {

  • trunk/src/VBox/Devices/Network/DrvTAP.cpp

    r26166 r26173  
    879879 * @copydoc FNPDMDRVCONSTRUCT
    880880 */
    881 static DECLCALLBACK(int) drvTAPConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     881static DECLCALLBACK(int) drvTAPConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    882882{
    883883    PDRVTAP pThis = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    … …  
    911911     * Validate the config.
    912912     */
    913     if (!CFGMR3AreValuesValid(pCfgHandle, "Device\0InitProg\0TermProg\0FileHandle\0TAPSetupApplication\0TAPTerminateApplication\0MAC"))
     913    if (!CFGMR3AreValuesValid(pCfg, "Device\0InitProg\0TermProg\0FileHandle\0TAPSetupApplication\0TAPTerminateApplication\0MAC"))
    914914        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, "");
    915915
    … …  
    934934    int rc;
    935935#if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl & VBoxBFE. */
    936     rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPSetupApplication", &pThis->pszSetupApplication);
     936    rc = CFGMR3QueryStringAlloc(pCfg, "TAPSetupApplication", &pThis->pszSetupApplication);
    937937    if (RT_SUCCESS(rc))
    938938    {
    … …  
    944944        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: failed to query \"TAPTerminateApplication\""));
    945945
    946     rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPTerminateApplication", &pThis->pszTerminateApplication);
     946    rc = CFGMR3QueryStringAlloc(pCfg, "TAPTerminateApplication", &pThis->pszTerminateApplication);
    947947    if (RT_SUCCESS(rc))
    948948    {
    … …  
    955955
    956956# ifdef VBOX_WITH_CROSSBOW
    957     rc = CFGMR3QueryBytes(pCfgHandle, "MAC", &pThis->MacAddress, sizeof(pThis->MacAddress));
     957    rc = CFGMR3QueryBytes(pCfg, "MAC", &pThis->MacAddress, sizeof(pThis->MacAddress));
    958958    if (RT_FAILURE(rc))
    959959        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: Failed to query \"MAC\""));
    960960# endif
    961961
    962     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Device", &pThis->pszDeviceName);
     962    rc = CFGMR3QueryStringAlloc(pCfg, "Device", &pThis->pszDeviceName);
    963963    if (RT_FAILURE(rc))
    964964        pThis->fStatic = false;
    … …  
    992992
    993993    int32_t iFile;
    994     rc = CFGMR3QueryS32(pCfgHandle, "FileHandle", &iFile);
     994    rc = CFGMR3QueryS32(pCfg, "FileHandle", &iFile);
    995995    if (RT_FAILURE(rc))
    996996        return PDMDRV_SET_ERROR(pDrvIns, rc,

  • trunk/src/VBox/Devices/PC/DevACPI.cpp

    r26172 r26173  
    22282228 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    22292229 */
    2230 static DECLCALLBACK(int) acpiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     2230static DECLCALLBACK(int) acpiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    22312231{
    22322232    ACPIState *s   = PDMINS_2_DATA(pDevIns, ACPIState *);
    … …  
    22352235
    22362236    /* Validate and read the configuration. */
    2237     if (!CFGMR3AreValuesValid(pCfgHandle,
     2237    if (!CFGMR3AreValuesValid(pCfg,
    22382238                              "RamSize\0"
    22392239                              "RamHoleSize\0"
    … …  
    22562256
    22572257    /* query whether we are supposed to present an IOAPIC */
    2258     int rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &s->u8UseIOApic, 1);
     2258    int rc = CFGMR3QueryU8Def(pCfg, "IOAPIC", &s->u8UseIOApic, 1);
    22592259    if (RT_FAILURE(rc))
    22602260        return PDMDEV_SET_ERROR(pDevIns, rc,
    22612261                                N_("Configuration error: Failed to read \"IOAPIC\""));
    22622262
    2263     rc = CFGMR3QueryU16Def(pCfgHandle, "NumCPUs", &s->cCpus, 1);
     2263    rc = CFGMR3QueryU16Def(pCfg, "NumCPUs", &s->cCpus, 1);
    22642264    if (RT_FAILURE(rc))
    22652265        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    22672267
    22682268    /* query whether we are supposed to present an FDC controller */
    2269     rc = CFGMR3QueryBoolDef(pCfgHandle, "FdcEnabled", &s->fUseFdc, true);
     2269    rc = CFGMR3QueryBoolDef(pCfg, "FdcEnabled", &s->fUseFdc, true);
    22702270    if (RT_FAILURE(rc))
    22712271        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    22732273
    22742274    /* query whether we are supposed to present HPET */
    2275     rc = CFGMR3QueryBoolDef(pCfgHandle, "HpetEnabled", &s->fUseHpet, false);
     2275    rc = CFGMR3QueryBoolDef(pCfg, "HpetEnabled", &s->fUseHpet, false);
    22762276    if (RT_FAILURE(rc))
    22772277        return PDMDEV_SET_ERROR(pDevIns, rc,
    22782278                                N_("Configuration error: Failed to read \"HpetEnabled\""));
    22792279    /* query whether we are supposed to present SMC */
    2280     rc = CFGMR3QueryBoolDef(pCfgHandle, "SmcEnabled", &s->fUseSmc, false);
     2280    rc = CFGMR3QueryBoolDef(pCfg, "SmcEnabled", &s->fUseSmc, false);
    22812281    if (RT_FAILURE(rc))
    22822282        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    22842284
    22852285    /* query whether we are supposed to present RTC object */
    2286     rc = CFGMR3QueryBoolDef(pCfgHandle, "ShowRtc", &s->fShowRtc, false);
     2286    rc = CFGMR3QueryBoolDef(pCfg, "ShowRtc", &s->fShowRtc, false);
    22872287    if (RT_FAILURE(rc))
    22882288        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    22902290
    22912291    /* query whether we are supposed to present CPU objects */
    2292     rc = CFGMR3QueryBoolDef(pCfgHandle, "ShowCpu", &s->fShowCpu, false);
     2292    rc = CFGMR3QueryBoolDef(pCfg, "ShowCpu", &s->fShowCpu, false);
    22932293    if (RT_FAILURE(rc))
    22942294        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    22962296
    22972297    /* query whether we are allow CPU hot plugging */
    2298     rc = CFGMR3QueryBoolDef(pCfgHandle, "CpuHotPlug", &s->fCpuHotPlug, false);
     2298    rc = CFGMR3QueryBoolDef(pCfg, "CpuHotPlug", &s->fCpuHotPlug, false);
    22992299    if (RT_FAILURE(rc))
    23002300        return PDMDEV_SET_ERROR(pDevIns, rc,
    23012301                                N_("Configuration error: Failed to read \"CpuHotPlug\""));
    23022302
    2303     rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &s->fGCEnabled);
     2303    rc = CFGMR3QueryBool(pCfg, "GCEnabled", &s->fGCEnabled);
    23042304    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    23052305        s->fGCEnabled = true;
    … …  
    23082308                                N_("Configuration error: Failed to read \"GCEnabled\""));
    23092309
    2310     rc = CFGMR3QueryBool(pCfgHandle, "R0Enabled", &s->fR0Enabled);
     2310    rc = CFGMR3QueryBool(pCfg, "R0Enabled", &s->fR0Enabled);
    23112311    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    23122312        s->fR0Enabled = true;

  • trunk/src/VBox/Devices/PC/DevAPIC.cpp

    r26169 r26173  
    27382738 * @copydoc FNPDMDEVCONSTRUCT
    27392739 */
    2740 static DECLCALLBACK(int) apicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     2740static DECLCALLBACK(int) apicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    27412741{
    27422742    PDMAPICREG      ApicReg;
    … …  
    27572757     * Validate configuration.
    27582758     */
    2759     if (!CFGMR3AreValuesValid(pCfgHandle,
     2759    if (!CFGMR3AreValuesValid(pCfg,
    27602760                              "IOAPIC\0"
    27612761                              "GCEnabled\0"
    … …  
    27642764        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    27652765
    2766     rc = CFGMR3QueryBoolDef(pCfgHandle, "IOAPIC", &fIoApic, true);
     2766    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fIoApic, true);
    27672767    if (RT_FAILURE(rc))
    27682768        return PDMDEV_SET_ERROR(pDevIns, rc,
    27692769                                N_("Configuration error: Failed to read \"IOAPIC\""));
    27702770
    2771     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     2771    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    27722772    if (RT_FAILURE(rc))
    27732773        return PDMDEV_SET_ERROR(pDevIns, rc,
    27742774                                N_("Configuration error: Failed to query boolean value \"GCEnabled\""));
    27752775
    2776     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     2776    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    27772777    if (RT_FAILURE(rc))
    27782778        return PDMDEV_SET_ERROR(pDevIns, rc,
    27792779                                N_("Configuration error: Failed to query boolean value \"R0Enabled\""));
    27802780
    2781     rc = CFGMR3QueryU32Def(pCfgHandle, "NumCPUs", &cCpus, 1);
     2781    rc = CFGMR3QueryU32Def(pCfg, "NumCPUs", &cCpus, 1);
    27822782    if (RT_FAILURE(rc))
    27832783        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    32073207 * @copydoc FNPDMDEVCONSTRUCT
    32083208 */
    3209 static DECLCALLBACK(int) ioapicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     3209static DECLCALLBACK(int) ioapicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    32103210{
    32113211    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
    … …  
    32203220     * Validate and read the configuration.
    32213221     */
    3222     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0" "R0Enabled\0"))
     3222    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0" "R0Enabled\0"))
    32233223        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    32243224
    3225     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     3225    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    32263226    if (RT_FAILURE(rc))
    32273227        return PDMDEV_SET_ERROR(pDevIns, rc,
    32283228                                N_("Configuration error: Failed to query boolean value \"GCEnabled\""));
    32293229
    3230     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     3230    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    32313231    if (RT_FAILURE(rc))
    32323232        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/PC/DevDMA.cpp

    r26169 r26173  
    879879static DECLCALLBACK(int) dmaConstruct(PPDMDEVINS pDevIns,
    880880                                      int iInstance,
    881                                       PCFGMNODE pCfgHandle)
     881                                      PCFGMNODE pCfg)
    882882{
    883883    DMAState *s = PDMINS_2_DATA (pDevIns, DMAState *);
    … …  
    891891     * Validate configuration.
    892892     */
    893     if (!CFGMR3AreValuesValid(pCfgHandle, "\0")) /* "HighPageEnable\0")) */
     893    if (!CFGMR3AreValuesValid(pCfg, "\0")) /* "HighPageEnable\0")) */
    894894        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    895895
    896896#if 0
    897     rc = CFGMR3QueryBool (pCfgHandle, "HighPageEnable", &high_page_enable);
     897    rc = CFGMR3QueryBool (pCfg, "HighPageEnable", &high_page_enable);
    898898    if (RT_FAILURE (rc)) {
    899899        return rc;

  • trunk/src/VBox/Devices/PC/DevFwCommon.cpp

    r25647 r26173  
    314314 * @param   pUuid               Pointer to the UUID to use if the DmiUuid
    315315 *                              configuration string isn't present.
    316  * @param   pCfgHandle          The handle to our config node.
     316 * @param   pCfg                The handle to our config node.
    317317 * @param   fPutSmbiosHeaders   Plant SMBIOS headers if true.
    318318 */
    319 int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
     319int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, bool fPutSmbiosHeaders)
    320320{
    321321#define CHECKSIZE(cbWant) \
    … …  
    340340        else \
    341341        { \
    342             rc = CFGMR3QueryStringDef(pCfgHandle, name, szBuf, sizeof(szBuf), default_value); \
     342            rc = CFGMR3QueryStringDef(pCfg, name, szBuf, sizeof(szBuf), default_value); \
    343343            if (RT_FAILURE(rc)) \
    344344            { \
    … …  
    377377        else \
    378378        { \
    379             rc = CFGMR3QueryS32Def(pCfgHandle, # name, & variable, s_iDef ## name); \
     379            rc = CFGMR3QueryS32Def(pCfg, # name, & variable, s_iDef ## name); \
    380380            if (RT_FAILURE(rc)) \
    381381            { \
    … …  
    421421        else
    422422        {
    423             rc = CFGMR3QueryString(pCfgHandle, "DmiSystemUuid", szDmiSystemUuid, sizeof(szDmiSystemUuid));
     423            rc = CFGMR3QueryString(pCfg, "DmiSystemUuid", szDmiSystemUuid, sizeof(szDmiSystemUuid));
    424424            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    425425                pszDmiSystemUuid = NULL;

  • trunk/src/VBox/Devices/PC/DevFwCommon.h

    r25058 r26173  
    3232
    3333/* Plant DMI table */
    34 int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders);
     34int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, bool fPutSmbiosHeaders);
    3535
    3636/* Plant MPS table */

  • trunk/src/VBox/Devices/PC/DevPIC.cpp

    r26169 r26173  
    899899 * @copydoc FNPDMDEVCONSTRUCT
    900900 */
    901 static DECLCALLBACK(int)  picConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     901static DECLCALLBACK(int)  picConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    902902{
    903903    PDEVPIC         pThis = PDMINS_2_DATA(pDevIns, PDEVPIC);
    … …  
    911911     * Validate and read configuration.
    912912     */
    913     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0" "R0Enabled\0"))
     913    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0" "R0Enabled\0"))
    914914        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    915915
    916     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     916    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    917917    if (RT_FAILURE(rc))
    918918        return PDMDEV_SET_ERROR(pDevIns, rc,
    919919                                N_("Configuration error: failed to read GCEnabled as boolean"));
    920920
    921     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     921    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    922922    if (RT_FAILURE(rc))
    923923        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/PC/DevPcArch.c

    r26169 r26173  
    217217 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    218218 */
    219 static DECLCALLBACK(int)  pcarchConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     219static DECLCALLBACK(int)  pcarchConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    220220{
    221221    PDEVPCARCH  pThis = PDMINS_2_DATA(pDevIns, PDEVPCARCH);
    … …  
    226226     * Validate configuration.
    227227     */
    228     if (!CFGMR3AreValuesValid(pCfgHandle, "\0"))
     228    if (!CFGMR3AreValuesValid(pCfg, "\0"))
    229229        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    230230

  • trunk/src/VBox/Devices/PC/DevPcBios.cpp

    r26165 r26173  
    834834 *
    835835 * @returns VBox status code.
    836  * @param   pCfgHandle      Configuration handle.
     836 * @param   pCfg            Configuration handle.
    837837 * @param   pszParam        The name of the value to read.
    838838 * @param   penmBoot        Where to store the boot method.
    839839 */
    840 static int pcbiosBootFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfgHandle, const char *pszParam, DEVPCBIOSBOOT *penmBoot)
     840static int pcbiosBootFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfg, const char *pszParam, DEVPCBIOSBOOT *penmBoot)
    841841{
    842842    char *psz;
    843     int rc = CFGMR3QueryStringAlloc(pCfgHandle, pszParam, &psz);
     843    int rc = CFGMR3QueryStringAlloc(pCfg, pszParam, &psz);
    844844    if (RT_FAILURE(rc))
    845845        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
    … …  
    870870 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    871871 */
    872 static DECLCALLBACK(int)  pcbiosConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     872static DECLCALLBACK(int)  pcbiosConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    873873{
    874874    unsigned    i;
    … …  
    883883     * Validate configuration.
    884884     */
    885     if (!CFGMR3AreValuesValid(pCfgHandle,
     885    if (!CFGMR3AreValuesValid(pCfg,
    886886                              "BootDevice0\0"
    887887                              "BootDevice1\0"
    … …  
    932932     * Init the data.
    933933     */
    934     rc = CFGMR3QueryU64(pCfgHandle, "RamSize", &pThis->cbRam);
     934    rc = CFGMR3QueryU64(pCfg, "RamSize", &pThis->cbRam);
    935935    if (RT_FAILURE(rc))
    936936        return PDMDEV_SET_ERROR(pDevIns, rc,
    937937                                N_("Configuration error: Querying \"RamSize\" as integer failed"));
    938938
    939     rc = CFGMR3QueryU32Def(pCfgHandle, "RamHoleSize", &pThis->cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
     939    rc = CFGMR3QueryU32Def(pCfg, "RamHoleSize", &pThis->cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
    940940    if (RT_FAILURE(rc))
    941941        return PDMDEV_SET_ERROR(pDevIns, rc,
    942942                                N_("Configuration error: Querying \"RamHoleSize\" as integer failed"));
    943943
    944     rc = CFGMR3QueryU16Def(pCfgHandle, "NumCPUs", &pThis->cCpus, 1);
     944    rc = CFGMR3QueryU16Def(pCfg, "NumCPUs", &pThis->cCpus, 1);
    945945    if (RT_FAILURE(rc))
    946946        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    949949    LogRel(("[SMP] BIOS with %u CPUs\n", pThis->cCpus));
    950950
    951     rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &pThis->u8IOAPIC, 1);
     951    rc = CFGMR3QueryU8Def(pCfg, "IOAPIC", &pThis->u8IOAPIC, 1);
    952952    if (RT_FAILURE (rc))
    953953        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    958958    for (i = 0; i < RT_ELEMENTS(pThis->aenmBootDevice); i++)
    959959    {
    960         rc = pcbiosBootFromCfg(pDevIns, pCfgHandle, s_apszBootDevices[i], &pThis->aenmBootDevice[i]);
     960        rc = pcbiosBootFromCfg(pDevIns, pCfg, s_apszBootDevices[i], &pThis->aenmBootDevice[i]);
    961961        if (RT_FAILURE(rc))
    962962            return rc;
    963963    }
    964964
    965     rc = CFGMR3QueryStringAlloc(pCfgHandle, "HardDiskDevice", &pThis->pszHDDevice);
     965    rc = CFGMR3QueryStringAlloc(pCfg, "HardDiskDevice", &pThis->pszHDDevice);
    966966    if (RT_FAILURE(rc))
    967967        return PDMDEV_SET_ERROR(pDevIns, rc,
    968968                                N_("Configuration error: Querying \"HardDiskDevice\" as a string failed"));
    969969
    970     rc = CFGMR3QueryStringAlloc(pCfgHandle, "FloppyDevice", &pThis->pszFDDevice);
     970    rc = CFGMR3QueryStringAlloc(pCfg, "FloppyDevice", &pThis->pszFDDevice);
    971971    if (RT_FAILURE(rc))
    972972        return PDMDEV_SET_ERROR(pDevIns, rc,
    973973                                N_("Configuration error: Querying \"FloppyDevice\" as a string failed"));
    974974
    975     rc = CFGMR3QueryStringAlloc(pCfgHandle, "SataHardDiskDevice", &pThis->pszSataDevice);
     975    rc = CFGMR3QueryStringAlloc(pCfg, "SataHardDiskDevice", &pThis->pszSataDevice);
    976976    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    977977        pThis->pszSataDevice = NULL;
    … …  
    987987        for (i = 0; i < RT_ELEMENTS(pThis->iSataHDLUN); i++)
    988988        {
    989             rc = CFGMR3QueryU32(pCfgHandle, s_apszSataDisks[i], &pThis->iSataHDLUN[i]);
     989            rc = CFGMR3QueryU32(pCfg, s_apszSataDisks[i], &pThis->iSataHDLUN[i]);
    990990            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    991991                pThis->iSataHDLUN[i] = i;
    … …  
    10111011     */
    10121012    RTUUID  uuid;
    1013     rc = CFGMR3QueryBytes(pCfgHandle, "UUID", &uuid, sizeof(uuid));
     1013    rc = CFGMR3QueryBytes(pCfg, "UUID", &uuid, sizeof(uuid));
    10141014    if (RT_FAILURE(rc))
    10151015        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    10211021    uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
    10221022    uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
    1023     rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, false /*fPutSmbiosHeaders*/);
     1023    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfg, false /*fPutSmbiosHeaders*/);
    10241024    if (RT_FAILURE(rc))
    10251025        return rc;
    … …  
    10351035     * Read the PXE debug logging option.
    10361036     */
    1037     rc = CFGMR3QueryU8Def(pCfgHandle, "PXEDebug", &pThis->u8PXEDebug, false);
     1037    rc = CFGMR3QueryU8Def(pCfg, "PXEDebug", &pThis->u8PXEDebug, false);
    10381038    if (RT_FAILURE(rc))
    10391039        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    10431043     * Get the system BIOS ROM file name.
    10441044     */
    1045     rc = CFGMR3QueryStringAlloc(pCfgHandle, "BiosRom", &pThis->pszPcBiosFile);
     1045    rc = CFGMR3QueryStringAlloc(pCfg, "BiosRom", &pThis->pszPcBiosFile);
    10461046    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    10471047    {
    … …  
    11771177     * Get the LAN boot ROM file name.
    11781178     */
    1179     rc = CFGMR3QueryStringAlloc(pCfgHandle, "LanBootRom", &pThis->pszLanBootFile);
     1179    rc = CFGMR3QueryStringAlloc(pCfg, "LanBootRom", &pThis->pszLanBootFile);
    11801180    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    11811181    {
    … …  
    12911291    }
    12921292
    1293     rc = CFGMR3QueryU8Def(pCfgHandle, "DelayBoot", &pThis->uBootDelay, 0);
     1293    rc = CFGMR3QueryU8Def(pCfg, "DelayBoot", &pThis->uBootDelay, 0);
    12941294    if (RT_FAILURE(rc))
    12951295        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

    r26165 r26173  
    969969 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    970970 */
    971 static DECLCALLBACK(int)  pitConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     971static DECLCALLBACK(int)  pitConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    972972{
    973973    PITState   *pThis = PDMINS_2_DATA(pDevIns, PITState *);
    … …  
    984984     * Validate configuration.
    985985     */
    986     if (!CFGMR3AreValuesValid(pCfgHandle, "Irq\0" "Base\0" "SpeakerEnabled\0" "GCEnabled\0" "R0Enabled\0"))
     986    if (!CFGMR3AreValuesValid(pCfg, "Irq\0" "Base\0" "SpeakerEnabled\0" "GCEnabled\0" "R0Enabled\0"))
    987987        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    988988
    … …  
    990990     * Init the data.
    991991     */
    992     rc = CFGMR3QueryU8Def(pCfgHandle, "Irq", &u8Irq, 0);
     992    rc = CFGMR3QueryU8Def(pCfg, "Irq", &u8Irq, 0);
    993993    if (RT_FAILURE(rc))
    994994        return PDMDEV_SET_ERROR(pDevIns, rc,
    995995                                N_("Configuration error: Querying \"Irq\" as a uint8_t failed"));
    996996
    997     rc = CFGMR3QueryU16Def(pCfgHandle, "Base", &u16Base, 0x40);
     997    rc = CFGMR3QueryU16Def(pCfg, "Base", &u16Base, 0x40);
    998998    if (RT_FAILURE(rc))
    999999        return PDMDEV_SET_ERROR(pDevIns, rc,
    10001000                                N_("Configuration error: Querying \"Base\" as a uint16_t failed"));
    10011001
    1002     rc = CFGMR3QueryBoolDef(pCfgHandle, "SpeakerEnabled", &fSpeaker, true);
     1002    rc = CFGMR3QueryBoolDef(pCfg, "SpeakerEnabled", &fSpeaker, true);
    10031003    if (RT_FAILURE(rc))
    10041004        return PDMDEV_SET_ERROR(pDevIns, rc,
    10051005                                N_("Configuration error: Querying \"SpeakerEnabled\" as a bool failed"));
    10061006
    1007     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     1007    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    10081008    if (RT_FAILURE(rc))
    10091009        return PDMDEV_SET_ERROR(pDevIns, rc,
    10101010                                N_("Configuration error: Querying \"GCEnabled\" as a bool failed"));
    10111011
    1012     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     1012    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    10131013    if (RT_FAILURE(rc))
    10141014        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/PC/DevRTC.cpp

    r26169 r26173  
    850850 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    851851 */
    852 static DECLCALLBACK(int)  rtcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     852static DECLCALLBACK(int)  rtcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    853853{
    854854    RTCState   *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
    … …  
    859859     * Validate configuration.
    860860     */
    861     if (!CFGMR3AreValuesValid(pCfgHandle,
     861    if (!CFGMR3AreValuesValid(pCfg,
    862862                              "Irq\0"
    863863                              "Base\0"
    … …  
    871871     */
    872872    uint8_t u8Irq;
    873     rc = CFGMR3QueryU8Def(pCfgHandle, "Irq", &u8Irq, 8);
     873    rc = CFGMR3QueryU8Def(pCfg, "Irq", &u8Irq, 8);
    874874    if (RT_FAILURE(rc))
    875875        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    877877    pThis->irq = u8Irq;
    878878
    879     rc = CFGMR3QueryPortDef(pCfgHandle, "Base", &pThis->IOPortBase, 0x70);
     879    rc = CFGMR3QueryPortDef(pCfg, "Base", &pThis->IOPortBase, 0x70);
    880880    if (RT_FAILURE(rc))
    881881        return PDMDEV_SET_ERROR(pDevIns, rc,
    882882                                N_("Configuration error: Querying \"Base\" as a RTIOPORT failed"));
    883883
    884     rc = CFGMR3QueryBoolDef(pCfgHandle, "UseUTC", &pThis->fUTC, false);
     884    rc = CFGMR3QueryBoolDef(pCfg, "UseUTC", &pThis->fUTC, false);
    885885    if (RT_FAILURE(rc))
    886886        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    888888
    889889    bool fGCEnabled;
    890     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     890    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    891891    if (RT_FAILURE(rc))
    892892        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    894894
    895895    bool fR0Enabled;
    896     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     896    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    897897    if (RT_FAILURE(rc))
    898898        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/PC/DrvACPI.cpp

    r26166 r26173  
    720720 * @copydoc FNPDMDRVCONSTRUCT
    721721 */
    722 static DECLCALLBACK(int) drvACPIConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     722static DECLCALLBACK(int) drvACPIConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    723723{
    724724    PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
    … …  
    738738     * Validate the config.
    739739     */
    740     if (!CFGMR3AreValuesValid(pCfgHandle, "\0"))
     740    if (!CFGMR3AreValuesValid(pCfg, "\0"))
    741741        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    742742

  • trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp

    r26166 r26173  
    6363 * @copydoc FNPDMDRVCONSTRUCT
    6464 */
    65 static DECLCALLBACK(int) drvACPICpuConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     65static DECLCALLBACK(int) drvACPICpuConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    6666{
    6767    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    … …  
    7676     * Validate the config.
    7777     */
    78     if (!CFGMR3AreValuesValid(pCfgHandle, "\0"))
     78    if (!CFGMR3AreValuesValid(pCfg, "\0"))
    7979        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    8080

  • trunk/src/VBox/Devices/Parallel/DevParallel.cpp

    r26165 r26173  
    687687static DECLCALLBACK(int) parallelConstruct(PPDMDEVINS pDevIns,
    688688                                           int iInstance,
    689                                            PCFGMNODE pCfgHandle)
     689                                           PCFGMNODE pCfg)
    690690{
    691691    int            rc;
    … …  
    718718     * Validate and read the configuration.
    719719     */
    720     if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0" "IOBase\0" "GCEnabled\0" "R0Enabled\0"))
     720    if (!CFGMR3AreValuesValid(pCfg, "IRQ\0" "IOBase\0" "GCEnabled\0" "R0Enabled\0"))
    721721        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    722722                                N_("Configuration error: Unknown config key"));
    723723
    724     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     724    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    725725    if (RT_FAILURE(rc))
    726726        return PDMDEV_SET_ERROR(pDevIns, rc,
    727727                                N_("Configuration error: Failed to get the \"GCEnabled\" value"));
    728728
    729     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     729    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    730730    if (RT_FAILURE(rc))
    731731        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    733733
    734734    uint8_t irq_lvl;
    735     rc = CFGMR3QueryU8Def(pCfgHandle, "IRQ", &irq_lvl, 7);
     735    rc = CFGMR3QueryU8Def(pCfg, "IRQ", &irq_lvl, 7);
    736736    if (RT_FAILURE(rc))
    737737        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    739739
    740740    uint16_t io_base;
    741     rc = CFGMR3QueryU16Def(pCfgHandle, "IOBase", &io_base, 0x378);
     741    rc = CFGMR3QueryU16Def(pCfg, "IOBase", &io_base, 0x378);
    742742    if (RT_FAILURE(rc))
    743743        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

    r26166 r26173  
    289289 * @copydoc FNPDMDRVCONSTRUCT
    290290 */
    291 static DECLCALLBACK(int) drvHostParallelConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     291static DECLCALLBACK(int) drvHostParallelConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    292292{
    293293    PDRVHOSTPARALLEL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
    … …  
    298298     * Validate the config.
    299299     */
    300     if (!CFGMR3AreValuesValid(pCfgHandle, "DevicePath\0"))
     300    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
    301301        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
    302302                                N_("Unknown host parallel configuration option, only supports DevicePath"));
    … …  
    320320     */
    321321    /* Device */
    322     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "DevicePath", &pThis->pszDevicePath);
     322    int rc = CFGMR3QueryStringAlloc(pCfg, "DevicePath", &pThis->pszDevicePath);
    323323    if (RT_FAILURE(rc))
    324324    {

  • trunk/src/VBox/Devices/Samples/VBoxSampleDevice.cpp

    r26169 r26173  
    6464
    6565
    66 static DECLCALLBACK(int) devSampleConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     66static DECLCALLBACK(int) devSampleConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    6767{
    6868    /*
    … …  
    8181     * Validate and read the configuration.
    8282     */
    83     if (!CFGMR3AreValuesValid(pCfgHandle,
     83    if (!CFGMR3AreValuesValid(pCfg,
    8484                              "Whatever1\0"
    8585                              "Whatever2\0"))

  • trunk/src/VBox/Devices/Serial/DevSerial.cpp

    r26165 r26173  
    770770static DECLCALLBACK(int) serialConstruct(PPDMDEVINS pDevIns,
    771771                                         int iInstance,
    772                                          PCFGMNODE pCfgHandle)
     772                                         PCFGMNODE pCfg)
    773773{
    774774    int            rc;
    … …  
    818818     * Validate and read the configuration.
    819819     */
    820     if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0" "IOBase\0" "GCEnabled\0" "R0Enabled\0" "YieldOnLSRRead\0"))
     820    if (!CFGMR3AreValuesValid(pCfg, "IRQ\0" "IOBase\0" "GCEnabled\0" "R0Enabled\0" "YieldOnLSRRead\0"))
    821821    {
    822822        AssertMsgFailed(("serialConstruct Invalid configuration values\n"));
    … …  
    824824    }
    825825
    826     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     826    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    827827    if (RT_FAILURE(rc))
    828828        return PDMDEV_SET_ERROR(pDevIns, rc,
    829829                                N_("Configuration error: Failed to get the \"GCEnabled\" value"));
    830830
    831     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     831    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    832832    if (RT_FAILURE(rc))
    833833        return PDMDEV_SET_ERROR(pDevIns, rc,
    834834                                N_("Configuration error: Failed to get the \"R0Enabled\" value"));
    835835
    836     rc = CFGMR3QueryBoolDef(pCfgHandle, "YieldOnLSRRead", &pThis->fYieldOnLSRRead, false);
     836    rc = CFGMR3QueryBoolDef(pCfg, "YieldOnLSRRead", &pThis->fYieldOnLSRRead, false);
    837837    if (RT_FAILURE(rc))
    838838        return PDMDEV_SET_ERROR(pDevIns, rc,
    839839                                N_("Configuration error: Failed to get the \"YieldOnLSRRead\" value"));
    840840
    841     rc = CFGMR3QueryU8(pCfgHandle, "IRQ", &irq_lvl);
     841    rc = CFGMR3QueryU8(pCfg, "IRQ", &irq_lvl);
    842842    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    843843    {
    … …  
    854854                                N_("Configuration error: Failed to get the \"IRQ\" value"));
    855855
    856     rc = CFGMR3QueryU16(pCfgHandle, "IOBase", &io_base);
     856    rc = CFGMR3QueryU16(pCfg, "IOBase", &io_base);
    857857    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    858858    {

  • trunk/src/VBox/Devices/Serial/DrvChar.cpp

    r26166 r26173  
    341341 * @copydoc FNPDMDRVCONSTRUCT
    342342 */
    343 static DECLCALLBACK(int) drvCharConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     343static DECLCALLBACK(int) drvCharConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    344344{
    345345    PDRVCHAR pThis = PDMINS_2_DATA(pDrvIns, PDRVCHAR);

  • trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

    r26166 r26173  
    12691269 * @copydoc FNPDMDRVCONSTRUCT
    12701270 */
    1271 static DECLCALLBACK(int) drvHostSerialConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     1271static DECLCALLBACK(int) drvHostSerialConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    12721272{
    12731273    PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
    … …  
    13001300     */
    13011301    /* Device */
    1302     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "DevicePath", &pThis->pszDevicePath);
     1302    int rc = CFGMR3QueryStringAlloc(pCfg, "DevicePath", &pThis->pszDevicePath);
    13031303    if (RT_FAILURE(rc))
    13041304    {

  • trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

    r26166 r26173  
    466466 * @copydoc FNPDMDRVCONSTRUCT
    467467 */
    468 static DECLCALLBACK(int) drvNamedPipeConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     468static DECLCALLBACK(int) drvNamedPipeConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    469469{
    470470    int rc;
    … …  
    496496     * Read the configuration.
    497497     */
    498     if (!CFGMR3AreValuesValid(pCfgHandle, "Location\0IsServer\0"))
     498    if (!CFGMR3AreValuesValid(pCfg, "Location\0IsServer\0"))
    499499    {
    500500        rc = VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    … …  
    502502    }
    503503
    504     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pszLocation);
     504    rc = CFGMR3QueryStringAlloc(pCfg, "Location", &pszLocation);
    505505    if (RT_FAILURE(rc))
    506506    {
    … …  
    511511
    512512    bool fIsServer;
    513     rc = CFGMR3QueryBool(pCfgHandle, "IsServer", &fIsServer);
     513    rc = CFGMR3QueryBool(pCfg, "IsServer", &fIsServer);
    514514    if (RT_FAILURE(rc))
    515515    {

  • trunk/src/VBox/Devices/Serial/DrvRawFile.cpp

    r26166 r26173  
    163163 * @copydoc FNPDMDRVCONSTRUCT
    164164 */
    165 static DECLCALLBACK(int) drvRawFileConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     165static DECLCALLBACK(int) drvRawFileConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    166166{
    167167    PDRVRAWFILE pThis = PDMINS_2_DATA(pDrvIns, PDRVRAWFILE);
    … …  
    182182     * Read the configuration.
    183183     */
    184     if (!CFGMR3AreValuesValid(pCfgHandle, "Location\0"))
     184    if (!CFGMR3AreValuesValid(pCfg, "Location\0"))
    185185        AssertFailedReturn(VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES);
    186186
    187     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Location", &pThis->pszLocation);
     187    int rc = CFGMR3QueryStringAlloc(pCfg, "Location", &pThis->pszLocation);
    188188    if (RT_FAILURE(rc))
    189189        AssertMsgFailedReturn(("Configuration error: query \"Location\" resulted in %Rrc.\n", rc), rc);

  • trunk/src/VBox/Devices/Storage/DevAHCI.cpp

    r26172 r26173  
    64616461 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    64626462 */
    6463 static DECLCALLBACK(int) ahciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     6463static DECLCALLBACK(int) ahciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    64646464{
    64656465    PAHCI      pThis = PDMINS_2_DATA(pDevIns, PAHCI);
    … …  
    64756475     * Validate and read configuration.
    64766476     */
    6477     if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0"
     6477    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0"
    64786478                                          "R0Enabled\0"
    64796479                                          "PrimaryMaster\0"
    … …  
    64886488                                N_("AHCI configuration error: unknown option specified"));
    64896489
    6490     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     6490    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    64916491    if (RT_FAILURE(rc))
    64926492        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    64946494    Log(("%s: fGCEnabled=%d\n", __FUNCTION__, fGCEnabled));
    64956495
    6496     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     6496    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    64976497    if (RT_FAILURE(rc))
    64986498        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    65006500    Log(("%s: fR0Enabled=%d\n", __FUNCTION__, fR0Enabled));
    65016501
    6502     rc = CFGMR3QueryU32Def(pCfgHandle, "PortCount", &pThis->cPortsImpl, AHCI_MAX_NR_PORTS_IMPL);
     6502    rc = CFGMR3QueryU32Def(pCfg, "PortCount", &pThis->cPortsImpl, AHCI_MAX_NR_PORTS_IMPL);
    65036503    if (RT_FAILURE(rc))
    65046504        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    65146514                                   pThis->cPortsImpl);
    65156515
    6516     rc = CFGMR3QueryBoolDef(pCfgHandle, "UseAsyncInterfaceIfAvailable", &pThis->fUseAsyncInterfaceIfAvailable, true);
     6516    rc = CFGMR3QueryBoolDef(pCfg, "UseAsyncInterfaceIfAvailable", &pThis->fUseAsyncInterfaceIfAvailable, true);
    65176517    if (RT_FAILURE(rc))
    65186518        return PDMDEV_SET_ERROR(pDevIns, rc,
    65196519                                N_("AHCI configuration error: failed to read UseAsyncInterfaceIfAvailable as boolean"));
    6520     rc = CFGMR3QueryU32Def(pCfgHandle, "HighIOThreshold", &pThis->cHighIOThreshold, ~0);
     6520    rc = CFGMR3QueryU32Def(pCfg, "HighIOThreshold", &pThis->cHighIOThreshold, ~0);
    65216521    if (RT_FAILURE(rc))
    65226522        return PDMDEV_SET_ERROR(pDevIns, rc,
    65236523                                N_("AHCI configuration error: failed to read HighIOThreshold as integer"));
    6524     rc = CFGMR3QueryU32Def(pCfgHandle, "MillisToSleep", &pThis->cMillisToSleep, 0);
     6524    rc = CFGMR3QueryU32Def(pCfg, "MillisToSleep", &pThis->cMillisToSleep, 0);
    65256525    if (RT_FAILURE(rc))
    65266526        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    67326732
    67336733            /* Get user config if present using defaults otherwise. */
    6734             PCFGMNODE pCfgNode = CFGMR3GetChild(pCfgHandle, szName);
     6734            PCFGMNODE pCfgNode = CFGMR3GetChild(pCfg, szName);
    67356735            rc = CFGMR3QueryStringDef(pCfgNode, "SerialNumber", pAhciPort->szSerialNumber, sizeof(pAhciPort->szSerialNumber),
    67366736                                      szSerial);
    … …  
    68866886        };
    68876887
    6888         rc = CFGMR3QueryU32Def(pCfgHandle, s_apszDescs[i][0], &iPortMaster, 2 * i);
     6888        rc = CFGMR3QueryU32Def(pCfg, s_apszDescs[i][0], &iPortMaster, 2 * i);
    68896889        if (RT_FAILURE(rc))
    68906890            return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
    68916891                                       N_("AHCI configuration error: failed to read %s as U32"), s_apszDescs[i][0]);
    68926892
    6893         rc = CFGMR3QueryU32Def(pCfgHandle, s_apszDescs[i][1], &iPortSlave, 2 * i + 1);
     6893        rc = CFGMR3QueryU32Def(pCfg, s_apszDescs[i][1], &iPortSlave, 2 * i + 1);
    68946894        if (RT_FAILURE(rc))
    68956895            return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,

  • trunk/src/VBox/Devices/Storage/DevATA.cpp

    r26165 r26173  
    64756475 * @returns VBox status code.
    64766476 * @param   pDevIns     The device instance data.
    6477  * @param   pCfgHandle  Configuration handle.
     6477 * @param   pCfg        Configuration handle.
    64786478 * @param   penmChipset Where to store the chipset type.
    64796479 */
    6480 static int ataControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfgHandle, CHIPSET *penmChipset)
     6480static int ataControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfg, CHIPSET *penmChipset)
    64816481{
    64826482    char szType[20];
    64836483
    6484     int rc = CFGMR3QueryStringDef(pCfgHandle, "Type", &szType[0], sizeof(szType), "PIIX4");
     6484    int rc = CFGMR3QueryStringDef(pCfg, "Type", &szType[0], sizeof(szType), "PIIX4");
    64856485    if (RT_FAILURE(rc))
    64866486        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
    … …  
    65066506 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    65076507 */
    6508 static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     6508static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    65096509{
    65106510    PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
    … …  
    65326532     * Validate and read configuration.
    65336533     */
    6534     if (!CFGMR3AreValuesValid(pCfgHandle,
     6534    if (!CFGMR3AreValuesValid(pCfg,
    65356535                              "GCEnabled\0"
    65366536                              "R0Enabled\0"
    … …  
    65416541                                N_("PIIX3 configuration error: unknown option specified"));
    65426542
    6543     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
     6543    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
    65446544    if (RT_FAILURE(rc))
    65456545        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    65476547    Log(("%s: fGCEnabled=%d\n", __FUNCTION__, fGCEnabled));
    65486548
    6549     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
     6549    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
    65506550    if (RT_FAILURE(rc))
    65516551        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    65536553    Log(("%s: fR0Enabled=%d\n", __FUNCTION__, fR0Enabled));
    65546554
    6555     rc = CFGMR3QueryU32Def(pCfgHandle, "IRQDelay", &DelayIRQMillies, 0);
     6555    rc = CFGMR3QueryU32Def(pCfg, "IRQDelay", &DelayIRQMillies, 0);
    65566556    if (RT_FAILURE(rc))
    65576557        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    65616561
    65626562    CHIPSET enmChipset = CHIPSET_PIIX3;
    6563     rc = ataControllerFromCfg(pDevIns, pCfgHandle, &enmChipset);
     6563    rc = ataControllerFromCfg(pDevIns, pCfg, &enmChipset);
    65646564    if (RT_FAILURE(rc))
    65656565        return rc;
    … …  
    68626862
    68636863                    /* Get user config if present using defaults otherwise. */
    6864                     PCFGMNODE pCfgNode = CFGMR3GetChild(pCfgHandle, s_apszCFGMKeys[i][j]);
     6864                    PCFGMNODE pCfgNode = CFGMR3GetChild(pCfg, s_apszCFGMKeys[i][j]);
    68656865                    rc = CFGMR3QueryStringDef(pCfgNode, "SerialNumber", pIf->szSerialNumber, sizeof(pIf->szSerialNumber),
    68666866                                              szSerial);

  • trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

    r26165 r26173  
    25202520 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    25212521 */
    2522 static DECLCALLBACK(int) buslogicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     2522static DECLCALLBACK(int) buslogicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    25232523{
    25242524    PBUSLOGIC  pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
    … …  
    25292529     * Validate and read configuration.
    25302530     */
    2531     if (!CFGMR3AreValuesValid(pCfgHandle,
     2531    if (!CFGMR3AreValuesValid(pCfg,
    25322532                              "GCEnabled\0"
    25332533                              "R0Enabled\0"))
    … …  
    25352535                                N_("BusLogic configuration error: unknown option specified"));
    25362536
    2537     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     2537    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    25382538    if (RT_FAILURE(rc))
    25392539        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    25412541    Log(("%s: fGCEnabled=%d\n", __FUNCTION__, pThis->fGCEnabled));
    25422542
    2543     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     2543    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    25442544    if (RT_FAILURE(rc))
    25452545        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

    r26165 r26173  
    43754375 * @copydoc FNPDMDEVCONSTRUCT
    43764376 */
    4377 static DECLCALLBACK(int) lsilogicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     4377static DECLCALLBACK(int) lsilogicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    43784378{
    43794379    PLSILOGICSCSI pThis = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
    … …  
    43864386     * Validate and read configuration.
    43874387     */
    4388     rc = CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0"
     4388    rc = CFGMR3AreValuesValid(pCfg, "GCEnabled\0"
    43894389                                          "R0Enabled\0"
    43904390                                          "ReplyQueueDepth\0"
    … …  
    43954395        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    43964396                                N_("LsiLogic configuration error: unknown option specified"));
    4397     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);
     4397    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
    43984398    if (RT_FAILURE(rc))
    43994399        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    44014401    Log(("%s: fGCEnabled=%d\n", __FUNCTION__, pThis->fGCEnabled));
    44024402
    4403     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &pThis->fR0Enabled, true);
     4403    rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, true);
    44044404    if (RT_FAILURE(rc))
    44054405        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    44074407    Log(("%s: fR0Enabled=%d\n", __FUNCTION__, pThis->fR0Enabled));
    44084408
    4409     rc = CFGMR3QueryU32Def(pCfgHandle, "ReplyQueueDepth",
     4409    rc = CFGMR3QueryU32Def(pCfg, "ReplyQueueDepth",
    44104410                           &pThis->cReplyQueueEntries,
    44114411                           LSILOGICSCSI_REPLY_QUEUE_DEPTH_DEFAULT);
    … …  
    44154415    Log(("%s: ReplyQueueDepth=%u\n", __FUNCTION__, pThis->cReplyQueueEntries));
    44164416
    4417     rc = CFGMR3QueryU32Def(pCfgHandle, "RequestQueueDepth",
     4417    rc = CFGMR3QueryU32Def(pCfg, "RequestQueueDepth",
    44184418                           &pThis->cRequestQueueEntries,
    44194419                           LSILOGICSCSI_REQUEST_QUEUE_DEPTH_DEFAULT);
    … …  
    44234423    Log(("%s: RequestQueueDepth=%u\n", __FUNCTION__, pThis->cRequestQueueEntries));
    44244424
    4425     rc = CFGMR3QueryStringAllocDef(pCfgHandle, "ControllerType",
     4425    rc = CFGMR3QueryStringAllocDef(pCfg, "ControllerType",
    44264426                                   &pszCtrlType, LSILOGICSCSI_PCI_SPI_CTRLNAME);
    44274427    if (RT_FAILURE(rc))
    … …  
    44374437                                N_("LsiLogic configuration error: failed to determine controller type from string"));
    44384438
    4439     rc = CFGMR3QueryU8(pCfgHandle, "NumPorts",
     4439    rc = CFGMR3QueryU8(pCfg, "NumPorts",
    44404440                       &pThis->cPorts);
    44414441    if (rc == VERR_CFGM_VALUE_NOT_FOUND)

  • trunk/src/VBox/Devices/Storage/DrvBlock.cpp

    r26166 r26173  
    697697 * @copydoc FNPDMDRVCONSTRUCT
    698698 */
    699 static DECLCALLBACK(int) drvblockConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     699static DECLCALLBACK(int) drvblockConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    700700{
    701701    PDRVBLOCK pThis = PDMINS_2_DATA(pDrvIns, PDRVBLOCK);
    … …  
    707707     */
    708708#if defined(VBOX_PERIODIC_FLUSH) || defined(VBOX_IGNORE_FLUSH)
    709     if (!CFGMR3AreValuesValid(pCfgHandle, "Type\0Locked\0BIOSVisible\0AttachFailError\0Cylinders\0Heads\0Sectors\0Mountable\0FlushInterval\0IgnoreFlush\0"))
     709    if (!CFGMR3AreValuesValid(pCfg, "Type\0Locked\0BIOSVisible\0AttachFailError\0Cylinders\0Heads\0Sectors\0Mountable\0FlushInterval\0IgnoreFlush\0"))
    710710#else /* !(VBOX_PERIODIC_FLUSH || VBOX_IGNORE_FLUSH) */
    711     if (!CFGMR3AreValuesValid(pCfgHandle, "Type\0Locked\0BIOSVisible\0AttachFailError\0Cylinders\0Heads\0Sectors\0Mountable\0"))
     711    if (!CFGMR3AreValuesValid(pCfg, "Type\0Locked\0BIOSVisible\0AttachFailError\0Cylinders\0Heads\0Sectors\0Mountable\0"))
    712712#endif /* !(VBOX_PERIODIC_FLUSH || VBOX_IGNORE_FLUSH) */
    713713        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    … …  
    770770    /* type */
    771771    char *psz;
    772     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Type", &psz);
     772    int rc = CFGMR3QueryStringAlloc(pCfg, "Type", &psz);
    773773    if (RT_FAILURE(rc))
    774774        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_BLOCK_NO_TYPE, N_("Failed to obtain the type"));
    … …  
    800800
    801801    /* Mountable */
    802     rc = CFGMR3QueryBoolDef(pCfgHandle, "Mountable", &pThis->fMountable, false);
     802    rc = CFGMR3QueryBoolDef(pCfg, "Mountable", &pThis->fMountable, false);
    803803    if (RT_FAILURE(rc))
    804804        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Mountable\" from the config"));
    805805
    806806    /* Locked */
    807     rc = CFGMR3QueryBoolDef(pCfgHandle, "Locked", &pThis->fLocked, false);
     807    rc = CFGMR3QueryBoolDef(pCfg, "Locked", &pThis->fLocked, false);
    808808    if (RT_FAILURE(rc))
    809809        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Locked\" from the config"));
    810810
    811811    /* BIOS visible */
    812     rc = CFGMR3QueryBoolDef(pCfgHandle, "BIOSVisible", &pThis->fBiosVisible, true);
     812    rc = CFGMR3QueryBoolDef(pCfg, "BIOSVisible", &pThis->fBiosVisible, true);
    813813    if (RT_FAILURE(rc))
    814814        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"BIOSVisible\" from the config"));
    … …  
    817817
    818818    /* Cylinders */
    819     rc = CFGMR3QueryU32Def(pCfgHandle, "Cylinders", &pThis->LCHSGeometry.cCylinders, 0);
     819    rc = CFGMR3QueryU32Def(pCfg, "Cylinders", &pThis->LCHSGeometry.cCylinders, 0);
    820820    if (RT_FAILURE(rc))
    821821        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Cylinders\" from the config"));
    822822
    823823    /* Heads */
    824     rc = CFGMR3QueryU32Def(pCfgHandle, "Heads", &pThis->LCHSGeometry.cHeads, 0);
     824    rc = CFGMR3QueryU32Def(pCfg, "Heads", &pThis->LCHSGeometry.cHeads, 0);
    825825    if (RT_FAILURE(rc))
    826826        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Heads\" from the config"));
    827827
    828828    /* Sectors */
    829     rc = CFGMR3QueryU32Def(pCfgHandle, "Sectors", &pThis->LCHSGeometry.cSectors, 0);
     829    rc = CFGMR3QueryU32Def(pCfg, "Sectors", &pThis->LCHSGeometry.cSectors, 0);
    830830    if (RT_FAILURE(rc))
    831831        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Sectors\" from the config"));
    832832
    833833    /* Uuid */
    834     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Uuid", &psz);
     834    rc = CFGMR3QueryStringAlloc(pCfg, "Uuid", &psz);
    835835    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    836836        RTUuidClear(&pThis->Uuid);
    … …  
    851851
    852852#ifdef VBOX_PERIODIC_FLUSH
    853     rc = CFGMR3QueryU32Def(pCfgHandle, "FlushInterval", &pThis->cbFlushInterval, 0);
     853    rc = CFGMR3QueryU32Def(pCfg, "FlushInterval", &pThis->cbFlushInterval, 0);
    854854    if (RT_FAILURE(rc))
    855855        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"FlushInterval\" from the config"));
    … …  
    857857
    858858#ifdef VBOX_IGNORE_FLUSH
    859     rc = CFGMR3QueryBoolDef(pCfgHandle, "IgnoreFlush", &pThis->fIgnoreFlush, true);
     859    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreFlush", &pThis->fIgnoreFlush, true);
    860860    if (RT_FAILURE(rc))
    861861        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"IgnoreFlush\" from the config"));

  • trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

    r26166 r26173  
    18441844 * @returns VBox status code.
    18451845 * @param   pDrvIns         Driver instance.
    1846  * @param   pCfgHandle      Configuration handle.
     1846 * @param   pCfg            Configuration handle.
    18471847 * @param   enmType         Device type.
    18481848 */
    1849 int DRVHostBaseInitData(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, PDMBLOCKTYPE enmType)
     1849int DRVHostBaseInitData(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, PDMBLOCKTYPE enmType)
    18501850{
    18511851    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
    … …  
    19191919     */
    19201920    /* Device */
    1921     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pThis->pszDevice);
     1921    int rc = CFGMR3QueryStringAlloc(pCfg, "Path", &pThis->pszDevice);
    19221922    if (RT_FAILURE(rc))
    19231923    {
    … …  
    19281928    /* Mountable */
    19291929    uint32_t u32;
    1930     rc = CFGMR3QueryU32(pCfgHandle, "Interval", &u32);
     1930    rc = CFGMR3QueryU32(pCfg, "Interval", &u32);
    19311931    if (RT_SUCCESS(rc))
    19321932        pThis->cMilliesPoller = u32;
    … …  
    19401940
    19411941    /* ReadOnly */
    1942     rc = CFGMR3QueryBool(pCfgHandle, "ReadOnly", &pThis->fReadOnlyConfig);
     1942    rc = CFGMR3QueryBool(pCfg, "ReadOnly", &pThis->fReadOnlyConfig);
    19431943    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    19441944        pThis->fReadOnlyConfig = enmType == PDMBLOCKTYPE_DVD || enmType == PDMBLOCKTYPE_CDROM ? true : false;
    … …  
    19501950
    19511951    /* Locked */
    1952     rc = CFGMR3QueryBool(pCfgHandle, "Locked", &pThis->fLocked);
     1952    rc = CFGMR3QueryBool(pCfg, "Locked", &pThis->fLocked);
    19531953    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    19541954        pThis->fLocked = false;
    … …  
    19601960
    19611961    /* BIOS visible */
    1962     rc = CFGMR3QueryBool(pCfgHandle, "BIOSVisible", &pThis->fBiosVisible);
     1962    rc = CFGMR3QueryBool(pCfg, "BIOSVisible", &pThis->fBiosVisible);
    19631963    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    19641964        pThis->fBiosVisible = true;
    … …  
    19711971    /* Uuid */
    19721972    char *psz;
    1973     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Uuid", &psz);
     1973    rc = CFGMR3QueryStringAlloc(pCfg, "Uuid", &psz);
    19741974    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    19751975        RTUuidClear(&pThis->Uuid);
    … …  
    19931993    /* Define whether attach failure is an error (default) or not. */
    19941994    bool fAttachFailError;
    1995     rc = CFGMR3QueryBool(pCfgHandle, "AttachFailError", &fAttachFailError);
     1995    rc = CFGMR3QueryBool(pCfg, "AttachFailError", &fAttachFailError);
    19961996    if (RT_FAILURE(rc))
    19971997        fAttachFailError = true;

  • trunk/src/VBox/Devices/Storage/DrvHostBase.h

    r25966 r26173  
    185185
    186186
    187 int DRVHostBaseInitData(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, PDMBLOCKTYPE enmType);
     187int DRVHostBaseInitData(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, PDMBLOCKTYPE enmType);
    188188int DRVHostBaseInitFinish(PDRVHOSTBASE pThis);
    189189int DRVHostBaseMediaPresent(PDRVHOSTBASE pThis);

  • trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

    r26166 r26173  
    740740 * @copydoc FNPDMDRVCONSTRUCT
    741741 */
    742 static DECLCALLBACK(int) drvHostDvdConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     742static DECLCALLBACK(int) drvHostDvdConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    743743{
    744744    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
    … …  
    748748     * Validate configuration.
    749749     */
    750     if (!CFGMR3AreValuesValid(pCfgHandle, "Path\0Interval\0Locked\0BIOSVisible\0AttachFailError\0Passthrough\0"))
     750    if (!CFGMR3AreValuesValid(pCfg, "Path\0Interval\0Locked\0BIOSVisible\0AttachFailError\0Passthrough\0"))
    751751        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    752752
    … …  
    755755     * Init instance data.
    756756     */
    757     int rc = DRVHostBaseInitData(pDrvIns, pCfgHandle, PDMBLOCKTYPE_DVD);
     757    int rc = DRVHostBaseInitData(pDrvIns, pCfg, PDMBLOCKTYPE_DVD);
    758758    if (RT_SUCCESS(rc))
    759759    {
    … …  
    769769#ifndef RT_OS_L4 /* Passthrough is not supported on L4 yet */
    770770        bool fPassthrough;
    771         rc = CFGMR3QueryBool(pCfgHandle, "Passthrough", &fPassthrough);
     771        rc = CFGMR3QueryBool(pCfg, "Passthrough", &fPassthrough);
    772772        if (RT_SUCCESS(rc) && fPassthrough)
    773773        {

  • trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp

    r26166 r26173  
    147147 * @copydoc FNPDMDRVCONSTRUCT
    148148 */
    149 static DECLCALLBACK(int) drvHostFloppyConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     149static DECLCALLBACK(int) drvHostFloppyConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    150150{
    151151    PDRVHOSTFLOPPY pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTFLOPPY);
    … …  
    155155     * Validate configuration.
    156156     */
    157     if (!CFGMR3AreValuesValid(pCfgHandle, "Path\0ReadOnly\0Interval\0Locked\0BIOSVisible\0"))
     157    if (!CFGMR3AreValuesValid(pCfg, "Path\0ReadOnly\0Interval\0Locked\0BIOSVisible\0"))
    158158        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    159159
    … …  
    161161     * Init instance data.
    162162     */
    163     int rc = DRVHostBaseInitData(pDrvIns, pCfgHandle, PDMBLOCKTYPE_FLOPPY_1_44);
     163    int rc = DRVHostBaseInitData(pDrvIns, pCfg, PDMBLOCKTYPE_FLOPPY_1_44);
    164164    if (RT_SUCCESS(rc))
    165165    {

  • trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp

    r26166 r26173  
    231231 * @copydoc FNPDMDRVCONSTRUCT
    232232 */
    233 static DECLCALLBACK(int) drvMediaISOConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     233static DECLCALLBACK(int) drvMediaISOConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    234234{
    235235    PDRVMEDIAISO pThis = PDMINS_2_DATA(pDrvIns, PDRVMEDIAISO);
    … …  
    258258     * Read the configuration.
    259259     */
    260     if (!CFGMR3AreValuesValid(pCfgHandle, "Path\0"))
     260    if (!CFGMR3AreValuesValid(pCfg, "Path\0"))
    261261        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    262262
    263263    char *pszName;
    264     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pszName);
     264    int rc = CFGMR3QueryStringAlloc(pCfg, "Path", &pszName);
    265265    if (RT_FAILURE(rc))
    266266        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"Path\" from the config"));

  • trunk/src/VBox/Devices/Storage/DrvRawImage.cpp

    r26166 r26173  
    268268 * @copydoc FNPDMDRVCONSTRUCT
    269269 */
    270 static DECLCALLBACK(int) drvRawImageConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     270static DECLCALLBACK(int) drvRawImageConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    271271{
    272272    PDRVRAWIMAGE pThis = PDMINS_2_DATA(pDrvIns, PDRVRAWIMAGE);
    … …  
    295295     * Read the configuration.
    296296     */
    297     if (!CFGMR3AreValuesValid(pCfgHandle, "Path\0"))
     297    if (!CFGMR3AreValuesValid(pCfg, "Path\0"))
    298298        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    299299
    300300    char *pszName;
    301     int rc = CFGMR3QueryStringAlloc(pCfgHandle, "Path", &pszName);
     301    int rc = CFGMR3QueryStringAlloc(pCfg, "Path", &pszName);
    302302    if (RT_FAILURE(rc))
    303303    {

  • trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

    r26166 r26173  
    932932 * @copydoc FNPDMDRVCONSTRUCT
    933933 */
    934 static DECLCALLBACK(int) drvscsiConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     934static DECLCALLBACK(int) drvscsiConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    935935{
    936936    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
    937     LogFlowFunc(("pDrvIns=%#p pCfgHandle=%#p\n", pDrvIns, pCfgHandle));
     937    LogFlowFunc(("pDrvIns=%#p pCfg=%#p\n", pDrvIns, pCfg));
    938938    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    939939

  • trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

    r26166 r26173  
    443443 * @copydoc FNPDMDRVCONSTRUCT
    444444 */
    445 static DECLCALLBACK(int) drvscsihostConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     445static DECLCALLBACK(int) drvscsihostConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    446446{
    447447    PDRVSCSIHOST pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSIHOST);
    448     LogFlowFunc(("pDrvIns=%#p pCfgHandle=%#p\n", pDrvIns, pCfgHandle));
     448    LogFlowFunc(("pDrvIns=%#p pCfg=%#p\n", pDrvIns, pCfg));
    449449    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    450450
    … …  
    452452     * Read the configuration.
    453453     */
    454     if (!CFGMR3AreValuesValid(pCfgHandle, "DevicePath\0"))
     454    if (!CFGMR3AreValuesValid(pCfg, "DevicePath\0"))
    455455        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
    456456                                N_("Invalid configuration for host scsi access driver"));
    … …  
    473473
    474474    /* Open the device. */
    475     rc = CFGMR3QueryStringAlloc(pCfgHandle, "DevicePath", &pThis->pszDevicePath);
     475    rc = CFGMR3QueryStringAlloc(pCfg, "DevicePath", &pThis->pszDevicePath);
    476476    if (RT_FAILURE(rc))
    477477        return PDMDRV_SET_ERROR(pDrvIns, rc,

  • trunk/src/VBox/Devices/Storage/DrvVD.cpp

    r26166 r26173  
    982982 */
    983983static DECLCALLBACK(int) drvvdConstruct(PPDMDRVINS pDrvIns,
    984                                         PCFGMNODE pCfgHandle,
     984                                        PCFGMNODE pCfg,
    985985                                        uint32_t fFlags)
    986986{
    … …  
    10521052    bool        fUseNewIo = false;
    10531053    unsigned    iLevel = 0;
    1054     PCFGMNODE   pCurNode = pCfgHandle;
     1054    PCFGMNODE   pCurNode = pCfg;
    10551055
    10561056    for (;;)
    … …  
    10581058        bool fValid;
    10591059
    1060         if (pCurNode == pCfgHandle)
     1060        if (pCurNode == pCfg)
    10611061        {
    10621062            /* Toplevel configuration additionally contains the global image
    … …  
    10801080        }
    10811081
    1082         if (pCurNode == pCfgHandle)
     1082        if (pCurNode == pCfg)
    10831083        {
    10841084            rc = CFGMR3QueryBoolDef(pCurNode, "HostIPStack", &fHostIP, true);

  • trunk/src/VBox/Devices/Storage/fdc.c

    r26165 r26173  
    27432743static DECLCALLBACK(int) fdcConstruct (PPDMDEVINS pDevIns,
    27442744                                       int iInstance,
    2745                                        PCFGMNODE pCfgHandle)
     2745                                       PCFGMNODE pCfg)
    27462746{
    27472747    int            rc;
    … …  
    27592759     * Validate configuration.
    27602760     */
    2761     if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0DMA\0MemMapped\0IOBase\0"))
     2761    if (!CFGMR3AreValuesValid(pCfg, "IRQ\0DMA\0MemMapped\0IOBase\0"))
    27622762        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    27632763
    … …  
    27652765     * Read the configuration.
    27662766     */
    2767     rc = CFGMR3QueryU8 (pCfgHandle, "IRQ", &irq_lvl);
     2767    rc = CFGMR3QueryU8 (pCfg, "IRQ", &irq_lvl);
    27682768    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    27692769        irq_lvl = 6;
    … …  
    27732773    }
    27742774
    2775     rc = CFGMR3QueryU8 (pCfgHandle, "DMA", &dma_chann);
     2775    rc = CFGMR3QueryU8 (pCfg, "DMA", &dma_chann);
    27762776    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    27772777        dma_chann = 2;
    … …  
    27812781    }
    27822782
    2783     rc = CFGMR3QueryU16 (pCfgHandle, "IOBase", &io_base);
     2783    rc = CFGMR3QueryU16 (pCfg, "IOBase", &io_base);
    27842784    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    27852785        io_base = 0x3f0;
    … …  
    27892789    }
    27902790
    2791     rc = CFGMR3QueryBool (pCfgHandle, "MemMapped", &mem_mapped);
     2791    rc = CFGMR3QueryBool (pCfg, "MemMapped", &mem_mapped);
    27922792    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    27932793        mem_mapped = false;

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

    r26165 r26173  
    25162516 * @interface_method_impl{PDMDEVREG,pfnConstruct}
    25172517 */
    2518 static DECLCALLBACK(int) vmmdevConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
     2518static DECLCALLBACK(int) vmmdevConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
    25192519{
    25202520    int rc;
    … …  
    25272527     * Validate and read the configuration.
    25282528     */
    2529     if (!CFGMR3AreValuesValid(pCfgHandle,
     2529    if (!CFGMR3AreValuesValid(pCfg,
    25302530                              "GetHostTimeDisabled\0"
    25312531                              "BackdoorLogDisabled\0"
    … …  
    25352535        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
    25362536
    2537     rc = CFGMR3QueryBoolDef(pCfgHandle, "GetHostTimeDisabled", &pThis->fGetHostTimeDisabled, false);
     2537    rc = CFGMR3QueryBoolDef(pCfg, "GetHostTimeDisabled", &pThis->fGetHostTimeDisabled, false);
    25382538    if (RT_FAILURE(rc))
    25392539        return PDMDEV_SET_ERROR(pDevIns, rc,
    25402540                                N_("Configuration error: Failed querying \"GetHostTimeDisabled\" as a boolean"));
    25412541
    2542     rc = CFGMR3QueryBoolDef(pCfgHandle, "BackdoorLogDisabled", &pThis->fBackdoorLogDisabled, false);
     2542    rc = CFGMR3QueryBoolDef(pCfg, "BackdoorLogDisabled", &pThis->fBackdoorLogDisabled, false);
    25432543    if (RT_FAILURE(rc))
    25442544        return PDMDEV_SET_ERROR(pDevIns, rc,
    25452545                                N_("Configuration error: Failed querying \"BackdoorLogDisabled\" as a boolean"));
    25462546
    2547     rc = CFGMR3QueryBoolDef(pCfgHandle, "KeepCredentials", &pThis->fKeepCredentials, false);
     2547    rc = CFGMR3QueryBoolDef(pCfg, "KeepCredentials", &pThis->fKeepCredentials, false);
    25482548    if (RT_FAILURE(rc))
    25492549        return PDMDEV_SET_ERROR(pDevIns, rc,
    25502550                                N_("Configuration error: Failed querying \"KeepCredentials\" as a boolean"));
    25512551
    2552     rc = CFGMR3QueryBoolDef(pCfgHandle, "HeapEnabled", &pThis->fHeapEnabled, true);
     2552    rc = CFGMR3QueryBoolDef(pCfg, "HeapEnabled", &pThis->fHeapEnabled, true);
    25532553    if (RT_FAILURE(rc))
    25542554        return PDMDEV_SET_ERROR(pDevIns, rc,

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

    r26166 r26173  
    11671167 * @copydoc FNPDMDRVCONSTRUCT
    11681168 */
    1169 DECLCALLBACK(int) VMDisplay::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     1169DECLCALLBACK(int) VMDisplay::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    11701170{
    11711171    PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
    … …  
    11761176     * Validate configuration.
    11771177     */
    1178     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     1178    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    11791179        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    11801180    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    12091209     */
    12101210    void *pv;
    1211     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     1211    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    12121212    if (RT_FAILURE(rc))
    12131213    {

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

    r25966 r26173  
    6969
    7070    static DECLCALLBACK(void*) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    71     static DECLCALLBACK(int)   drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     71    static DECLCALLBACK(int)   drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    7272    static DECLCALLBACK(int)   displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy);
    7373    static DECLCALLBACK(void)  displayUpdateCallback(PPDMIDISPLAYCONNECTOR pInterface,

  • trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp

    r26166 r26173  
    202202 * @copydoc FNPDMDRVCONSTRUCT
    203203 */
    204 DECLCALLBACK(int) Keyboard::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     204DECLCALLBACK(int) Keyboard::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    205205{
    206206    PDRVMAINKEYBOARD pData = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);
    … …  
    210210     * Validate configuration.
    211211     */
    212     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     212    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    213213        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    214214    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    237237     */
    238238    void *pv;
    239     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     239    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    240240    if (RT_FAILURE(rc))
    241241    {

  • trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h

    r25966 r26173  
    5757
    5858    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    59     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     59    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    6060    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    6161

  • trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp

    r26166 r26173  
    208208 * @copydoc FNPDMDRVCONSTRUCT
    209209 */
    210 DECLCALLBACK(int) Mouse::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     210DECLCALLBACK(int) Mouse::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    211211{
    212212    PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
    … …  
    216216     * Validate configuration.
    217217     */
    218     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     218    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    219219        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    220220    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    241241     */
    242242    void *pv;
    243     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     243    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    244244    if (RT_FAILURE(rc))
    245245    {

  • trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.h

    r25966 r26173  
    6969
    7070    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    71     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     71    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    7272    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    7373

  • trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp

    r26166 r26173  
    122122 * @copydoc FNPDMDRVCONSTRUCT
    123123 */
    124 DECLCALLBACK(int) VMStatus::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     124DECLCALLBACK(int) VMStatus::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    125125{
    126126    PDRVMAINSTATUS pData = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
    … …  
    130130     * Validate configuration.
    131131     */
    132     if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0"))
     132    if (!CFGMR3AreValuesValid(pCfg, "papLeds\0First\0Last\0"))
    133133        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    134134    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    145145     * Read config.
    146146     */
    147     int rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds);
     147    int rc = CFGMR3QueryPtr(pCfg, "papLeds", (void **)&pData->papLeds);
    148148    if (RT_FAILURE(rc))
    149149    {
    … …  
    152152    }
    153153
    154     rc = CFGMR3QueryU32(pCfgHandle, "First", &pData->iFirstLUN);
     154    rc = CFGMR3QueryU32(pCfg, "First", &pData->iFirstLUN);
    155155    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    156156        pData->iFirstLUN = 0;
    … …  
    161161    }
    162162
    163     rc = CFGMR3QueryU32(pCfgHandle, "Last", &pData->iLastLUN);
     163    rc = CFGMR3QueryU32(pCfg, "Last", &pData->iLastLUN);
    164164    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    165165        pData->iLastLUN = 0;

  • trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.h

    r25966 r26173  
    3636    static DECLCALLBACK(void)   drvUnitChanged(PPDMILEDCONNECTORS pInterface, unsigned iLUN);
    3737    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    38     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     38    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    3939    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    4040};

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

    r26166 r26173  
    378378 * @copydoc FNPDMDRVCONSTRUCT
    379379 */
    380 DECLCALLBACK(int) VMMDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     380DECLCALLBACK(int) VMMDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    381381{
    382382    PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
    … …  
    386386     * Validate configuration.
    387387     */
    388     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     388    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    389389        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    390390    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    435435     */
    436436    void *pv;
    437     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     437    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    438438    if (RT_FAILURE(rc))
    439439    {

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.h

    r25966 r26173  
    6464
    6565    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    66     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     66    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    6767    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    6868};

  • trunk/src/VBox/Main/AudioSnifferInterface.cpp

    r26166 r26173  
    154154 * @copydoc FNPDMDRVCONSTRUCT
    155155 */
    156 DECLCALLBACK(int) AudioSniffer::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     156DECLCALLBACK(int) AudioSniffer::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    157157{
    158158    PDRVAUDIOSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOSNIFFER);
    … …  
    164164     * Validate configuration.
    165165     */
    166     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     166    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    167167        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    168168    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    193193     */
    194194    void *pv;
    195     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     195    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    196196    if (RT_FAILURE(rc))
    197197    {

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r26166 r26173  
    81628162 * @copydoc FNPDMDRVCONSTRUCT
    81638163 */
    8164 DECLCALLBACK(int) Console::drvStatus_Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     8164DECLCALLBACK(int) Console::drvStatus_Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    81658165{
    81668166    PDRVMAINSTATUS pData = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
    … …  
    81718171     * Validate configuration.
    81728172     */
    8173     if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0"))
     8173    if (!CFGMR3AreValuesValid(pCfg, "papLeds\0First\0Last\0"))
    81748174        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    81758175    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    81868186     * Read config.
    81878187     */
    8188     int rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds);
     8188    int rc = CFGMR3QueryPtr(pCfg, "papLeds", (void **)&pData->papLeds);
    81898189    if (RT_FAILURE(rc))
    81908190    {
    … …  
    81938193    }
    81948194
    8195     rc = CFGMR3QueryU32(pCfgHandle, "First", &pData->iFirstLUN);
     8195    rc = CFGMR3QueryU32(pCfg, "First", &pData->iFirstLUN);
    81968196    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    81978197        pData->iFirstLUN = 0;
    … …  
    82028202    }
    82038203
    8204     rc = CFGMR3QueryU32(pCfgHandle, "Last", &pData->iLastLUN);
     8204    rc = CFGMR3QueryU32(pCfg, "Last", &pData->iLastLUN);
    82058205    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    82068206        pData->iLastLUN = 0;

  • trunk/src/VBox/Main/DisplayImpl.cpp

    r26166 r26173  
    34073407 * @copydoc FNPDMDRVCONSTRUCT
    34083408 */
    3409 DECLCALLBACK(int) Display::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     3409DECLCALLBACK(int) Display::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    34103410{
    34113411    PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
    … …  
    34163416     * Validate configuration.
    34173417     */
    3418     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     3418    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    34193419        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    34203420    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    34693469     */
    34703470    void *pv;
    3471     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     3471    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    34723472    if (RT_FAILURE(rc))
    34733473    {

  • trunk/src/VBox/Main/KeyboardImpl.cpp

    r26166 r26173  
    265265 * @copydoc FNPDMDRVCONSTRUCT
    266266 */
    267 DECLCALLBACK(int) Keyboard::drvConstruct (PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     267DECLCALLBACK(int) Keyboard::drvConstruct (PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    268268{
    269269    PDRVMAINKEYBOARD pData = PDMINS_2_DATA (pDrvIns, PDRVMAINKEYBOARD);
    … …  
    274274     * Validate configuration.
    275275     */
    276     if (!CFGMR3AreValuesValid (pCfgHandle, "Object\0"))
     276    if (!CFGMR3AreValuesValid (pCfg, "Object\0"))
    277277        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    278278    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    301301     */
    302302    void *pv;
    303     int rc = CFGMR3QueryPtr (pCfgHandle, "Object", &pv);
     303    int rc = CFGMR3QueryPtr (pCfg, "Object", &pv);
    304304    if (RT_FAILURE(rc))
    305305    {

  • trunk/src/VBox/Main/MouseImpl.cpp

    r26166 r26173  
    392392 * @copydoc FNPDMDRVCONSTRUCT
    393393 */
    394 DECLCALLBACK(int) Mouse::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
     394DECLCALLBACK(int) Mouse::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    395395{
    396396    PDRVMAINMOUSE pData = PDMINS_2_DATA(pDrvIns, PDRVMAINMOUSE);
    … …  
    401401     * Validate configuration.
    402402     */
    403     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
     403    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
    404404        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
    405405    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
    … …  
    426426     */
    427427    void *pv;
    428     int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
     428    int rc = CFGMR3QueryPtr(pCfg, "Object", &pv);
    429429    if (RT_FAILURE(rc))
    430430    {

  • trunk/src/VBox/Main/include/AudioSnifferInterface.h

    r25966 r26173  
    4444private:
    4545    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    46     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     46    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    4747    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    4848

  • trunk/src/VBox/Main/include/ConsoleImpl.h

    r26068 r26173  
    494494    static DECLCALLBACK(void)   drvStatus_UnitChanged(PPDMILEDCONNECTORS pInterface, unsigned iLUN);
    495495    static DECLCALLBACK(void)   drvStatus_Destruct(PPDMDRVINS pDrvIns);
    496     static DECLCALLBACK(int)    drvStatus_Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     496    static DECLCALLBACK(int)    drvStatus_Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    497497
    498498    int mcAudioRefs;

  • trunk/src/VBox/Main/include/DisplayImpl.h

    r25966 r26173  
    273273
    274274    static DECLCALLBACK(void*) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    275     static DECLCALLBACK(int)   drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     275    static DECLCALLBACK(int)   drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    276276    static DECLCALLBACK(void)  drvDestruct(PPDMDRVINS pDrvIns);
    277277    static DECLCALLBACK(int)   displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy);

  • trunk/src/VBox/Main/include/KeyboardImpl.h

    r25966 r26173  
    9393
    9494    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    95     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     95    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    9696    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    9797

  • trunk/src/VBox/Main/include/MouseImpl.h

    r25966 r26173  
    9393
    9494    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    95     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     95    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    9696    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    9797

  • trunk/src/VBox/Main/include/VMMDev.h

    r25966 r26173  
    6060private:
    6161    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
    62     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
     62    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
    6363    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
    6464    static DECLCALLBACK(void)   drvReset(PPDMDRVINS pDrvIns);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette