util: virtypedparam: Introduce virTypedParamListNew()

Add an allocator function and refactor all allocations to use it. In
upcoming patches 'struct _virTypedParamList' will be made private.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Peter Krempa 2023-04-18 15:20:09 +02:00
parent 2e18d84746
commit 0d09e79b42
7 changed files with 16 additions and 7 deletions

View File

@ -76,7 +76,7 @@ adminServerGetThreadPoolParameters(virNetServer *srv,
size_t freeWorkers; size_t freeWorkers;
size_t nPrioWorkers; size_t nPrioWorkers;
size_t jobQueueDepth; size_t jobQueueDepth;
g_autoptr(virTypedParamList) paramlist = g_new0(virTypedParamList, 1); g_autoptr(virTypedParamList) paramlist = virTypedParamListNew();
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -200,7 +200,7 @@ adminClientGetInfo(virNetServerClient *client,
bool readonly; bool readonly;
g_autofree char *sock_addr = NULL; g_autofree char *sock_addr = NULL;
const char *attr = NULL; const char *attr = NULL;
g_autoptr(virTypedParamList) paramlist = g_new0(virTypedParamList, 1); g_autoptr(virTypedParamList) paramlist = virTypedParamListNew();
g_autoptr(virIdentity) identity = NULL; g_autoptr(virIdentity) identity = NULL;
int rc; int rc;
@ -298,7 +298,7 @@ adminServerGetClientLimits(virNetServer *srv,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
g_autoptr(virTypedParamList) paramlist = g_new0(virTypedParamList, 1); g_autoptr(virTypedParamList) paramlist = virTypedParamListNew();
virCheckFlags(0, -1); virCheckFlags(0, -1);

View File

@ -3557,6 +3557,7 @@ virTypedParamListAddUInt;
virTypedParamListAddULLong; virTypedParamListAddULLong;
virTypedParamListFree; virTypedParamListFree;
virTypedParamListFromParams; virTypedParamListFromParams;
virTypedParamListNew;
virTypedParamListStealParams; virTypedParamListStealParams;
virTypedParamsCheck; virTypedParamsCheck;
virTypedParamsCopy; virTypedParamsCopy;

View File

@ -478,7 +478,7 @@ qemuDomainBackupJobDataToParams(virDomainJobData *jobData,
{ {
qemuDomainJobDataPrivate *priv = jobData->privateData; qemuDomainJobDataPrivate *priv = jobData->privateData;
qemuDomainBackupStats *stats = &priv->stats.backup; qemuDomainBackupStats *stats = &priv->stats.backup;
g_autoptr(virTypedParamList) par = g_new0(virTypedParamList, 1); g_autoptr(virTypedParamList) par = virTypedParamListNew();
if (virTypedParamListAddInt(par, jobData->operation, if (virTypedParamListAddInt(par, jobData->operation,
VIR_DOMAIN_JOB_OPERATION) < 0) VIR_DOMAIN_JOB_OPERATION) < 0)

View File

@ -17934,7 +17934,7 @@ qemuDomainGetStats(virConnectPtr conn,
g_autoptr(virTypedParamList) params = NULL; g_autoptr(virTypedParamList) params = NULL;
size_t i; size_t i;
params = g_new0(virTypedParamList, 1); params = virTypedParamListNew();
for (i = 0; qemuDomainGetStatsWorkers[i].func; i++) { for (i = 0; qemuDomainGetStatsWorkers[i].func; i++) {
if (stats & qemuDomainGetStatsWorkers[i].stats) { if (stats & qemuDomainGetStatsWorkers[i].stats) {

View File

@ -9858,7 +9858,7 @@ testDomainGetStats(virConnectPtr conn,
g_autoptr(virTypedParamList) params = NULL; g_autoptr(virTypedParamList) params = NULL;
size_t i; size_t i;
params = g_new0(virTypedParamList, 1); params = virTypedParamListNew();
for (i = 0; testDomainGetStatsWorkers[i].func; i++) { for (i = 0; testDomainGetStatsWorkers[i].func; i++) {
if (stats & testDomainGetStatsWorkers[i].stats) { if (stats & testDomainGetStatsWorkers[i].stats) {

View File

@ -705,6 +705,13 @@ virTypedParamsSerialize(virTypedParameterPtr params,
} }
virTypedParamList *
virTypedParamListNew(void)
{
return g_new0(virTypedParamList, 1);
}
void void
virTypedParamListFree(virTypedParamList *list) virTypedParamListFree(virTypedParamList *list)
{ {
@ -733,7 +740,7 @@ virTypedParamList *
virTypedParamListFromParams(virTypedParameterPtr *params, virTypedParamListFromParams(virTypedParameterPtr *params,
size_t nparams) size_t nparams)
{ {
virTypedParamList *l = g_new0(virTypedParamList, 1); virTypedParamList *l = virTypedParamListNew();
l->par = g_steal_pointer(params); l->par = g_steal_pointer(params);
l->npar = nparams; l->npar = nparams;

View File

@ -146,6 +146,7 @@ struct _virTypedParamList {
void void
virTypedParamListFree(virTypedParamList *list); virTypedParamListFree(virTypedParamList *list);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virTypedParamList, virTypedParamListFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virTypedParamList, virTypedParamListFree);
virTypedParamList *virTypedParamListNew(void);
size_t size_t
virTypedParamListStealParams(virTypedParamList *list, virTypedParamListStealParams(virTypedParamList *list,