Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/bhyve/bhyve_capabilities.c | 5 +---- src/bhyve/bhyve_parse_command.c | 11 ++-------- src/conf/capabilities.c | 36 ++++++++------------------------- src/conf/cpu_conf.c | 11 ++-------- src/conf/domain_capabilities.c | 5 ++--- src/esx/esx_driver.c | 3 +-- src/hyperv/hyperv_driver.c | 3 +-- src/qemu/qemu_domain.c | 13 +++++------- src/util/virbitmap.c | 5 ++--- src/util/vircommand.c | 16 +++++++-------- src/util/virfile.c | 3 +-- src/util/virfirewall.c | 5 +---- src/util/virnetlink.c | 7 +++---- src/util/virtypedparam-public.c | 24 ++++++++-------------- src/util/virtypedparam.c | 6 ++---- src/util/viruri.c | 8 +------- src/util/virutil.c | 14 ++++--------- tests/viralloctest.c | 3 +-- 18 files changed, 53 insertions(+), 125 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index e9b4e5176d..efd6a59aec 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -154,10 +154,7 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, if (virDirOpenIfExists(&dir, firmware_dir) > 0) { while ((virDirRead(dir, &entry, firmware_dir)) > 0) { - if (VIR_RESIZE_N(firmwares->values, - firmwares_alloc, firmwares->nvalues, 1) < 0) - goto cleanup; - + VIR_RESIZE_N(firmwares->values, firmwares_alloc, firmwares->nvalues, 1); firmwares->values[firmwares->nvalues] = g_strdup_printf("%s/%s", firmware_dir, entry->d_name); firmwares->nvalues++; diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 2762b7e921..8d9a21e671 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -153,10 +153,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, else line = g_strdup(curr); - if (VIR_RESIZE_N(lines, lines_alloc, line_count, 2) < 0) { - VIR_FREE(line); - goto error; - } + VIR_RESIZE_N(lines, lines_alloc, line_count, 2); if (*line) lines[line_count++] = line; @@ -203,11 +200,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, if (next && (*next == '\'' || *next == '"')) next++; - if (VIR_RESIZE_N(arglist, args_alloc, args_count, 2) < 0) { - VIR_FREE(arg); - goto error; - } - + VIR_RESIZE_N(arglist, args_alloc, args_count, 2); arglist[args_count++] = arg; arglist[args_count] = NULL; diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index f610975ae5..14f0d48930 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -280,10 +280,8 @@ int virCapabilitiesAddHostFeature(virCapsPtr caps, const char *name) { - if (VIR_RESIZE_N(caps->host.features, caps->host.nfeatures_max, - caps->host.nfeatures, 1) < 0) - return -1; - + VIR_RESIZE_N(caps->host.features, caps->host.nfeatures_max, + caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] = g_strdup(name); caps->host.nfeatures++; @@ -301,10 +299,8 @@ int virCapabilitiesAddHostMigrateTransport(virCapsPtr caps, const char *name) { - if (VIR_RESIZE_N(caps->host.migrateTrans, caps->host.nmigrateTrans_max, - caps->host.nmigrateTrans, 1) < 0) - return -1; - + VIR_RESIZE_N(caps->host.migrateTrans, caps->host.nmigrateTrans_max, + caps->host.nmigrateTrans, 1); caps->host.migrateTrans[caps->host.nmigrateTrans] = g_strdup(name); caps->host.nmigrateTrans++; @@ -447,9 +443,7 @@ virCapabilitiesAddGuest(virCapsPtr caps, guest->arch.defaultInfo.emulator = g_strdup(emulator); guest->arch.defaultInfo.loader = g_strdup(loader); - if (VIR_RESIZE_N(caps->guests, caps->nguests_max, - caps->nguests, 1) < 0) - goto error; + VIR_RESIZE_N(caps->guests, caps->nguests_max, caps->nguests, 1); caps->guests[caps->nguests++] = guest; if (nmachines) { @@ -458,10 +452,6 @@ virCapabilitiesAddGuest(virCapsPtr caps, } return guest; - - error: - virCapabilitiesFreeGuest(guest); - return NULL; } @@ -493,9 +483,8 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, dom->info.emulator = g_strdup(emulator); dom->info.loader = g_strdup(loader); - if (VIR_RESIZE_N(guest->arch.domains, guest->arch.ndomains_max, - guest->arch.ndomains, 1) < 0) - goto error; + VIR_RESIZE_N(guest->arch.domains, guest->arch.ndomains_max, + guest->arch.ndomains, 1); guest->arch.domains[guest->arch.ndomains] = dom; guest->arch.ndomains++; @@ -505,10 +494,6 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, } return dom; - - error: - virCapabilitiesFreeGuestDomain(dom); - return NULL; } @@ -803,15 +788,10 @@ virCapabilitiesAddStoragePool(virCapsPtr caps, pool->type = poolType; - if (VIR_RESIZE_N(caps->pools, caps->npools_max, caps->npools, 1) < 0) - goto error; + VIR_RESIZE_N(caps->pools, caps->npools_max, caps->npools, 1); caps->pools[caps->npools++] = pool; return 0; - - error: - virCapabilitiesFreeStoragePool(pool); - return -1; } diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 8d800bd80d..380a74691d 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -593,10 +593,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } - if (VIR_RESIZE_N(def->features, def->nfeatures_max, - def->nfeatures, n) < 0) - return -1; - + VIR_RESIZE_N(def->features, def->nfeatures_max, def->nfeatures, n); def->nfeatures = n; } @@ -898,12 +895,8 @@ virCPUDefAddFeatureInternal(virCPUDefPtr def, } } - if (VIR_RESIZE_N(def->features, def->nfeatures_max, - def->nfeatures, 1) < 0) - return -1; - + VIR_RESIZE_N(def->features, def->nfeatures_max, def->nfeatures, 1); def->features[def->nfeatures].name = g_strdup(name); - def->features[def->nfeatures].policy = policy; def->nfeatures++; diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index fc48cc3fba..e0d7eddd2c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -191,9 +191,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels, nameCopy = g_strdup(name); - if (VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max, - cpuModels->nmodels, 1) < 0) - return -1; + VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max, + cpuModels->nmodels, 1); cpu = cpuModels->models + cpuModels->nmodels; cpuModels->nmodels++; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 96cc8bda0d..9d73bc6de8 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4917,8 +4917,7 @@ esxConnectListAllDomains(virConnectPtr conn, continue; } - if (VIR_RESIZE_N(doms, ndoms, count, 2) < 0) - goto cleanup; + VIR_RESIZE_N(doms, ndoms, count, 2); /* Only running/suspended virtual machines have an ID != -1 */ if (powerState == esxVI_VirtualMachinePowerState_PoweredOff) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index e4f537bd12..17f5be1f0d 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -3524,8 +3524,7 @@ hypervConnectListAllDomains(virConnectPtr conn, continue; } - if (VIR_RESIZE_N(doms, ndoms, count, 2) < 0) - goto cleanup; + VIR_RESIZE_N(doms, ndoms, count, 2); domain = NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fff67481a7..3b54adc614 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4287,10 +4287,8 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def, sveFeature->policy = VIR_CPU_FEATURE_REQUIRE; } } else { - if (VIR_RESIZE_N(def->cpu->features, def->cpu->nfeatures_max, - def->cpu->nfeatures, 1) < 0) { - return -1; - } + VIR_RESIZE_N(def->cpu->features, def->cpu->nfeatures_max, + def->cpu->nfeatures, 1); def->cpu->features[def->cpu->nfeatures].name = g_strdup("sve"); def->cpu->features[def->cpu->nfeatures].policy = VIR_CPU_FEATURE_REQUIRE; @@ -7340,10 +7338,9 @@ qemuDomainCleanupAdd(virDomainObjPtr vm, return 0; } - if (VIR_RESIZE_N(priv->cleanupCallbacks, - priv->ncleanupCallbacks_max, - priv->ncleanupCallbacks, 1) < 0) - return -1; + VIR_RESIZE_N(priv->cleanupCallbacks, + priv->ncleanupCallbacks_max, + priv->ncleanupCallbacks, 1); priv->cleanupCallbacks[priv->ncleanupCallbacks++] = cb; return 0; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index b2569b0b03..9242af6fb5 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -139,9 +139,8 @@ virBitmapExpand(virBitmapPtr map, /* resize the memory if necessary */ if (map->map_len < new_len) { - if (VIR_RESIZE_N(map->map, map->map_alloc, map->map_len, - new_len - map->map_len) < 0) - return -1; + VIR_RESIZE_N(map->map, map->map_alloc, map->map_len, + new_len - map->map_len); } map->nbits = b + 1; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 99bb8b6506..d647463f35 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1358,7 +1358,7 @@ virCommandAddEnv(virCommandPtr cmd, } /* Arg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1)); + VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1); cmd->env[cmd->nenv++] = g_steal_pointer(&env); } @@ -1459,7 +1459,7 @@ virCommandAddEnvPassCommon(virCommandPtr cmd) if (virCommandHasError(cmd)) return; - ignore_value(VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 9)); + VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 9); virCommandAddEnvPair(cmd, "LC_ALL", "C"); @@ -1479,7 +1479,7 @@ virCommandAddEnvXDG(virCommandPtr cmd, const char *baseDir) if (virCommandHasError(cmd)) return; - ignore_value(VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 3)); + VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 3); virCommandAddEnvFormat(cmd, "XDG_DATA_HOME=%s/%s", baseDir, ".local/share"); @@ -1509,7 +1509,7 @@ virCommandAddArg(virCommandPtr cmd, const char *val) } /* Arg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1)); + VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1); cmd->args[cmd->nargs++] = g_strdup(val); } @@ -1535,7 +1535,7 @@ virCommandAddArgBuffer(virCommandPtr cmd, virBufferPtr buf) str = g_strdup(""); /* Arg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1)); + VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1); cmd->args[cmd->nargs] = g_steal_pointer(&str); cmd->nargs++; @@ -1564,7 +1564,7 @@ virCommandAddArgFormat(virCommandPtr cmd, const char *format, ...) va_end(list); /* Arg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1)); + VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1); cmd->args[cmd->nargs++] = arg; } @@ -1611,7 +1611,7 @@ virCommandAddArgSet(virCommandPtr cmd, const char *const*vals) narg++; /* narg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, narg + 1)); + VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, narg + 1); narg = 0; while (vals[narg] != NULL) { @@ -1644,7 +1644,7 @@ virCommandAddArgList(virCommandPtr cmd, ...) va_end(list); /* narg plus trailing NULL. */ - ignore_value(VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, narg + 1)); + VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, narg + 1); va_start(list, cmd); while (1) { diff --git a/src/util/virfile.c b/src/util/virfile.c index 180f2af405..56d6e0605e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3123,8 +3123,7 @@ virFileOpenTty(int *ttyprimary, char **ttyName, int rawmode) name = g_new0(char, len); while ((rc = ttyname_r(secondary, name, len)) == ERANGE) { - if (VIR_RESIZE_N(name, len, len, len) < 0) - goto cleanup; + VIR_RESIZE_N(name, len, len, len); } if (rc != 0) { errno = rc; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 0dc0cecd53..dd3e104dbe 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -262,10 +262,7 @@ void virFirewallFree(virFirewallPtr firewall) #define ADD_ARG(rule, str) \ do { \ - ignore_value(VIR_RESIZE_N(rule->args, \ - rule->argsAlloc, \ - rule->argsLen, 1)); \ - \ + VIR_RESIZE_N(rule->args, rule->argsAlloc, rule->argsLen, 1); \ rule->args[rule->argsLen++] = g_strdup(str); \ } while (0) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index cfb86550a5..c26c03de32 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -1146,9 +1146,8 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, if (srv->handlesCount == srv->handlesAlloc) { VIR_DEBUG("Used %zu handle slots, adding at least %d more", srv->handlesAlloc, NETLINK_EVENT_ALLOC_EXTENT); - if (VIR_RESIZE_N(srv->handles, srv->handlesAlloc, - srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0) - goto error; + VIR_RESIZE_N(srv->handles, srv->handlesAlloc, + srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT); } r = srv->handlesCount++; @@ -1167,7 +1166,7 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, VIR_DEBUG("added client to loop slot: %d. with macaddr ptr=%p", r, macaddr); ret = nextWatch++; - error: + virNetlinkEventServerUnlock(srv); return ret; } diff --git a/src/util/virtypedparam-public.c b/src/util/virtypedparam-public.c index 91603cfe1c..4cb54f7ab1 100644 --- a/src/util/virtypedparam-public.c +++ b/src/util/virtypedparam-public.c @@ -446,8 +446,7 @@ virTypedParamsAddInt(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -493,8 +492,7 @@ virTypedParamsAddUInt(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -540,8 +538,7 @@ virTypedParamsAddLLong(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -587,8 +584,7 @@ virTypedParamsAddULLong(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -634,8 +630,7 @@ virTypedParamsAddDouble(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -681,8 +676,7 @@ virTypedParamsAddBoolean(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssign(*params + n, name, @@ -731,8 +725,7 @@ virTypedParamsAddString(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; str = g_strdup(value); @@ -823,8 +816,7 @@ virTypedParamsAddFromString(virTypedParameterPtr *params, virResetLastError(); - if (VIR_RESIZE_N(*params, max, n, 1) < 0) - goto error; + VIR_RESIZE_N(*params, max, n, 1); *maxparams = max; if (virTypedParameterAssignFromStr(*params + n, name, type, value) < 0) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index c4c26a1183..1b89233012 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -77,8 +77,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) name = va_arg(ap, const char *); while (name) { type = va_arg(ap, int); - if (VIR_RESIZE_N(keys, nkeysalloc, nkeys, 1) < 0) - goto cleanup; + VIR_RESIZE_N(keys, nkeysalloc, nkeys, 1); if (virStrcpyStatic(keys[nkeys].field, name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -758,8 +757,7 @@ virTypedParamSetNameVPrintf(virTypedParameterPtr par, static virTypedParameterPtr virTypedParamListExtend(virTypedParamListPtr list) { - if (VIR_RESIZE_N(list->par, list->par_alloc, list->npar, 1) < 0) - return NULL; + VIR_RESIZE_N(list->par, list->par_alloc, list->npar, 1); list->npar++; diff --git a/src/util/viruri.c b/src/util/viruri.c index 1e8808ddc6..90594fce5e 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -45,8 +45,7 @@ virURIParamAppend(virURIPtr uri, pname = g_strdup(name); pvalue = g_strdup(value); - if (VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1) < 0) - goto error; + VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1); uri->params[uri->paramsCount].name = pname; uri->params[uri->paramsCount].value = pvalue; @@ -54,11 +53,6 @@ virURIParamAppend(virURIPtr uri, uri->paramsCount++; return 0; - - error: - VIR_FREE(pname); - VIR_FREE(pvalue); - return -1; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 118ceec0db..3f49a469e5 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -618,8 +618,7 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo * The given name or uid was not found. */ while ((rc = getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw)) == ERANGE) { - if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) - goto cleanup; + VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen); } if (rc != 0) { @@ -687,10 +686,7 @@ static char *virGetGroupEnt(gid_t gid) * The given name or gid was not found. */ while ((rc = getgrgid_r(gid, &grbuf, strbuf, strbuflen, &gr)) == ERANGE) { - if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { - VIR_FREE(strbuf); - return NULL; - } + VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen); } if (rc != 0 || gr == NULL) { if (rc != 0) { @@ -765,8 +761,7 @@ virGetUserIDByName(const char *name, uid_t *uid, bool missing_ok) strbuf = g_new0(char, strbuflen); while ((rc = getpwnam_r(name, &pwbuf, strbuf, strbuflen, &pw)) == ERANGE) { - if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) - goto cleanup; + VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen); } if (!pw) { @@ -846,8 +841,7 @@ virGetGroupIDByName(const char *name, gid_t *gid, bool missing_ok) strbuf = g_new0(char, strbuflen); while ((rc = getgrnam_r(name, &grbuf, strbuf, strbuflen, &gr)) == ERANGE) { - if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) - goto cleanup; + VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen); } if (!gr) { diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 0867be8ce1..4794fd7f93 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -214,8 +214,7 @@ testResizeArray(const void *opaque G_GNUC_UNUSED) t[i].b = 20; } - if (VIR_RESIZE_N(t, at, nt, 8) < 0) - goto cleanup; + VIR_RESIZE_N(t, at, nt, 8); if (testCheckNonNull(t) < 0) goto cleanup; -- 2.31.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/access/viraccessdriverstack.c | 3 +- src/conf/backup_conf.c | 3 +- src/conf/capabilities.c | 4 +- src/conf/domain_addr.c | 6 +-- src/conf/domain_conf.c | 3 +- src/conf/nwfilter_conf.c | 6 +-- src/conf/nwfilter_params.c | 8 +--- src/esx/esx_driver.c | 4 +- src/hyperv/hyperv_wmi.c | 3 +- src/hypervisor/domain_driver.c | 3 +- src/hypervisor/virclosecallbacks.c | 2 +- src/libxl/libxl_conf.c | 9 ++-- src/libxl/xen_common.c | 6 +-- src/locking/lock_driver_lockd.c | 4 +- src/lxc/lxc_controller.c | 18 ++------ src/lxc/lxc_native.c | 33 +++++---------- src/qemu/qemu_agent.c | 7 +--- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_conf.c | 6 +-- src/rpc/virnetclient.c | 16 +------ src/rpc/virnetdaemon.c | 3 +- src/rpc/virnetlibsshsession.c | 8 +--- src/rpc/virnetserver.c | 19 ++------- src/rpc/virnetsocket.c | 3 +- src/rpc/virnetsshsession.c | 8 +--- src/storage/storage_backend_rbd.c | 3 +- .../storage_file_backend_gluster.c | 3 +- .../storage_source_backingstore.c | 3 +- src/util/vircommand.c | 2 +- src/util/virfile.c | 14 ++----- src/util/virfirewall.c | 3 +- src/util/virlockspace.c | 7 +--- src/util/virprocess.c | 17 +------- src/util/virresctrl.c | 42 ++++++++----------- src/util/virstring.c | 6 +-- src/util/virsysinfo.c | 34 ++++----------- src/util/virsystemd.c | 3 +- src/util/virthreadpool.c | 3 +- src/util/virtypedparam.c | 3 +- src/vbox/vbox_snapshot_conf.c | 29 ++++--------- tests/qemudomaincheckpointxml2xmltest.c | 3 +- tests/qemumonitortestutils.c | 12 ++---- tests/securityselinuxlabeltest.c | 7 +--- tests/viralloctest.c | 3 +- tools/virsh-domain.c | 27 +++--------- 45 files changed, 106 insertions(+), 306 deletions(-) diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c index 238caef115..0f0858e96e 100644 --- a/src/access/viraccessdriverstack.c +++ b/src/access/viraccessdriverstack.c @@ -40,8 +40,7 @@ int virAccessDriverStackAppend(virAccessManagerPtr manager, { virAccessDriverStackPrivatePtr priv = virAccessManagerGetPrivateData(manager); - if (VIR_EXPAND_N(priv->managers, priv->managersLen, 1) < 0) - return -1; + VIR_EXPAND_N(priv->managers, priv->managersLen, 1); priv->managers[priv->managersLen-1] = child; diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index ba58b2e322..2d6d2d99f4 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -554,8 +554,7 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def, backup_all = true; ndisks = def->ndisks; - if (VIR_EXPAND_N(def->disks, def->ndisks, dom->ndisks - def->ndisks) < 0) - return -1; + VIR_EXPAND_N(def->disks, def->ndisks, dom->ndisks - def->ndisks); for (i = 0; i < dom->ndisks; i++) { virDomainBackupDiskDefPtr backupdisk = NULL; diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 14f0d48930..bc9035afae 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -580,9 +580,7 @@ virCapabilitiesHostSecModelAddBaseLabel(virCapsHostSecModelPtr secmodel, if (type == NULL || label == NULL) return -1; - if (VIR_EXPAND_N(secmodel->labels, secmodel->nlabels, 1) < 0) - return -1; - + VIR_EXPAND_N(secmodel->labels, secmodel->nlabels, 1); secmodel->labels[secmodel->nlabels - 1].type = g_strdup(type); secmodel->labels[secmodel->nlabels - 1].label = g_strdup(label); diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8b927689f8..9167b489d1 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -728,8 +728,7 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs, i = addrs->nbuses; - if (VIR_EXPAND_N(addrs->buses, addrs->nbuses, add) < 0) - return -1; + VIR_EXPAND_N(addrs->buses, addrs->nbuses, add); if (needDMIToPCIBridge) { /* first of the new buses is dmi-to-pci-bridge, the @@ -1985,8 +1984,7 @@ virDomainUSBAddressSetAddController(virDomainUSBAddressSetPtr addrs, return 0; if (addrs->nbuses <= cont->idx) { - if (VIR_EXPAND_N(addrs->buses, addrs->nbuses, cont->idx - addrs->nbuses + 1) < 0) - goto cleanup; + VIR_EXPAND_N(addrs->buses, addrs->nbuses, cont->idx - addrs->nbuses + 1); } else if (addrs->buses[cont->idx]) { virReportError(VIR_ERR_XML_ERROR, _("Duplicate USB controllers with index %u"), diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7671050134..afbd6fc7c1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2001,8 +2001,7 @@ virDomainDefSetVcpusMax(virDomainDefPtr def, return 0; if (def->maxvcpus < maxvcpus) { - if (VIR_EXPAND_N(def->vcpus, def->maxvcpus, maxvcpus - def->maxvcpus) < 0) - return -1; + VIR_EXPAND_N(def->vcpus, def->maxvcpus, maxvcpus - def->maxvcpus); for (i = oldmax; i < def->maxvcpus; i++) { if (!(def->vcpus[i] = virDomainVcpuDefNew(xmlopt))) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index fbb87b7acf..3cc45394c0 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -381,11 +381,7 @@ virNWFilterRuleDefAddVar(virNWFilterRuleDefPtr nwf, } } - if (VIR_EXPAND_N(nwf->varAccess, nwf->nVarAccess, 1) < 0) { - virNWFilterVarAccessFree(varAccess); - return -1; - } - + VIR_EXPAND_N(nwf->varAccess, nwf->nVarAccess, 1); nwf->varAccess[nwf->nVarAccess - 1] = varAccess; item->varAccess = varAccess; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 5fa5d4fedb..825c151284 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -221,9 +221,7 @@ virNWFilterVarValueAddValue(virNWFilterVarValuePtr val, char *value) break; case NWFILTER_VALUE_TYPE_ARRAY: - if (VIR_EXPAND_N(val->u.array.values, - val->u.array.nValues, 1) < 0) - return -1; + VIR_EXPAND_N(val->u.array.values, val->u.array.nValues, 1); val->u.array.values[val->u.array.nValues - 1] = value; rc = 0; break; @@ -374,9 +372,7 @@ virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntryPtr cie, } } - if (VIR_EXPAND_N(cie->varNames, cie->nVarNames, 1) < 0) - return -1; - + VIR_EXPAND_N(cie->varNames, cie->nVarNames, 1); cie->varNames[cie->nVarNames - 1] = varName; return 0; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9d73bc6de8..21705ef6e3 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5144,9 +5144,7 @@ esxDomainInterfaceAddresses(virDomainPtr domain, continue; } - if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) - goto cleanup; - + VIR_EXPAND_N(ifaces_ret, ifaces_count, 1); ifaces_ret[ifaces_count - 1] = g_new0(virDomainInterface, 1); iface = ifaces_ret[ifaces_count - 1]; diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 2a898cdf03..6271e85cc6 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -189,8 +189,7 @@ static inline int hypervCheckParams(hypervInvokeParamsListPtr params) { if (params->nbParams + 1 > params->nbAvailParams) { - if (VIR_EXPAND_N(params->params, params->nbAvailParams, 5) < 0) - return -1; + VIR_EXPAND_N(params->params, params->nbAvailParams, 5); } return 0; diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index ef5803ec2a..b861e0ef9b 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -161,8 +161,7 @@ virDomainDriverMergeBlkioDevice(virBlkioDevicePtr *dest_array, if (!found) { if (!src->weight && !src->riops && !src->wiops && !src->rbps && !src->wbps) continue; - if (VIR_EXPAND_N(*dest_array, *dest_size, 1) < 0) - return -1; + VIR_EXPAND_N(*dest_array, *dest_size, 1); dest = &(*dest_array)[*dest_size - 1]; if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c index 1fd4dd7adf..542dd61d01 100644 --- a/src/hypervisor/virclosecallbacks.c +++ b/src/hypervisor/virclosecallbacks.c @@ -262,7 +262,7 @@ virCloseCallbacksGetOne(void *payload, if (data->conn != closeDef->conn || !closeDef->cb) return 0; - ignore_value(VIR_EXPAND_N(data->list->entries, data->list->nentries, 1)); + VIR_EXPAND_N(data->list->entries, data->list->nentries, 1); memcpy(data->list->entries[data->list->nentries - 1].uuid, uuid, VIR_UUID_BUFLEN); diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4b6a7e6096..5ee15d42e3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -651,8 +651,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, continue; #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - if (VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) - return -1; + VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); #else nusbdevice++; if (nusbdevice > 1) { @@ -685,10 +684,8 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST /* NULL-terminate usbdevice_list */ - if (nusbdevice > 0 && - VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) { - return -1; - } + if (nusbdevice > 0) + VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); #endif } else if (pvh) { b_info->cmdline = g_strdup(def->os.cmdline); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index ac71b2d084..835f48ec42 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -552,8 +552,7 @@ xenParseHypervisorFeatures(virConfPtr conf, virDomainDefPtr def) return -1; if (strval) { - if (VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1) < 0) - return -1; + VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1); timer = g_new0(virDomainTimerDef, 1); timer->name = VIR_DOMAIN_TIMER_NAME_TSC; @@ -625,8 +624,7 @@ xenParseHypervisorFeatures(virConfPtr conf, virDomainDefPtr def) return -1; if (val != -1) { - if (VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1) < 0) - return -1; + VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1); timer = g_new0(virDomainTimerDef, 1); timer->name = VIR_DOMAIN_TIMER_NAME_HPET; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index a1deb55788..6137e94e3c 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -641,9 +641,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, goto cleanup; } - if (VIR_EXPAND_N(priv->resources, priv->nresources, 1) < 0) - goto cleanup; - + VIR_EXPAND_N(priv->resources, priv->nresources, 1); priv->resources[priv->nresources-1].lockspace = g_steal_pointer(&newLockspace); priv->resources[priv->nresources-1].name = g_steal_pointer(&newName); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9b7cd6408d..9c4ff5e107 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -321,8 +321,7 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl) static int virLXCControllerAddConsole(virLXCControllerPtr ctrl, int hostFd) { - if (VIR_EXPAND_N(ctrl->consoles, ctrl->nconsoles, 1) < 0) - return -1; + VIR_EXPAND_N(ctrl->consoles, ctrl->nconsoles, 1); ctrl->consoles[ctrl->nconsoles-1].daemon = ctrl->daemon; ctrl->consoles[ctrl->nconsoles-1].hostFd = hostFd; ctrl->consoles[ctrl->nconsoles-1].hostWatch = -1; @@ -402,10 +401,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, &nicindex) < 0) return -1; - if (VIR_EXPAND_N(ctrl->nicindexes, - ctrl->nnicindexes, - 1) < 0) - return -1; + VIR_EXPAND_N(ctrl->nicindexes, ctrl->nnicindexes, 1); VIR_DEBUG("Index %d for %s", nicindex, ctrl->def->nets[i]->ifname); ctrl->nicindexes[ctrl->nnicindexes-1] = nicindex; @@ -636,10 +632,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) return -1; VIR_DEBUG("Saving loop fd %d", fd); - if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { - VIR_FORCE_CLOSE(fd); - return -1; - } + VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1); ctrl->loopDevFds[ctrl->nloopDevs - 1] = fd; } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_NBD) { if (virLXCControllerSetupNBDDeviceFS(fs) < 0) @@ -694,10 +687,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) return -1; VIR_DEBUG("Saving loop fd %d", fd); - if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { - VIR_FORCE_CLOSE(fd); - return -1; - } + VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1); ctrl->loopDevFds[ctrl->nloopDevs - 1] = fd; } else if (!driver || STREQ(driver, "nbd")) { if (disk->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT && diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 555e9acd89..36ae821dee 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -123,16 +123,13 @@ static char ** lxcStringSplit(const char *string) goto error; /* Append NULL element */ - if (VIR_EXPAND_N(result, ntokens, 1) < 0) - goto error; + VIR_EXPAND_N(result, ntokens, 1); for (i = 0; parts[i]; i++) { if (STREQ(parts[i], "")) continue; - if (VIR_EXPAND_N(result, ntokens, 1) < 0) - goto error; - + VIR_EXPAND_N(result, ntokens, 1); result[ntokens - 2] = g_strdup(parts[i]); } @@ -189,8 +186,7 @@ lxcAddFSDef(virDomainDefPtr def, if (!(fsDef = lxcCreateFSDef(type, src, dst, readonly, usage))) goto error; - if (VIR_EXPAND_N(def->fss, def->nfss, 1) < 0) - goto error; + VIR_EXPAND_N(def->fss, def->nfss, 1); def->fss[def->nfss - 1] = fsDef; return 0; @@ -509,8 +505,7 @@ lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetworkParseData *data) &hostdev->source.caps.u.net.ip.nroutes) < 0) goto error; - if (VIR_EXPAND_N(def->hostdevs, def->nhostdevs, 1) < 0) - goto error; + VIR_EXPAND_N(def->hostdevs, def->nhostdevs, 1); def->hostdevs[def->nhostdevs - 1] = hostdev; } else { if (!(net = lxcCreateNetDef(data->type, data->link, data->mac, @@ -533,8 +528,7 @@ lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetworkParseData *data) &net->guestIP.nroutes) < 0) goto error; - if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0) - goto error; + VIR_EXPAND_N(def->nets, def->nnets, 1); def->nets[def->nnets - 1] = net; } @@ -651,9 +645,7 @@ lxcNetworkGetParseDataByIndex(lxcNetworkParseDataArray *networks, /* Index was not found. So, it is time to add new * * interface and return this last position. */ - if (VIR_EXPAND_N(networks->parseData, networks->ndata, 1) < 0) - return NULL; - + VIR_EXPAND_N(networks->parseData, networks->ndata, 1); networks->parseData[ndata] = g_new0(lxcNetworkParseData, 1); networks->parseData[ndata]->index = index; @@ -696,9 +688,7 @@ lxcNetworkGetParseDataByIndexLegacy(lxcNetworkParseDataArray *networks, if (elem == VIR_LXC_NETWORK_CONFIG_TYPE) { /* Index was not found. So, it is time to add new * * interface and return this last position. */ - if (VIR_EXPAND_N(networks->parseData, networks->ndata, 1) < 0) - return NULL; - + VIR_EXPAND_N(networks->parseData, networks->ndata, 1); networks->parseData[ndata] = g_new0(lxcNetworkParseData, 1); networks->parseData[ndata]->index = networks->ndata; @@ -858,12 +848,10 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data) } if (type == 'u') { - if (VIR_EXPAND_N(def->idmap.uidmap, def->idmap.nuidmap, 1) < 0) - return -1; + VIR_EXPAND_N(def->idmap.uidmap, def->idmap.nuidmap, 1); idmap = &def->idmap.uidmap[def->idmap.nuidmap - 1]; } else if (type == 'g') { - if (VIR_EXPAND_N(def->idmap.gidmap, def->idmap.ngidmap, 1) < 0) - return -1; + VIR_EXPAND_N(def->idmap.gidmap, def->idmap.ngidmap, 1); idmap = &def->idmap.gidmap[def->idmap.ngidmap - 1]; } else { return -1; @@ -1017,8 +1005,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) device = &def->blkio.devices[i]; } if (!device) { - if (VIR_EXPAND_N(def->blkio.devices, def->blkio.ndevices, 1) < 0) - goto cleanup; + VIR_EXPAND_N(def->blkio.devices, def->blkio.ndevices, 1); device = &def->blkio.devices[def->blkio.ndevices - 1]; device->path = path; path = NULL; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 787a7bb41c..fa37d284b3 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2160,8 +2160,7 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, /* If the hash table doesn't contain this iface, add it */ if (!iface) { - if (VIR_EXPAND_N(*ifaces_ret, *ifaces_count, 1) < 0) - return -1; + VIR_EXPAND_N(*ifaces_ret, *ifaces_count, 1); iface = g_new0(virDomainInterface, 1); (*ifaces_ret)[*ifaces_count - 1] = iface; @@ -2191,9 +2190,7 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, /* If current iface already exists, continue with the count */ addrs_count = iface->naddrs; - if (VIR_EXPAND_N(iface->addrs, addrs_count, - virJSONValueArraySize(ip_addr_arr)) < 0) - return -1; + VIR_EXPAND_N(iface->addrs, addrs_count, virJSONValueArraySize(ip_addr_arr)); for (j = 0; j < virJSONValueArraySize(ip_addr_arr); j++) { virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 08bd0e13ce..4ab694de76 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2166,8 +2166,7 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, if (defs) { start = defs->ncpus; - if (VIR_EXPAND_N(defs->cpus, defs->ncpus, count) < 0) - return -1; + VIR_EXPAND_N(defs->cpus, defs->ncpus, count); } else { start = 0; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2bbc75024c..d652bf22b1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1597,11 +1597,7 @@ qemuSharedDeviceEntryInsert(virQEMUDriverPtr driver, * recorded in the table. */ if (!qemuSharedDeviceEntryDomainExists(entry, name, NULL)) { - if (VIR_EXPAND_N(entry->domains, entry->ref, 1) < 0) { - /* entry is owned by the hash table here */ - entry = NULL; - goto error; - } + VIR_EXPAND_N(entry->domains, entry->ref, 1); entry->domains[entry->ref - 1] = g_strdup(name); } } else { diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index edd65941ac..2de5cfe4b6 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1070,17 +1070,11 @@ int virNetClientAddProgram(virNetClientPtr client, { virObjectLock(client); - if (VIR_EXPAND_N(client->programs, client->nprograms, 1) < 0) - goto error; - + VIR_EXPAND_N(client->programs, client->nprograms, 1); client->programs[client->nprograms-1] = virObjectRef(prog); virObjectUnlock(client); return 0; - - error: - virObjectUnlock(client); - return -1; } @@ -1089,17 +1083,11 @@ int virNetClientAddStream(virNetClientPtr client, { virObjectLock(client); - if (VIR_EXPAND_N(client->streams, client->nstreams, 1) < 0) - goto error; - + VIR_EXPAND_N(client->streams, client->nstreams, 1); client->streams[client->nstreams-1] = virObjectRef(st); virObjectUnlock(client); return 0; - - error: - virObjectUnlock(client); - return -1; } diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 14bc9e1335..1f4a2db04f 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -657,8 +657,7 @@ virNetDaemonAddSignalHandler(virNetDaemonPtr dmn, if (virNetDaemonSignalSetup(dmn) < 0) goto error; - if (VIR_EXPAND_N(dmn->signals, dmn->nsignals, 1) < 0) - goto error; + VIR_EXPAND_N(dmn->signals, dmn->nsignals, 1); sigdata = g_new0(virNetDaemonSignal, 1); diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 2dc8cc8911..e08e0c1392 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -182,16 +182,10 @@ virNetLibsshSessionAuthMethodNew(virNetLibsshSessionPtr sess) auth = g_new0(virNetLibsshAuthMethod, 1); - if (VIR_EXPAND_N(sess->auths, sess->nauths, 1) < 0) - goto error; - + VIR_EXPAND_N(sess->auths, sess->nauths, 1); sess->auths[sess->nauths - 1] = auth; return auth; - - error: - VIR_FREE(auth); - return NULL; } /* string representation of public key of remote server */ diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 2b849465c3..93d55fa906 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -290,8 +290,7 @@ int virNetServerAddClient(virNetServerPtr srv, if (virNetServerClientInit(client) < 0) goto error; - if (VIR_EXPAND_N(srv->clients, srv->nclients, 1) < 0) - goto error; + VIR_EXPAND_N(srv->clients, srv->nclients, 1); srv->clients[srv->nclients-1] = virObjectRef(client); virObjectLock(client); @@ -620,9 +619,7 @@ int virNetServerAddService(virNetServerPtr srv, { virObjectLock(srv); - if (VIR_EXPAND_N(srv->services, srv->nservices, 1) < 0) - goto error; - + VIR_EXPAND_N(srv->services, srv->nservices, 1); srv->services[srv->nservices-1] = virObjectRef(svc); virNetServerServiceSetDispatcher(svc, @@ -631,10 +628,6 @@ int virNetServerAddService(virNetServerPtr srv, virObjectUnlock(srv); return 0; - - error: - virObjectUnlock(srv); - return -1; } @@ -787,17 +780,11 @@ int virNetServerAddProgram(virNetServerPtr srv, { virObjectLock(srv); - if (VIR_EXPAND_N(srv->programs, srv->nprograms, 1) < 0) - goto error; - + VIR_EXPAND_N(srv->programs, srv->nprograms, 1); srv->programs[srv->nprograms-1] = virObjectRef(prog); virObjectUnlock(srv); return 0; - - error: - virObjectUnlock(srv); - return -1; } int virNetServerSetTLSContext(virNetServerPtr srv, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 872b8a3c46..0b4e21c3c9 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -440,8 +440,7 @@ int virNetSocketNewListenTCP(const char *nodename, VIR_DEBUG("%p f=%d f=%d", &addr, runp->ai_family, addr.data.sa.sa_family); - if (VIR_EXPAND_N(socks, nsocks, 1) < 0) - goto error; + VIR_EXPAND_N(socks, nsocks, 1); if (!(socks[nsocks-1] = virNetSocketNew(&addr, NULL, false, fd, -1, 0, false))) goto error; diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index f42aed3f62..a42549dcf4 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -175,16 +175,10 @@ virNetSSHSessionAuthMethodNew(virNetSSHSessionPtr sess) auth = g_new0(virNetSSHAuthMethod, 1); - if (VIR_EXPAND_N(sess->auths, sess->nauths, 1) < 0) - goto error; - + VIR_EXPAND_N(sess->auths, sess->nauths, 1); sess->auths[sess->nauths - 1] = auth; return auth; - - error: - VIR_FREE(auth); - return NULL; } /* keyboard interactive authentication callback */ diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 2804759557..33dda27087 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -649,8 +649,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) name += strlen(name) + 1; } - if (VIR_EXPAND_N(names, nnames, 1) < 0) - goto error; + VIR_EXPAND_N(names, nnames, 1); return names; diff --git a/src/storage_file/storage_file_backend_gluster.c b/src/storage_file/storage_file_backend_gluster.c index 8c7a583886..06ba99bfe3 100644 --- a/src/storage_file/storage_file_backend_gluster.c +++ b/src/storage_file/storage_file_backend_gluster.c @@ -279,8 +279,7 @@ virStorageFileBackendGlusterReadlinkCallback(const char *path, return 1; realloc: - if (VIR_EXPAND_N(buf, bufsiz, 256) < 0) - return -1; + VIR_EXPAND_N(buf, bufsiz, 256); if ((ret = glfs_readlink(priv->vol, path, buf, bufsiz)) < 0) { virReportSystemError(errno, diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c index 5e2db3d390..bac5a043e5 100644 --- a/src/storage_file/storage_source_backingstore.c +++ b/src/storage_file/storage_source_backingstore.c @@ -146,8 +146,7 @@ virStorageSourceRBDAddHost(virStorageSourcePtr src, size_t skip; g_auto(GStrv) parts = NULL; - if (VIR_EXPAND_N(src->hosts, src->nhosts, 1) < 0) - return -1; + VIR_EXPAND_N(src->hosts, src->nhosts, 1); if ((port = strchr(hostport, ']'))) { /* ipv6, strip brackets */ diff --git a/src/util/vircommand.c b/src/util/vircommand.c index d647463f35..29c17454d8 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -228,7 +228,7 @@ virCommandFDSet(virCommandPtr cmd, if (virCommandFDIsSet(cmd, fd)) return; - ignore_value(VIR_EXPAND_N(cmd->passfd, cmd->npassfd, 1)); + VIR_EXPAND_N(cmd->passfd, cmd->npassfd, 1); cmd->passfd[cmd->npassfd - 1].fd = fd; cmd->passfd[cmd->npassfd - 1].flags = flags; diff --git a/src/util/virfile.c b/src/util/virfile.c index 56d6e0605e..c0730f6641 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2010,7 +2010,6 @@ virFileGetMountSubtreeImpl(const char *mtabpath, FILE *procmnt; struct mntent mntent; char mntbuf[1024]; - int ret = -1; char **mounts = NULL; size_t nmounts = 0; @@ -2031,8 +2030,7 @@ virFileGetMountSubtreeImpl(const char *mtabpath, mntent.mnt_dir[strlen(prefix)] == '/'))) continue; - if (VIR_EXPAND_N(mounts, nmounts, nmounts ? 1 : 2) < 0) - goto cleanup; + VIR_EXPAND_N(mounts, nmounts, nmounts ? 1 : 2); mounts[nmounts - 2] = g_strdup(mntent.mnt_dir); } @@ -2042,13 +2040,8 @@ virFileGetMountSubtreeImpl(const char *mtabpath, *mountsret = mounts; *nmountsret = nmounts ? nmounts - 1 : 0; - ret = 0; - - cleanup: - if (ret < 0) - g_strfreev(mounts); endmntent(procmnt); - return ret; + return 0; } #else /* ! defined WITH_MNTENT_H && defined WITH_GETMNTENT_R */ static int @@ -3548,8 +3541,7 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, if (STRNEQ(mb.mnt_type, "hugetlbfs")) continue; - if (VIR_EXPAND_N(fs, nfs, 1) < 0) - goto cleanup; + VIR_EXPAND_N(fs, nfs, 1); tmp = &fs[nfs - 1]; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index dd3e104dbe..eee191ff23 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -510,8 +510,7 @@ void virFirewallStartTransaction(virFirewallPtr firewall, group = virFirewallGroupNew(); group->actionFlags = flags; - ignore_value(VIR_EXPAND_N(firewall->groups, - firewall->ngroups, 1)); + VIR_EXPAND_N(firewall->groups, firewall->ngroups, 1); firewall->groups[firewall->ngroups - 1] = group; firewall->currentGroup = firewall->ngroups - 1; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 0d6cff3707..5e6d3ea428 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -214,9 +214,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, } res->lockHeld = true; - if (VIR_EXPAND_N(res->owners, res->nOwners, 1) < 0) - goto error; - + VIR_EXPAND_N(res->owners, res->nOwners, 1); res->owners[res->nOwners-1] = owner; return res; @@ -583,8 +581,7 @@ int virLockSpaceAcquireResource(virLockSpacePtr lockspace, if ((res->flags & VIR_LOCK_SPACE_ACQUIRE_SHARED) && (flags & VIR_LOCK_SPACE_ACQUIRE_SHARED)) { - if (VIR_EXPAND_N(res->owners, res->nOwners, 1) < 0) - goto cleanup; + VIR_EXPAND_N(res->owners, res->nOwners, 1); res->owners[res->nOwners-1] = owner; goto done; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 8428c91182..924fc65b50 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -653,7 +653,6 @@ int virProcessGetNamespaces(pid_t pid, size_t *nfdlist, int **fdlist) { - int ret = -1; size_t i = 0; const char *ns[] = { "user", "ipc", "uts", "net", "pid", "mnt" }; @@ -667,24 +666,12 @@ int virProcessGetNamespaces(pid_t pid, nsfile = g_strdup_printf("/proc/%llu/ns/%s", (long long)pid, ns[i]); if ((fd = open(nsfile, O_RDONLY)) >= 0) { - if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { - VIR_FORCE_CLOSE(fd); - goto cleanup; - } - + VIR_EXPAND_N(*fdlist, *nfdlist, 1); (*fdlist)[(*nfdlist)-1] = fd; } } - ret = 0; - - cleanup: - if (ret < 0) { - for (i = 0; i < *nfdlist; i++) - VIR_FORCE_CLOSE((*fdlist)[i]); - VIR_FREE(*fdlist); - } - return ret; + return 0; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 0460be8d3a..8458db96bc 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -608,10 +608,9 @@ virResctrlGetCacheInfo(virResctrlInfoPtr resctrl, if (rv < 0) goto cleanup; - if (resctrl->nlevels <= level && + if (resctrl->nlevels <= level) VIR_EXPAND_N(resctrl->levels, resctrl->nlevels, - level - resctrl->nlevels + 1) < 0) - goto cleanup; + level - resctrl->nlevels + 1); if (!resctrl->levels[level]) { virResctrlInfoPerTypePtr *types = NULL; @@ -932,8 +931,7 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl, i_type->max_cache_id++; } - if (VIR_EXPAND_N(*controls, *ncontrols, 1) < 0) - goto error; + VIR_EXPAND_N(*controls, *ncontrols, 1); (*controls)[*ncontrols - 1] = g_new0(virResctrlInfoPerCache, 1); memcpy((*controls)[*ncontrols - 1], &i_type->control, sizeof(i_type->control)); } @@ -1098,9 +1096,8 @@ virResctrlAllocGetType(virResctrlAllocPtr alloc, { virResctrlAllocPerLevelPtr a_level = NULL; - if (alloc->nlevels <= level && - VIR_EXPAND_N(alloc->levels, alloc->nlevels, level - alloc->nlevels + 1) < 0) - return NULL; + if (alloc->nlevels <= level) + VIR_EXPAND_N(alloc->levels, alloc->nlevels, level - alloc->nlevels + 1); if (!alloc->levels[level]) { virResctrlAllocPerTypePtr *types = NULL; @@ -1132,10 +1129,9 @@ virResctrlAllocUpdateMask(virResctrlAllocPtr alloc, if (!a_type) return -1; - if (a_type->nmasks <= cache && + if (a_type->nmasks <= cache) VIR_EXPAND_N(a_type->masks, a_type->nmasks, - cache - a_type->nmasks + 1) < 0) - return -1; + cache - a_type->nmasks + 1); if (!a_type->masks[cache]) a_type->masks[cache] = virBitmapNewCopy(mask); @@ -1156,10 +1152,9 @@ virResctrlAllocUpdateSize(virResctrlAllocPtr alloc, if (!a_type) return -1; - if (a_type->nsizes <= cache && + if (a_type->nsizes <= cache) VIR_EXPAND_N(a_type->sizes, a_type->nsizes, - cache - a_type->nsizes + 1) < 0) - return -1; + cache - a_type->nsizes + 1); if (!a_type->sizes[cache]) a_type->sizes[cache] = g_new0(unsigned long long, 1); @@ -1316,10 +1311,9 @@ virResctrlAllocSetMemoryBandwidth(virResctrlAllocPtr alloc, alloc->mem_bw = mem_bw; } - if (mem_bw->nbandwidths <= id && + if (mem_bw->nbandwidths <= id) VIR_EXPAND_N(mem_bw->bandwidths, mem_bw->nbandwidths, - id - mem_bw->nbandwidths + 1) < 0) - return -1; + id - mem_bw->nbandwidths + 1); if (mem_bw->bandwidths[id]) { virReportError(VIR_ERR_XML_ERROR, @@ -1469,9 +1463,9 @@ virResctrlAllocParseProcessMemoryBandwidth(virResctrlInfoPtr resctrl, "memory bandwidth node '%u'"), id); return -1; } - if (alloc->mem_bw->nbandwidths <= id && + if (alloc->mem_bw->nbandwidths <= id) { VIR_EXPAND_N(alloc->mem_bw->bandwidths, alloc->mem_bw->nbandwidths, - id - alloc->mem_bw->nbandwidths + 1) < 0) { + id - alloc->mem_bw->nbandwidths + 1); return -1; } if (!alloc->mem_bw->bandwidths[id]) @@ -1856,9 +1850,8 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info) if (info->membw_info) { ret->mem_bw = g_new0(virResctrlAllocMemBW, 1); - if (VIR_EXPAND_N(ret->mem_bw->bandwidths, ret->mem_bw->nbandwidths, - info->membw_info->max_id + 1) < 0) - goto error; + VIR_EXPAND_N(ret->mem_bw->bandwidths, ret->mem_bw->nbandwidths, + info->membw_info->max_id + 1); for (i = 0; i < ret->mem_bw->nbandwidths; i++) { ret->mem_bw->bandwidths[i] = g_new0(unsigned int, 1); @@ -2146,10 +2139,9 @@ virResctrlAllocCopyMemBW(virResctrlAllocPtr dst, dst_bw = dst->mem_bw; - if (src_bw->nbandwidths > dst_bw->nbandwidths && + if (src_bw->nbandwidths > dst_bw->nbandwidths) VIR_EXPAND_N(dst_bw->bandwidths, dst_bw->nbandwidths, - src_bw->nbandwidths - dst_bw->nbandwidths) < 0) - return -1; + src_bw->nbandwidths - dst_bw->nbandwidths); for (i = 0; i < src_bw->nbandwidths; i++) { if (dst_bw->bandwidths[i]) diff --git a/src/util/virstring.c b/src/util/virstring.c index 1d6141b5c1..07594292bb 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -691,8 +691,7 @@ virStringSearch(const char *str, /* '*matches' must always be NULL terminated in every iteration * of the loop, so start by allocating 1 element */ - if (VIR_EXPAND_N(*matches, nmatches, 1) < 0) - goto cleanup; + VIR_EXPAND_N(*matches, nmatches, 1); while ((nmatches - 1) < max_matches) { g_autoptr(GMatchInfo) info = NULL; @@ -702,8 +701,7 @@ virStringSearch(const char *str, if (!g_regex_match(regex, str, 0, &info)) break; - if (VIR_EXPAND_N(*matches, nmatches, 1) < 0) - goto cleanup; + VIR_EXPAND_N(*matches, nmatches, 1); match = g_match_info_fetch(info, 1); diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 1c8193cc58..df1cf59709 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -276,8 +276,7 @@ virSysinfoParsePPCProcessor(const char *base, virSysinfoDefPtr ret) eol = strchr(base, '\n'); cur = strchr(base, ':') + 1; - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) - return -1; + VIR_EXPAND_N(ret->processor, ret->nprocessor, 1); processor = &ret->processor[ret->nprocessor - 1]; virSkipSpaces(&cur); @@ -409,8 +408,7 @@ virSysinfoParseARMProcessor(const char *base, virSysinfoDefPtr ret) eol = strchr(base, '\n'); cur = strchr(base, ':') + 1; - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) - goto error; + VIR_EXPAND_N(ret->processor, ret->nprocessor, 1); processor = &ret->processor[ret->nprocessor - 1]; virSkipSpaces(&cur); @@ -425,10 +423,6 @@ virSysinfoParseARMProcessor(const char *base, virSysinfoDefPtr ret) VIR_FREE(processor_type); return 0; - - error: - VIR_FREE(processor_type); - return -1; } /* virSysinfoRead for ARMv7 @@ -544,8 +538,7 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) while ((tmp_base = strstr(tmp_base, "processor ")) && (tmp_base = virSysinfoParseS390Line(tmp_base, "processor ", &procline))) { - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) - goto error; + VIR_EXPAND_N(ret->processor, ret->nprocessor, 1); processor = &ret->processor[ret->nprocessor - 1]; processor->processor_manufacturer = g_strdup(manufacturer); if (!virSysinfoParseS390Delimited(procline, "version", @@ -770,7 +763,6 @@ virSysinfoParseX86BaseBoard(const char *base, virSysinfoBaseBoardDefPtr *baseBoard, size_t *nbaseBoard) { - int ret = -1; const char *cur; char *eol = NULL; virSysinfoBaseBoardDefPtr boards = NULL; @@ -779,8 +771,7 @@ virSysinfoParseX86BaseBoard(const char *base, while (base && (cur = strstr(base, "Base Board Information"))) { virSysinfoBaseBoardDefPtr def; - if (VIR_EXPAND_N(boards, nboards, 1) < 0) - goto cleanup; + VIR_EXPAND_N(boards, nboards, 1); def = &boards[nboards - 1]; @@ -842,13 +833,7 @@ virSysinfoParseX86BaseBoard(const char *base, *nbaseBoard = nboards; *baseBoard = g_steal_pointer(&boards); - nboards = 0; - ret = 0; - cleanup: - while (nboards--) - virSysinfoBaseBoardDefClear(&boards[nboards]); - VIR_FREE(boards); - return ret; + return 0; } @@ -981,8 +966,7 @@ virSysinfoParseOEMStrings(const char *base, if (!eol) continue; - if (VIR_EXPAND_N(strings->values, strings->nvalues, 1) < 0) - goto cleanup; + VIR_EXPAND_N(strings->values, strings->nvalues, 1); /* If OEM String contains newline, dmidecode escapes it as a dot. * If this is the case then run dmidecode again to get raw string. @@ -1023,8 +1007,7 @@ virSysinfoParseX86Processor(const char *base, virSysinfoDefPtr ret) base = tmp_base; eol = NULL; - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) - return -1; + VIR_EXPAND_N(ret->processor, ret->nprocessor, 1); processor = &ret->processor[ret->nprocessor - 1]; if ((cur = strstr(base, "Socket Designation: ")) != NULL) { @@ -1124,8 +1107,7 @@ virSysinfoParseX86Memory(const char *base, virSysinfoDefPtr ret) base = tmp_base; eol = NULL; - if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) - return -1; + VIR_EXPAND_N(ret->memory, ret->nmemory, 1); memory = &ret->memory[ret->nmemory - 1]; if ((cur = strstr(base, "Size: ")) != NULL) { diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index c22f2df866..cf22edaa0a 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -738,8 +738,7 @@ virSystemdActivationAddFD(virSystemdActivationPtr act, return 0; } - if (VIR_EXPAND_N(ent->fds, ent->nfds, 1) < 0) - return -1; + VIR_EXPAND_N(ent->fds, ent->nfds, 1); VIR_DEBUG("Record extra FD %d with name %s", fd, name); ent->fds[ent->nfds - 1] = fd; diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 942cfa48b1..42549c4892 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -183,8 +183,7 @@ virThreadPoolExpand(virThreadPoolPtr pool, size_t gain, bool priority) size_t i = 0; struct virThreadPoolWorkerData *data = NULL; - if (VIR_EXPAND_N(*workers, *curWorkers, gain) < 0) - return -1; + VIR_EXPAND_N(*workers, *curWorkers, gain); for (i = 0; i < gain; i++) { g_autofree char *name = NULL; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index 1b89233012..018d504433 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -328,8 +328,7 @@ virTypedParamsReplaceString(virTypedParameterPtr *params, } old = param->value.s; } else { - if (VIR_EXPAND_N(*params, n, 1) < 0) - return -1; + VIR_EXPAND_N(*params, n, 1); param = *params + n - 1; } diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 4f12d2ebfa..f9637a65ab 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -472,8 +472,7 @@ virVBoxSnapshotConfAllChildren(virVBoxSnapshotConfHardDiskPtr disk, for (i = 0; i < disk->nchildren; i++) { tempSize = virVBoxSnapshotConfAllChildren(disk->children[i], &tempList); - if (VIR_EXPAND_N(ret, returnSize, tempSize) < 0) - goto error; + VIR_EXPAND_N(ret, returnSize, tempSize); for (j = 0; j < tempSize; j++) ret[returnSize - tempSize + j] = tempList[j]; @@ -481,17 +480,10 @@ virVBoxSnapshotConfAllChildren(virVBoxSnapshotConfHardDiskPtr disk, VIR_FREE(tempList); } - if (VIR_EXPAND_N(ret, returnSize, 1) < 0) - goto error; - + VIR_EXPAND_N(ret, returnSize, 1); ret[returnSize - 1] = disk; *list = ret; return returnSize; - - error: - VIR_FREE(tempList); - VIR_FREE(ret); - return 0; } void @@ -785,9 +777,7 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSnapshotConfSnapshotPtr snapsh _("Unable to find the snapshot %s"), snapshotParentName); return -1; } - if (VIR_EXPAND_N(parentSnapshot->children, parentSnapshot->nchildren, 1) < 0) - return -1; - + VIR_EXPAND_N(parentSnapshot->children, parentSnapshot->nchildren, 1); parentSnapshot->children[parentSnapshot->nchildren - 1] = snapshot; } @@ -829,9 +819,7 @@ virVBoxSnapshotConfAddHardDiskToMediaRegistry(virVBoxSnapshotConfHardDiskPtr har return -1; } /* Hard disk found */ - if (VIR_EXPAND_N(parentDisk->children, parentDisk->nchildren, 1) < 0) - return -1; - + VIR_EXPAND_N(parentDisk->children, parentDisk->nchildren, 1); parentDisk->children[parentDisk->nchildren - 1] = hardDisk; if (hardDisk->parent == NULL) hardDisk->parent = parentDisk; @@ -1395,8 +1383,7 @@ virVBoxSnapshotConfDiskListToOpen(virVBoxSnapshotConfMachinePtr machine, ret[returnSize - 1] = hardDisk; while (hardDisk->parent != NULL) { - if (VIR_EXPAND_N(ret, returnSize, 1) < 0) - return 0; + VIR_EXPAND_N(ret, returnSize, 1); ret[returnSize - 1] = hardDisk->parent; hardDisk = hardDisk->parent; } @@ -1424,8 +1411,7 @@ virVBoxSnapshotConfRemoveFakeDisks(virVBoxSnapshotConfMachinePtr machine) for (i = 0; i < machine->mediaRegistry->ndisks; i++) { tempSize = virVBoxSnapshotConfAllChildren(machine->mediaRegistry->disks[i], &tempList); - if (VIR_EXPAND_N(diskList, diskSize, tempSize) < 0) - goto cleanup; + VIR_EXPAND_N(diskList, diskSize, tempSize); for (j = 0; j < tempSize; j++) diskList[diskSize - tempSize + j] = tempList[j]; @@ -1475,8 +1461,7 @@ virVBoxSnapshotConfDiskIsInMediaRegistry(virVBoxSnapshotConfMachinePtr machine, for (i = 0; i < machine->mediaRegistry->ndisks; i++) { tempSize = virVBoxSnapshotConfAllChildren(machine->mediaRegistry->disks[i], &tempList); - if (VIR_EXPAND_N(diskList, diskSize, tempSize) < 0) - goto cleanup; + VIR_EXPAND_N(diskList, diskSize, tempSize); for (j = 0; j < tempSize; j++) diskList[diskSize - tempSize + j] = tempList[j]; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 8b4b75d753..efa6aff2cb 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -68,8 +68,7 @@ testCompareXMLToXMLFiles(const char *inxml, if (flags & TEST_VDA_BITMAP) { virDomainCheckpointDiskDefPtr disk; - if (VIR_EXPAND_N(def->disks, def->ndisks, 1) < 0) - return -1; + VIR_EXPAND_N(def->disks, def->ndisks, 1); disk = &def->disks[0]; if (disk->bitmap) return -1; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index ae3fcf9311..227b78d527 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -117,8 +117,7 @@ qemuMonitorTestAddResponse(qemuMonitorTestPtr test, if (have < want) { size_t need = want - have; - if (VIR_EXPAND_N(test->outgoing, test->outgoingCapacity, need) < 0) - return -1; + VIR_EXPAND_N(test->outgoing, test->outgoingCapacity, need); } want -= 2; @@ -283,10 +282,7 @@ qemuMonitorTestIO(virNetSocketPtr sock, char *t1, *t2; if ((test->incomingCapacity - test->incomingLength) < 1024) { - if (VIR_EXPAND_N(test->incoming, test->incomingCapacity, 1024) < 0) { - err = true; - goto cleanup; - } + VIR_EXPAND_N(test->incoming, test->incomingCapacity, 1024); } if ((ret = virNetSocketRead(sock, @@ -868,9 +864,7 @@ qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, } i = data->nargs; - if (VIR_EXPAND_N(data->args, data->nargs, 1)) - goto error; - + VIR_EXPAND_N(data->args, data->nargs, 1); data->args[i].argname = g_strdup(argname); data->args[i].argval = g_strdup(argval); } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index b1bf6e0f95..def88e3950 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -144,12 +144,7 @@ testSELinuxLoadFileList(const char *testname, *tmp = '\0'; } - if (VIR_EXPAND_N(*files, *nfiles, 1) < 0) { - VIR_FREE(file); - VIR_FREE(context); - goto cleanup; - } - + VIR_EXPAND_N(*files, *nfiles, 1); (*files)[(*nfiles)-1].file = file; (*files)[(*nfiles)-1].context = context; } diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 4794fd7f93..5e27aa51c0 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -133,8 +133,7 @@ testExpandArray(const void *opaque G_GNUC_UNUSED) t[i].b = 20; } - if (VIR_EXPAND_N(t, nt, 5) < 0) - goto cleanup; + VIR_EXPAND_N(t, nt, 5); if (testCheckNonNull(t) < 0) goto cleanup; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7db88f700a..f5e98a19f8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4068,10 +4068,7 @@ cmdStartGetFDs(vshControl *ctl, vshError(ctl, _("Unable to parse FD number '%s'"), fdlist[i]); goto error; } - if (VIR_EXPAND_N(fds, nfds, 1) < 0) { - vshError(ctl, "%s", _("Unable to allocate FD list")); - goto error; - } + VIR_EXPAND_N(fds, nfds, 1); fds[nfds - 1] = fd; } @@ -10055,16 +10052,10 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) setlabel = false; while ((opt = vshCommandOptArgv(ctl, cmd, opt))) { - if (VIR_EXPAND_N(cmdargv, ncmdargv, 1) < 0) { - vshError(ctl, _("%s: %d: failed to allocate argv"), - __FILE__, __LINE__); - } + VIR_EXPAND_N(cmdargv, ncmdargv, 1); cmdargv[ncmdargv-1] = opt->data; } - if (VIR_EXPAND_N(cmdargv, ncmdargv, 1) < 0) { - vshError(ctl, _("%s: %d: failed to allocate argv"), - __FILE__, __LINE__); - } + VIR_EXPAND_N(cmdargv, ncmdargv, 1); cmdargv[ncmdargv - 1] = NULL; if ((nfdlist = virDomainLxcOpenNamespace(dom, &fdlist, 0)) < 0) @@ -13956,11 +13947,7 @@ cmdDomFSFreeze(vshControl *ctl, const vshCmd *cmd) return false; while ((opt = vshCommandOptArgv(ctl, cmd, opt))) { - if (VIR_EXPAND_N(mountpoints, nmountpoints, 1) < 0) { - vshError(ctl, _("%s: %d: failed to allocate mountpoints"), - __FILE__, __LINE__); - goto cleanup; - } + VIR_EXPAND_N(mountpoints, nmountpoints, 1); mountpoints[nmountpoints-1] = opt->data; } @@ -14009,11 +13996,7 @@ cmdDomFSThaw(vshControl *ctl, const vshCmd *cmd) return false; while ((opt = vshCommandOptArgv(ctl, cmd, opt))) { - if (VIR_EXPAND_N(mountpoints, nmountpoints, 1) < 0) { - vshError(ctl, _("%s: %d: failed to allocate mountpoints"), - __FILE__, __LINE__); - goto cleanup; - } + VIR_EXPAND_N(mountpoints, nmountpoints, 1); mountpoints[nmountpoints-1] = opt->data; } -- 2.31.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/bhyve/bhyve_parse_command.c | 8 +++--- src/conf/capabilities.c | 3 +-- src/conf/domain_conf.c | 11 ++++---- src/conf/storage_conf.c | 3 +-- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 4 +-- src/conf/virnodedeviceobj.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 2 +- src/esx/esx_stream.c | 3 +-- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_capabilities.c | 3 +-- src/libxl/libxl_conf.c | 14 ++++------ src/libxl/libxl_driver.c | 15 ++++------- src/qemu/qemu_agent.c | 4 +-- src/qemu/qemu_firmware.c | 5 ++-- src/qemu/qemu_hotplug.c | 36 +++++++++---------------- src/qemu/qemu_monitor.c | 4 +-- src/qemu/qemu_monitor_json.c | 12 ++------- src/qemu/qemu_process.c | 25 ++--------------- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetmessage.c | 12 +++------ src/storage/storage_backend_disk.c | 4 +-- src/storage/storage_backend_logical.c | 3 +-- src/storage/storage_backend_rbd.c | 3 +-- src/util/virarptable.c | 3 +-- src/util/vircommand.c | 5 ++-- src/util/virdnsmasq.c | 13 +++------ src/util/virfile.c | 5 +--- src/util/virjson.c | 13 +++------ src/util/virnuma.c | 14 +++++----- src/util/virstring.c | 3 +-- src/util/virsysinfo.c | 3 +-- src/vbox/vbox_common.c | 4 +-- tests/domaincapstest.c | 8 ++---- tests/qemublocktest.c | 3 +-- tests/viralloctest.c | 9 +++---- tools/virsh-console.c | 22 ++++++--------- tools/virt-login-shell-helper.c | 3 +-- tools/vsh.c | 6 ++--- 41 files changed, 96 insertions(+), 205 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 8d9a21e671..70f5ac42a0 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -219,8 +219,8 @@ bhyveCommandLineToArgv(const char *nativeConfig, * Otherwise, later argument lists may be assigned to _argv without * freeing the earlier ones. */ if (!_bhyve_argv && STREQ(arglist[0], "/usr/sbin/bhyve")) { - if ((VIR_REALLOC_N(_bhyve_argv, args_count + 1) < 0) - || (!bhyve_argc)) + VIR_REALLOC_N(_bhyve_argv, args_count + 1); + if (!bhyve_argc) goto error; for (j = 0; j < args_count; j++) _bhyve_argv[j] = arglist[j]; @@ -228,8 +228,8 @@ bhyveCommandLineToArgv(const char *nativeConfig, *bhyve_argc = args_count-1; VIR_FREE(arglist); } else if (!_loader_argv) { - if ((VIR_REALLOC_N(_loader_argv, args_count + 1) < 0) - || (!loader_argc)) + VIR_REALLOC_N(_loader_argv, args_count + 1); + if (!loader_argc) goto error; for (j = 0; j < args_count; j++) _loader_argv[j] = arglist[j]; diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index bc9035afae..573ac4e975 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1476,8 +1476,7 @@ virCapabilitiesGetNUMASiblingInfo(int node, tmp_size++; } - if (VIR_REALLOC_N(tmp, tmp_size) < 0) - goto cleanup; + VIR_REALLOC_N(tmp, tmp_size); *nsiblings = tmp_size; *siblings = g_steal_pointer(&tmp); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index afbd6fc7c1..95602ae57e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3433,8 +3433,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def, def->iothreadids[i]->iothread_id)); /* resize array */ - if (VIR_REALLOC_N(def->iothreadids, iothreads) < 0) - return -1; + VIR_REALLOC_N(def->iothreadids, iothreads); /* Populate iothreadids[] using the set bit number from thrmap */ while (def->niothreadids < iothreads) { @@ -17587,7 +17586,8 @@ virDomainChrPreAlloc(virDomainDefPtr vmdef, &arrPtr, &cntPtr) < 0) return -1; - return VIR_REALLOC_N(*arrPtr, *cntPtr + 1); + VIR_REALLOC_N(*arrPtr, *cntPtr + 1); + return 0; } void @@ -21442,8 +21442,9 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the host devices */ if ((n = virXPathNodeSet("./devices/hostdev", ctxt, &nodes)) < 0) goto error; - if (n && VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n) < 0) - goto error; + if (n > 0) + VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n); + for (i = 0; i < n; i++) { virDomainHostdevDefPtr hostdev; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2e07c81f8a..310a062ee7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1787,8 +1787,7 @@ virStoragePoolSourceListNewSource(virStoragePoolSourceListPtr list) { virStoragePoolSourcePtr source; - if (VIR_REALLOC_N(list->sources, list->nsources + 1) < 0) - return NULL; + VIR_REALLOC_N(list->sources, list->nsources + 1); source = &list->sources[list->nsources++]; memset(source, 0, sizeof(*source)); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 00180cd36e..cc990a05cd 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -329,7 +329,7 @@ virInterfaceObjListExport(virConnectPtr conn, if (data.ifaces) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(data.ifaces, data.nifaces + 1)); + VIR_REALLOC_N(data.ifaces, data.nifaces + 1); *ifaces = data.ifaces; data.ifaces = NULL; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 6ff6c63218..47739718a7 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1428,7 +1428,7 @@ virNetworkObjListExport(virConnectPtr conn, if (data.nets) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(data.nets, data.nnets + 1)); + VIR_REALLOC_N(data.nets, data.nnets + 1); *nets = data.nets; data.nets = NULL; } @@ -1816,7 +1816,7 @@ virNetworkObjPortListExport(virNetworkPtr net, if (data.ports) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(data.ports, data.nports + 1)); + VIR_REALLOC_N(data.ports, data.nports + 1); *ports = data.ports; data.ports = NULL; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c9bda77b2e..ecae3d0479 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -958,7 +958,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, goto cleanup; if (data.devices) { - ignore_value(VIR_REALLOC_N(data.devices, data.ndevices + 1)); + VIR_REALLOC_N(data.devices, data.ndevices + 1); *devices = data.devices; } diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index fd27bb1f01..a15a288371 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -598,7 +598,7 @@ virSecretObjListExport(virConnectPtr conn, if (data.secrets) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(data.secrets, data.nsecrets + 1)); + VIR_REALLOC_N(data.secrets, data.nsecrets + 1); *secrets = data.secrets; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 69c2c2da36..0e27b0ca65 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -2089,7 +2089,7 @@ virStoragePoolObjListExport(virConnectPtr conn, if (data.pools) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(data.pools, data.nPools + 1)); + VIR_REALLOC_N(data.pools, data.nPools + 1); *pools = data.pools; } diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index e4e67a01bb..5b20804bb1 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -136,8 +136,7 @@ esxVI_CURL_WriteStream(char *input, size_t size, size_t nmemb, void *userdata) } else if (input_remaining > backlog_remaining) { priv->backlog_size += input_remaining - backlog_remaining; - if (VIR_REALLOC_N(priv->backlog, priv->backlog_size) < 0) - return 0; + VIR_REALLOC_N(priv->backlog, priv->backlog_size); } memcpy(priv->backlog + priv->backlog_used, input + input_used, diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 7c0edfae63..54a141eaa9 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -714,7 +714,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (tmp_iface_objs) { /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(tmp_iface_objs, niface_objs + 1)); + VIR_REALLOC_N(tmp_iface_objs, niface_objs + 1); *ifaces = g_steal_pointer(&tmp_iface_objs); } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index b6809a45f3..d5bd7c8b18 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -393,7 +393,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, /* Trim the array to its final size */ if (ifaces) { - ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); + VIR_REALLOC_N(ifaces_list, count + 1); *ifaces = g_steal_pointer(&ifaces_list); } diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 10e5d46cdd..8faca38cbc 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -285,8 +285,7 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCapsPtr caps) if (nr_cpus_node[node] == 1) { cpus[node] = g_new0(virCapsHostNUMACellCPU, 1); } else { - if (VIR_REALLOC_N(cpus[node], nr_cpus_node[node]) < 0) - goto cleanup; + VIR_REALLOC_N(cpus[node], nr_cpus_node[node]); } /* Mapping between what libxl tells and what libvirt wants */ diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5ee15d42e3..90528d4765 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1751,9 +1751,10 @@ libxlDriverConfigNew(void) #ifdef DEFAULT_LOADER_NVRAM if (virFirmwareParseList(DEFAULT_LOADER_NVRAM, &cfg->firmwares, - &cfg->nfirmwares) < 0) - goto error; - + &cfg->nfirmwares) < 0) { + virObjectUnref(cfg); + return NULL; + } #else cfg->firmwares = g_new0(virFirmwarePtr, 1); cfg->nfirmwares = 1; @@ -1762,8 +1763,7 @@ libxlDriverConfigNew(void) #endif /* Always add hvmloader to firmwares */ - if (VIR_REALLOC_N(cfg->firmwares, cfg->nfirmwares + 1) < 0) - goto error; + VIR_REALLOC_N(cfg->firmwares, cfg->nfirmwares + 1); cfg->nfirmwares++; cfg->firmwares[cfg->nfirmwares - 1] = g_new0(virFirmware, 1); cfg->firmwares[cfg->nfirmwares - 1]->name = g_strdup(LIBXL_FIRMWARE_DIR "/hvmloader"); @@ -1773,10 +1773,6 @@ libxlDriverConfigNew(void) cfg->keepAliveCount = 5; return cfg; - - error: - virObjectUnref(cfg); - return NULL; } int diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e3d769b5d9..830634b2bd 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3054,8 +3054,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) goto cleanup; } - if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1); if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; @@ -3122,8 +3121,7 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver, goto cleanup; } - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); if (virHostdevPreparePCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, vm->def->uuid, @@ -3190,8 +3188,7 @@ libxlDomainAttachControllerDevice(libxlDriverPrivatePtr driver, goto cleanup; } - if (VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers + 1); if (libxlMakeUSBController(controller, &usbctrl) < 0) goto cleanup; @@ -3259,8 +3256,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivatePtr driver, } } - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); if (virHostdevPrepareUSBDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1, 0) < 0) @@ -3403,8 +3399,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, libxl_device_nic_init(&nic); /* preallocate new slot for device */ - if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1); /* If appropriate, grab a physical device from the configured * network's pool of devices, or resolve bridge device name diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index fa37d284b3..02793edd02 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -456,9 +456,7 @@ qemuAgentIORead(qemuAgentPtr agent) QEMU_AGENT_MAX_RESPONSE); return -1; } - if (VIR_REALLOC_N(agent->buffer, - agent->bufferLength + 1024) < 0) - return -1; + VIR_REALLOC_N(agent->buffer, agent->bufferLength + 1024); agent->bufferLength += 1024; avail += 1024; } diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index eb33441272..a211d2fb36 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1464,9 +1464,8 @@ qemuFirmwareGetSupported(const char *machine, } } - if (fws && !*fws && nfirmwares && - VIR_REALLOC_N(*fws, 0) < 0) - return -1; + if (fws && !*fws && nfirmwares) + VIR_REALLOC_N(*fws, 0); for (i = 0; i < nfirmwares; i++) qemuFirmwareFree(firmwares[i]); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a66354426d..58d2abb862 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -737,8 +737,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (!(devstr = qemuBuildDiskDeviceStr(vm->def, disk, 0, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1); if (qemuHotplugAttachManagedPR(driver, vm, disk->src, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; @@ -880,8 +879,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, if (!devstr) goto cleanup; - if (VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers+1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers+1); qemuDomainObjEnterMonitor(driver, vm); @@ -1198,8 +1196,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virErrorPtr save_err = NULL; /* preallocate new slot for device */ - if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1); /* If appropriate, grab a physical device from the configured * network's pool of devices, or resolve bridge device name @@ -1604,8 +1601,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned int flags = 0; - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - return -1; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); if (!cfg->relaxedACS) flags |= VIR_HOSTDEV_STRICT_ACS_CHECK; @@ -1938,8 +1934,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(def->redirdevs, def->nredirdevs+1) < 0) - goto cleanup; + VIR_REALLOC_N(def->redirdevs, def->nredirdevs+1); if (qemuDomainAddChardevTLSObjects(driver, vm, redirdev->source, redirdev->info.alias, charAlias, @@ -2286,8 +2281,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, goto cleanup; /* preallocate space for the device definition */ - if (VIR_REALLOC_N(vm->def->rngs, vm->def->nrngs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->rngs, vm->def->nrngs + 1); if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "rng") < 0) return -1; @@ -2569,8 +2563,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, if (!(devstr = qemuBuildUSBHostdevDevStr(vm->def, hostdev, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorAddDevice(priv->mon, devstr); @@ -2662,8 +2655,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver, if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, hostdev, backendalias))) goto cleanup; - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); qemuDomainObjEnterMonitor(driver, vm); @@ -2774,8 +2766,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, vhostfdName))) goto cleanup; - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); qemuDomainObjEnterMonitor(driver, vm); @@ -2877,8 +2868,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1); if (qemuDomainAdjustMaxMemLockHostdev(vm, hostdev) < 0) goto cleanup; @@ -3006,8 +2996,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, qemuDomainPrepareShmemChardev(shmem); - if (VIR_REALLOC_N(vm->def->shmems, vm->def->nshmems + 1) < 0) - return -1; + VIR_REALLOC_N(vm->def->shmems, vm->def->nshmems + 1); if ((shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && @@ -3209,8 +3198,7 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver, goto cleanup; teardownlabel = true; - if (VIR_REALLOC_N(vm->def->inputs, vm->def->ninputs + 1) < 0) - goto cleanup; + VIR_REALLOC_N(vm->def->inputs, vm->def->ninputs + 1); qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c43c6f180e..3760349450 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -474,9 +474,7 @@ qemuMonitorIORead(qemuMonitorPtr mon) QEMU_MONITOR_MAX_RESPONSE); return -1; } - if (VIR_REALLOC_N(mon->buffer, - mon->bufferLength + 1024) < 0) - return -1; + VIR_REALLOC_N(mon->buffer, mon->bufferLength + 1024); mon->bufferLength += 1024; avail += 1024; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5e7f425495..c87a4c6ed1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -659,12 +659,8 @@ qemuMonitorJSONParseKeywords(const char *str, } if (keywordAlloc == keywordCount) { - if (VIR_REALLOC_N(keywords, keywordAlloc + 10) < 0 || - VIR_REALLOC_N(values, keywordAlloc + 10) < 0) { - VIR_FREE(keyword); - VIR_FREE(value); - goto error; - } + VIR_REALLOC_N(keywords, keywordAlloc + 10); + VIR_REALLOC_N(values, keywordAlloc + 10); keywordAlloc += 10; } @@ -679,10 +675,6 @@ qemuMonitorJSONParseKeywords(const char *str, *retvalues = values; *retnkeywords = keywordCount; return 0; - - error: - qemuMonitorJSONParseKeywordsFree(keywordCount, keywords, values); - return -1; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b86afe4daa..fedd1f56b1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1073,7 +1073,6 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainEventGraphicsAddressPtr localAddr = NULL; virDomainEventGraphicsAddressPtr remoteAddr = NULL; virDomainEventGraphicsSubjectPtr subject = NULL; - size_t i; localAddr = g_new0(virDomainEventGraphicsAddress, 1); localAddr->family = localFamily; @@ -1087,15 +1086,13 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, subject = g_new0(virDomainEventGraphicsSubject, 1); if (x509dname) { - if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) - goto error; + VIR_REALLOC_N(subject->identities, subject->nidentity+1); subject->nidentity++; subject->identities[subject->nidentity - 1].type = g_strdup("x509dname"); subject->identities[subject->nidentity - 1].name = g_strdup(x509dname); } if (saslUsername) { - if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) - goto error; + VIR_REALLOC_N(subject->identities, subject->nidentity+1); subject->nidentity++; subject->identities[subject->nidentity - 1].type = g_strdup("saslUsername"); subject->identities[subject->nidentity - 1].name = g_strdup(saslUsername); @@ -1108,24 +1105,6 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); return 0; - - error: - VIR_FREE(localAddr->service); - VIR_FREE(localAddr->node); - VIR_FREE(localAddr); - - VIR_FREE(remoteAddr->service); - VIR_FREE(remoteAddr->node); - VIR_FREE(remoteAddr); - - for (i = 0; i < subject->nidentity; i++) { - VIR_FREE(subject->identities[i].type); - VIR_FREE(subject->identities[i].name); - } - VIR_FREE(subject->identities); - VIR_FREE(subject); - - return -1; } static int diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2de5cfe4b6..1ac6bc08de 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1154,8 +1154,7 @@ virNetClientCallDispatchReply(virNetClientPtr client) return -1; } - if (VIR_REALLOC_N(thecall->msg->buffer, client->msg.bufferLength) < 0) - return -1; + VIR_REALLOC_N(thecall->msg->buffer, client->msg.bufferLength); memcpy(thecall->msg->buffer, client->msg.buffer, client->msg.bufferLength); memcpy(&thecall->msg->header, &client->msg.header, sizeof(client->msg.header)); diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 9f7334ae4c..f2b8526817 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -152,8 +152,7 @@ int virNetMessageDecodeLength(virNetMessagePtr msg) /* Extend our declared buffer length and carry on reading the header + payload */ msg->bufferLength += len; - if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) - goto cleanup; + VIR_REALLOC_N(msg->buffer, msg->bufferLength); VIR_DEBUG("Got length, now need %zu total (%u more)", msg->bufferLength, len); @@ -229,8 +228,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg) unsigned int len = 0; msg->bufferLength = VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX; - if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) - return ret; + VIR_REALLOC_N(msg->buffer, msg->bufferLength); msg->bufferOffset = 0; /* Format the header. */ @@ -370,8 +368,7 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, msg->bufferLength = newlen + VIR_NET_MESSAGE_LEN_MAX; - if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) - goto error; + VIR_REALLOC_N(msg->buffer, msg->bufferLength); xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, msg->bufferLength - msg->bufferOffset, XDR_ENCODE); @@ -454,8 +451,7 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, msg->bufferLength = msg->bufferOffset + len; - if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) - return -1; + VIR_REALLOC_N(msg->buffer, msg->bufferLength); VIR_DEBUG("Increased message buffer length = %zu", msg->bufferLength); } diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index af90f3fc45..49747cb7c9 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -235,9 +235,7 @@ virStorageBackendDiskMakeFreeExtent(virStoragePoolObjPtr pool, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStoragePoolSourceDevicePtr dev = &def->source.devices[0]; - if (VIR_REALLOC_N(dev->freeExtents, - dev->nfreeExtent + 1) < 0) - return -1; + VIR_REALLOC_N(dev->freeExtents, dev->nfreeExtent + 1); memset(dev->freeExtents + dev->nfreeExtent, 0, diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ead3dab4fd..3e65318188 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -447,8 +447,7 @@ virStorageBackendLogicalFindPoolSourcesFunc(char **const groups, thisSource->name = g_steal_pointer(&vgname); } - if (VIR_REALLOC_N(thisSource->devices, thisSource->ndevice + 1) != 0) - return -1; + VIR_REALLOC_N(thisSource->devices, thisSource->ndevice + 1); dev = &thisSource->devices[thisSource->ndevice]; thisSource->ndevice++; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 33dda27087..871304d0d3 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -583,8 +583,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) size_t i; while (true) { - if (VIR_REALLOC_N(images, nimages) < 0) - goto error; + VIR_REALLOC_N(images, nimages); rc = rbd_list2(ptr->ioctx, images, &nimages); if (rc >= 0) diff --git a/src/util/virarptable.c b/src/util/virarptable.c index dfe3ebee5b..6abf5b454a 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -114,9 +114,8 @@ virArpTableGet(void) if (tb[NDA_DST]) { g_autofree char *ipstr = NULL; virSocketAddr virAddr; - if (VIR_REALLOC_N(table->t, num + 1) < 0) - goto cleanup; + VIR_REALLOC_N(table->t, num + 1); table->n = num + 1; addr = RTA_DATA(tb[NDA_DST]); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 29c17454d8..eb70f8cf85 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1742,7 +1742,7 @@ virCommandSetSendBuffer(virCommandPtr cmd, } i = virCommandGetNumSendBuffers(cmd); - ignore_value(VIR_REALLOC_N(cmd->sendBuffers, i + 1)); + VIR_REALLOC_N(cmd->sendBuffers, i + 1); cmd->sendBuffers[i].fd = pipefd[1]; cmd->sendBuffers[i].buffer = g_steal_pointer(&localbuf); @@ -2250,8 +2250,7 @@ virCommandProcessIO(virCommandPtr cmd) else errfd = -1; } else { - if (VIR_REALLOC_N(*buf, *len + done + 1) < 0) - goto cleanup; + VIR_REALLOC_N(*buf, *len + done + 1); memcpy(*buf + *len, data, done); *len += done; } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 3913114eca..fa59954997 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -105,8 +105,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, } if (idx < 0) { - if (VIR_REALLOC_N(addnhostsfile->hosts, addnhostsfile->nhosts + 1) < 0) - goto error; + VIR_REALLOC_N(addnhostsfile->hosts, addnhostsfile->nhosts + 1); idx = addnhostsfile->nhosts; addnhostsfile->hosts[idx].hostnames = g_new0(char *, 1); @@ -117,8 +116,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, addnhostsfile->nhosts++; } - if (VIR_REALLOC_N(addnhostsfile->hosts[idx].hostnames, addnhostsfile->hosts[idx].nhostnames + 1) < 0) - goto error; + VIR_REALLOC_N(addnhostsfile->hosts[idx].hostnames, addnhostsfile->hosts[idx].nhostnames + 1); addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames] = g_strdup(name); @@ -127,10 +125,6 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, addnhostsfile->hosts[idx].nhostnames++; return 0; - - error: - VIR_FREE(ipstr); - return -1; } static dnsmasqAddnHostsfile * @@ -297,8 +291,7 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, g_autofree char *ipstr = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - if (VIR_REALLOC_N(hostsfile->hosts, hostsfile->nhosts + 1) < 0) - return -1; + VIR_REALLOC_N(hostsfile->hosts, hostsfile->nhosts + 1); if (!(ipstr = virSocketAddrFormat(ip))) return -1; diff --git a/src/util/virfile.c b/src/util/virfile.c index c0730f6641..93fac200cc 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1346,10 +1346,7 @@ saferead_lim(int fd, size_t max_len, size_t *length) if (alloc < size + BUFSIZ + 1) alloc = size + BUFSIZ + 1; - if (VIR_REALLOC_N(buf, alloc) < 0) { - save_errno = errno; - break; - } + VIR_REALLOC_N(buf, alloc); } /* Ensure that (size + requested <= max_len); */ diff --git a/src/util/virjson.c b/src/util/virjson.c index f2a6024db6..9eb4dc4f18 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -779,9 +779,7 @@ virJSONValueArrayAppend(virJSONValuePtr array, return -1; } - if (VIR_REALLOC_N(array->data.array.values, - array->data.array.nvalues + 1) < 0) - return -1; + VIR_REALLOC_N(array->data.array.values, array->data.array.nvalues + 1); array->data.array.values[array->data.array.nvalues] = g_steal_pointer(value); array->data.array.nvalues++; @@ -1697,10 +1695,7 @@ virJSONParserHandleStartMap(void *ctx) if (virJSONParserInsertValue(parser, &value) < 0) return 0; - if (VIR_REALLOC_N(parser->state, - parser->nstate + 1) < 0) { - return 0; - } + VIR_REALLOC_N(parser->state, parser->nstate + 1); parser->state[parser->nstate].value = tmp; parser->state[parser->nstate].key = NULL; @@ -1745,9 +1740,7 @@ virJSONParserHandleStartArray(void *ctx) if (virJSONParserInsertValue(parser, &value) < 0) return 0; - if (VIR_REALLOC_N(parser->state, - parser->nstate + 1) < 0) - return 0; + VIR_REALLOC_N(parser->state, parser->nstate + 1); parser->state[parser->nstate].value = tmp; parser->state[parser->nstate].key = NULL; diff --git a/src/util/virnuma.c b/src/util/virnuma.c index a05e4ac72c..6c194b54d1 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -795,10 +795,9 @@ virNumaGetPages(int node, &page_avail, &page_free) < 0) return -1; - if (VIR_REALLOC_N(tmp_size, ntmp + 1) < 0 || - VIR_REALLOC_N(tmp_avail, ntmp + 1) < 0 || - VIR_REALLOC_N(tmp_free, ntmp + 1) < 0) - return -1; + VIR_REALLOC_N(tmp_size, ntmp + 1); + VIR_REALLOC_N(tmp_avail, ntmp + 1); + VIR_REALLOC_N(tmp_free, ntmp + 1); tmp_size[ntmp] = page_size; tmp_avail[ntmp] = page_avail; @@ -814,10 +813,9 @@ virNumaGetPages(int node, return -1; /* Now append the ordinary system pages */ - if (VIR_REALLOC_N(tmp_size, ntmp + 1) < 0 || - VIR_REALLOC_N(tmp_avail, ntmp + 1) < 0 || - VIR_REALLOC_N(tmp_free, ntmp + 1) < 0) - return -1; + VIR_REALLOC_N(tmp_size, ntmp + 1); + VIR_REALLOC_N(tmp_avail, ntmp + 1); + VIR_REALLOC_N(tmp_free, ntmp + 1); if (virNumaGetPageInfo(node, system_page_size, huge_page_sum, &tmp_avail[ntmp], &tmp_free[ntmp]) < 0) diff --git a/src/util/virstring.c b/src/util/virstring.c index 07594292bb..7749eb2db5 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -78,8 +78,7 @@ virStringListMerge(char ***dst, dst_len = g_strv_length(*dst); src_len = g_strv_length(*src); - if (VIR_REALLOC_N(*dst, dst_len + src_len + 1) < 0) - return -1; + VIR_REALLOC_N(*dst, dst_len + src_len + 1); for (i = 0; i <= src_len; i++) (*dst)[i + dst_len] = (*src)[i]; diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index df1cf59709..2ddbc1ac17 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -827,8 +827,7 @@ virSysinfoParseX86BaseBoard(const char *base, if (nboards == 0) { VIR_FREE(boards); } else { - /* This is safe, as we can be only shrinking the memory */ - ignore_value(VIR_REALLOC_N(boards, nboards)); + VIR_REALLOC_N(boards, nboards); } *nbaseBoard = nboards; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 69b99317f2..2ac22120d8 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7560,9 +7560,7 @@ vboxConnectListAllDomains(virConnectPtr conn, } if (doms) { - /* safe to ignore, new size will be equal or less than - * previous allocation */ - ignore_value(VIR_REALLOC_N(doms, count + 1)); + VIR_REALLOC_N(doms, count + 1); *domains = g_steal_pointer(&doms); } diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 65d9f4c635..f913346331 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -30,22 +30,18 @@ static int G_GNUC_NULL_TERMINATED fillStringValues(virDomainCapsStringValuesPtr values, ...) { - int ret = 0; va_list list; const char *str; va_start(list, values); while ((str = va_arg(list, const char *))) { - if (VIR_REALLOC_N(values->values, values->nvalues + 1) < 0) { - ret = -1; - break; - } + VIR_REALLOC_N(values->values, values->nvalues + 1); values->values[values->nvalues] = g_strdup(str); values->nvalues++; } va_end(list); - return ret; + return 0; } #endif /* WITH_QEMU || WITH_BHYVE */ diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index bbfcfee92d..5cc7c27ebe 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -316,8 +316,7 @@ testQemuDiskXMLToProps(const void *opaque) return -1; } - if (VIR_REALLOC_N(data->images, data->nimages + 1) < 0) - return -1; + VIR_REALLOC_N(data->images, data->nimages + 1); data->images[data->nimages].formatprops = g_steal_pointer(&formatProps); data->images[data->nimages].storageprops = g_steal_pointer(&storageProps); diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 5e27aa51c0..1dc11dce7b 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -60,8 +60,7 @@ testReallocArray(const void *opaque G_GNUC_UNUSED) t[i].b = 20; } - if (VIR_REALLOC_N(t, nt + 5) < 0) - goto cleanup; + VIR_REALLOC_N(t, nt + 5); if (testCheckNonNull(t) < 0) goto cleanup; @@ -74,8 +73,7 @@ testReallocArray(const void *opaque G_GNUC_UNUSED) } } - if (VIR_REALLOC_N(t, nt) < 0) - goto cleanup; + VIR_REALLOC_N(t, nt); if (testCheckNonNull(t) < 0) goto cleanup; @@ -88,8 +86,7 @@ testReallocArray(const void *opaque G_GNUC_UNUSED) } } - if (VIR_REALLOC_N(t, nt - 5) < 0) - goto cleanup; + VIR_REALLOC_N(t, nt - 5); if (testCheckNonNull(t) < 0) goto cleanup; diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 4e9bdb67e1..39e38e5959 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -167,11 +167,8 @@ virConsoleEventOnStream(virStreamPtr st, int got; if (avail < 1024) { - if (VIR_REALLOC_N(con->streamToTerminal.data, - con->streamToTerminal.length + 1024) < 0) { - virConsoleShutdown(con, false); - goto cleanup; - } + VIR_REALLOC_N(con->streamToTerminal.data, + con->streamToTerminal.length + 1024); con->streamToTerminal.length += 1024; avail += 1024; } @@ -212,8 +209,8 @@ virConsoleEventOnStream(virStreamPtr st, avail = con->terminalToStream.length - con->terminalToStream.offset; if (avail > 1024) { - ignore_value(VIR_REALLOC_N(con->terminalToStream.data, - con->terminalToStream.offset + 1024)); + VIR_REALLOC_N(con->terminalToStream.data, + con->terminalToStream.offset + 1024); con->terminalToStream.length = con->terminalToStream.offset + 1024; } } @@ -251,11 +248,8 @@ virConsoleEventOnStdin(int watch G_GNUC_UNUSED, int got; if (avail < 1024) { - if (VIR_REALLOC_N(con->terminalToStream.data, - con->terminalToStream.length + 1024) < 0) { - virConsoleShutdown(con, false); - goto cleanup; - } + VIR_REALLOC_N(con->terminalToStream.data, + con->terminalToStream.length + 1024); con->terminalToStream.length += 1024; avail += 1024; } @@ -340,8 +334,8 @@ virConsoleEventOnStdout(int watch G_GNUC_UNUSED, avail = con->streamToTerminal.length - con->streamToTerminal.offset; if (avail > 1024) { - ignore_value(VIR_REALLOC_N(con->streamToTerminal.data, - con->streamToTerminal.offset + 1024)); + VIR_REALLOC_N(con->streamToTerminal.data, + con->streamToTerminal.offset + 1024); con->streamToTerminal.length = con->streamToTerminal.offset + 1024; } } diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c index 1ac02bed00..f848056386 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -335,8 +335,7 @@ main(int argc, char **argv) } if (cmdstr) { - if (VIR_REALLOC_N(shargv, shargvlen + 3) < 0) - goto cleanup; + VIR_REALLOC_N(shargv, shargvlen + 3); shargv[shargvlen++] = g_strdup("-c"); shargv[shargvlen++] = g_strdup(cmdstr); shargv[shargvlen] = NULL; diff --git a/tools/vsh.c b/tools/vsh.c index 8fb033249e..1ffc13d443 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2582,8 +2582,7 @@ vshReadlineCommandGenerator(void) if (cmds[cmd_list_index].flags & VSH_CMD_FLAG_ALIAS) continue; - if (VIR_REALLOC_N(ret, ret_size + 2) < 0) - return NULL; + VIR_REALLOC_N(ret, ret_size + 2); ret[ret_size] = g_strdup(name); ret_size++; @@ -2630,8 +2629,7 @@ vshReadlineOptionsGenerator(const vshCmdDef *cmd, if (exists) continue; - if (VIR_REALLOC_N(ret, ret_size + 2) < 0) - return NULL; + VIR_REALLOC_N(ret, ret_size + 2); ret[ret_size] = g_strdup_printf("--%s", name); ret_size++; -- 2.31.0