Changeset 94369 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 25, 2022 7:42:32 AM (3 years ago)

Author:

vboxsync

Message:

VMM,CFGM: Drop CFGMR3QueryPtr and CFGMR3QueryPtrDef, bugref:10053

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CFGM.cpp (modified) (1 diff)
• PDMDevHlp.cpp (modified) (3 diffs)
• PDMDriver.cpp (modified) (1 diff)
• PDMUsb.cpp (modified) (1 diff)
• VMMR3.def (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CFGM.cpp

@@ -3024 +3024 @@
     AssertCompileSize(signed int, 4);
     return CFGMR3QueryS32Def(pNode, pszName, (int32_t *)pi, iDef);
-}
-
-
-/**
- * Query pointer integer value.
- *
- * @returns VBox status code.
- * @param   pNode           Which node to search for pszName in.
- * @param   pszName         Name of an integer value.
- * @param   ppv             Where to store the value.
- */
-VMMR3DECL(int) CFGMR3QueryPtr(PCFGMNODE pNode, const char *pszName, void **ppv)
-{
-    uint64_t u64;
-    int rc = CFGMR3QueryInteger(pNode, pszName, &u64);
-    if (RT_SUCCESS(rc))
-    {
-        uintptr_t u = (uintptr_t)u64;
-        if (u64 == u)
-            *ppv = (void *)u;
-        else
-            rc = VERR_CFGM_INTEGER_TOO_BIG;
-    }
-    return rc;
-}
-
-
-/**
- * Query pointer integer value with default.
- *
- * @returns VBox status code.
- * @param   pNode           Which node to search for pszName in.
- * @param   pszName         Name of an integer value.
- * @param   ppv             Where to store the value. Set to default on failure.
- * @param   pvDef           The default value.
- */
-VMMR3DECL(int) CFGMR3QueryPtrDef(PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef)
-{
-    uint64_t u64;
-    int rc = CFGMR3QueryIntegerDef(pNode, pszName, &u64, (uintptr_t)pvDef);
-    if (RT_SUCCESS(rc))
-    {
-        uintptr_t u = (uintptr_t)u64;
-        if (u64 == u)
-            *ppv = (void *)u;
-        else
-            rc = VERR_CFGM_INTEGER_TOO_BIG;
-    }
-    if (RT_FAILURE(rc))
-        *ppv = pvDef;
-    return rc;
 }
 

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -4981 +4981 @@
     CFGMR3QuerySInt,
     CFGMR3QuerySIntDef,
-    CFGMR3QueryPtr,
-    CFGMR3QueryPtrDef,
     CFGMR3QueryGCPtr,
     CFGMR3QueryGCPtrDef,
@@ -5380 +5378 @@
     CFGMR3QuerySInt,
     CFGMR3QuerySIntDef,
-    CFGMR3QueryPtr,
-    CFGMR3QueryPtrDef,
     CFGMR3QueryGCPtr,
     CFGMR3QueryGCPtrDef,
@@ -6099 +6095 @@
     CFGMR3QuerySInt,
     CFGMR3QuerySIntDef,
-    CFGMR3QueryPtr,
-    CFGMR3QueryPtrDef,
     CFGMR3QueryGCPtr,
     CFGMR3QueryGCPtrDef,

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -2236 +2236 @@
     CFGMR3QuerySInt,
     CFGMR3QuerySIntDef,
-    CFGMR3QueryPtr,
-    CFGMR3QueryPtrDef,
     CFGMR3QueryGCPtr,
     CFGMR3QueryGCPtrDef,

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -2335 +2335 @@
     CFGMR3QuerySInt,
     CFGMR3QuerySIntDef,
-    CFGMR3QueryPtr,
-    CFGMR3QueryPtrDef,
     CFGMR3QueryGCPtr,
     CFGMR3QueryGCPtrDef,

trunk/src/VBox/VMM/VMMR3/VMMR3.def

@@ -49 +49 @@
     CFGMR3QueryGCPtrUDef
     CFGMR3QueryGCPtrDef
-    CFGMR3QueryPtrDef
     CFGMR3QueryBoolDef
     CFGMR3QueryS8Def
@@ -66 +65 @@
     CFGMR3QueryGCPtrU
     CFGMR3QueryGCPtr
-    CFGMR3QueryPtr
     CFGMR3QueryBool
     CFGMR3QueryS8