VirtualBox

Changeset 94369 in vbox


Ignore:
Timestamp:
Mar 25, 2022 7:42:32 AM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
150675
Message:

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

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/cfgm.h

    r93444 r94369  
    185185VMMR3DECL(int)          CFGMR3QuerySInt(        PCFGMNODE pNode, const char *pszName, signed int *pi);
    186186VMMR3DECL(int)          CFGMR3QuerySIntDef(     PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef);
    187 VMMR3DECL(int)          CFGMR3QueryPtr(         PCFGMNODE pNode, const char *pszName, void **ppv);
    188 VMMR3DECL(int)          CFGMR3QueryPtrDef(      PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef);
    189187VMMR3DECL(int)          CFGMR3QueryGCPtr(       PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr);
    190188VMMR3DECL(int)          CFGMR3QueryGCPtrDef(    PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef);

  • trunk/include/VBox/vmm/pdmdev.h

    r93650 r94369  
    24252425
    24262426/** Current PDMDEVHLPR3 version number. */
    2427 #define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 64, 0)
     2427#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 65, 0)
    24282428
    24292429/**
    … …  
    30763076    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySInt,(        PCFGMNODE pNode, const char *pszName, signed int *pi));
    30773077    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySIntDef,(     PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef));
    3078     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtr,(         PCFGMNODE pNode, const char *pszName, void **ppv));
    3079     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtrDef,(      PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef));
    30803078    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtr,(       PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr));
    30813079    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtrDef,(    PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef));

  • trunk/include/VBox/vmm/pdmdrv.h

    r93912 r94369  
    10521052    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySInt,(        PCFGMNODE pNode, const char *pszName, signed int *pi));
    10531053    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySIntDef,(     PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef));
    1054     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtr,(         PCFGMNODE pNode, const char *pszName, void **ppv));
    1055     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtrDef,(      PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef));
    10561054    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtr,(       PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr));
    10571055    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtrDef,(    PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef));
    … …  
    15271525} PDMDRVHLPR3;
    15281526/** Current DRVHLP version number. */
    1529 #define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 15, 0)
     1527#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 16, 0)
    15301528
    15311529

  • trunk/include/VBox/vmm/pdmusb.h

    r94342 r94369  
    714714    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySInt,(        PCFGMNODE pNode, const char *pszName, signed int *pi));
    715715    DECLR3CALLBACKMEMBER(int,       pfnCFGMQuerySIntDef,(     PCFGMNODE pNode, const char *pszName, signed int *pi, signed int iDef));
    716     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtr,(         PCFGMNODE pNode, const char *pszName, void **ppv));
    717     DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryPtrDef,(      PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef));
    718716    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtr,(       PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr));
    719717    DECLR3CALLBACKMEMBER(int,       pfnCFGMQueryGCPtrDef,(    PCFGMNODE pNode, const char *pszName, PRTGCPTR pGCPtr, RTGCPTR GCPtrDef));
    … …  
    948946
    949947/** Current USBHLP version number. */
    950 #define PDM_USBHLP_VERSION                      PDM_VERSION_MAKE(0xeefe, 6, 1)
     948#define PDM_USBHLP_VERSION                      PDM_VERSION_MAKE(0xeefe, 7, 0)
    951949
    952950#endif /* IN_RING3 */

  • trunk/include/VBox/vmm/vmmr3vtable-def.h

    r93609 r94369  
    173173VTABLE_ENTRY(CFGMR3QuerySInt)
    174174VTABLE_ENTRY(CFGMR3QuerySIntDef)
    175 VTABLE_ENTRY(CFGMR3QueryPtr)
    176 VTABLE_ENTRY(CFGMR3QueryPtrDef)
    177175VTABLE_ENTRY(CFGMR3QueryGCPtr)
    178176VTABLE_ENTRY(CFGMR3QueryGCPtrDef)

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

    r93470 r94369  
    30243024    AssertCompileSize(signed int, 4);
    30253025    return CFGMR3QueryS32Def(pNode, pszName, (int32_t *)pi, iDef);
    3026 }
    3027 
    3028 
    3029 /**
    3030  * Query pointer integer value.
    3031  *
    3032  * @returns VBox status code.
    3033  * @param   pNode           Which node to search for pszName in.
    3034  * @param   pszName         Name of an integer value.
    3035  * @param   ppv             Where to store the value.
    3036  */
    3037 VMMR3DECL(int) CFGMR3QueryPtr(PCFGMNODE pNode, const char *pszName, void **ppv)
    3038 {
    3039     uint64_t u64;
    3040     int rc = CFGMR3QueryInteger(pNode, pszName, &u64);
    3041     if (RT_SUCCESS(rc))
    3042     {
    3043         uintptr_t u = (uintptr_t)u64;
    3044         if (u64 == u)
    3045             *ppv = (void *)u;
    3046         else
    3047             rc = VERR_CFGM_INTEGER_TOO_BIG;
    3048     }
    3049     return rc;
    3050 }
    3051 
    3052 
    3053 /**
    3054  * Query pointer integer value with default.
    3055  *
    3056  * @returns VBox status code.
    3057  * @param   pNode           Which node to search for pszName in.
    3058  * @param   pszName         Name of an integer value.
    3059  * @param   ppv             Where to store the value. Set to default on failure.
    3060  * @param   pvDef           The default value.
    3061  */
    3062 VMMR3DECL(int) CFGMR3QueryPtrDef(PCFGMNODE pNode, const char *pszName, void **ppv, void *pvDef)
    3063 {
    3064     uint64_t u64;
    3065     int rc = CFGMR3QueryIntegerDef(pNode, pszName, &u64, (uintptr_t)pvDef);
    3066     if (RT_SUCCESS(rc))
    3067     {
    3068         uintptr_t u = (uintptr_t)u64;
    3069         if (u64 == u)
    3070             *ppv = (void *)u;
    3071         else
    3072             rc = VERR_CFGM_INTEGER_TOO_BIG;
    3073     }
    3074     if (RT_FAILURE(rc))
    3075         *ppv = pvDef;
    3076     return rc;
    30773026}
    30783027

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

    r93901 r94369  
    49814981    CFGMR3QuerySInt,
    49824982    CFGMR3QuerySIntDef,
    4983     CFGMR3QueryPtr,
    4984     CFGMR3QueryPtrDef,
    49854983    CFGMR3QueryGCPtr,
    49864984    CFGMR3QueryGCPtrDef,
    … …  
    53805378    CFGMR3QuerySInt,
    53815379    CFGMR3QuerySIntDef,
    5382     CFGMR3QueryPtr,
    5383     CFGMR3QueryPtrDef,
    53845380    CFGMR3QueryGCPtr,
    53855381    CFGMR3QueryGCPtrDef,
    … …  
    60996095    CFGMR3QuerySInt,
    61006096    CFGMR3QuerySIntDef,
    6101     CFGMR3QueryPtr,
    6102     CFGMR3QueryPtrDef,
    61036097    CFGMR3QueryGCPtr,
    61046098    CFGMR3QueryGCPtrDef,

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

    r93912 r94369  
    22362236    CFGMR3QuerySInt,
    22372237    CFGMR3QuerySIntDef,
    2238     CFGMR3QueryPtr,
    2239     CFGMR3QueryPtrDef,
    22402238    CFGMR3QueryGCPtr,
    22412239    CFGMR3QueryGCPtrDef,

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

    r94342 r94369  
    23352335    CFGMR3QuerySInt,
    23362336    CFGMR3QuerySIntDef,
    2337     CFGMR3QueryPtr,
    2338     CFGMR3QueryPtrDef,
    23392337    CFGMR3QueryGCPtr,
    23402338    CFGMR3QueryGCPtrDef,

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

    r93115 r94369  
    4949    CFGMR3QueryGCPtrUDef
    5050    CFGMR3QueryGCPtrDef
    51     CFGMR3QueryPtrDef
    5251    CFGMR3QueryBoolDef
    5352    CFGMR3QueryS8Def
    … …  
    6665    CFGMR3QueryGCPtrU
    6766    CFGMR3QueryGCPtr
    68     CFGMR3QueryPtr
    6967    CFGMR3QueryBool
    7068    CFGMR3QueryS8
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