These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/bhyve/bhyve_capabilities.c | 6 ++---- src/bhyve/bhyve_process.c | 16 +++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 27fa8ee5ef..2f03bd6131 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -159,10 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; - if (virAsprintf( - &firmwares->values[firmwares->nvalues], - "%s/%s", firmware_dir, entry->d_name) < 0) - goto cleanup; + virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s", + firmware_dir, entry->d_name); firmwares->nvalues++; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 5193f6e612..17e32176d9 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -86,11 +86,10 @@ bhyveNetCleanup(virDomainObjPtr vm) } } -static int +static void virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - return virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, - vm_name); + virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name); } int @@ -113,9 +112,7 @@ virBhyveProcessStart(virConnectPtr conn, int ret = -1, rc; virCapsPtr caps = NULL; - if (virAsprintf(&logfile, "%s/%s.log", - BHYVE_LOG_DIR, vm->def->name) < 0) - return -1; + virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name); caps = bhyveDriverGetCapabilities(privconn); if (!caps) @@ -165,9 +162,7 @@ virBhyveProcessStart(virConnectPtr conn, * domain is ready to be started, so we can build * and execute bhyveload command */ - rc = virBhyveFormatDevMapFile(vm->def->name, &devmap_file); - if (rc < 0) - goto cleanup; + virBhyveFormatDevMapFile(vm->def->name, &devmap_file); if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, &devicemap))) @@ -408,8 +403,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (kp == NULL || nprocs != 1) goto cleanup; - if (virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name) < 0) - goto cleanup; + virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name); proc_argv = kvm_getargv(data->kd, kp, 0); if (proc_argv && proc_argv[0]) { -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/cpu/cpu_ppc64.c | 21 ++++++++++----------- src/cpu/cpu_x86.c | 19 ++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 59a5e1fc1d..990bbbd45f 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -459,11 +459,10 @@ ppc64Compute(virCPUDefPtr host, if (!found) { VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); - if (message && + if (message) virAsprintf(message, _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)) < 0) - goto cleanup; + virArchToString(cpu->arch)); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -477,12 +476,12 @@ ppc64Compute(virCPUDefPtr host, (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); - if (message && + if (message) { virAsprintf(message, _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor) < 0) - goto cleanup; + "CPU vendor %s"), + cpu->vendor); + } ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -532,12 +531,12 @@ ppc64Compute(virCPUDefPtr host, if (STRNEQ(guest_model->name, host_model->name)) { VIR_DEBUG("host CPU model does not match required CPU model %s", guest_model->name); - if (message && + if (message) { virAsprintf(message, _("host CPU model does not match required " - "CPU model %s"), - guest_model->name) < 0) - goto cleanup; + "CPU model %s"), + guest_model->name); + } ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index d7fcb3b147..8418339d6f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1724,11 +1724,8 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) virReportOOMError(); \ goto error; \ } \ - if (message && \ - virAsprintf(message, "%s: %s", _(MSG), flagsStr) < 0) { \ - VIR_FREE(flagsStr); \ - goto error; \ - } \ + if (message) \ + virAsprintf(message, "%s: %s", _(MSG), flagsStr); \ VIR_DEBUG("%s: %s", MSG, flagsStr); \ VIR_FREE(flagsStr); \ ret = VIR_CPU_COMPARE_INCOMPATIBLE; \ @@ -1769,11 +1766,11 @@ x86Compute(virCPUDefPtr host, if (!found) { VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); - if (message && + if (message) { virAsprintf(message, _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)) < 0) - goto error; + virArchToString(cpu->arch)); + } return VIR_CPU_COMPARE_INCOMPATIBLE; } arch = cpu->arch; @@ -1785,12 +1782,12 @@ x86Compute(virCPUDefPtr host, (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); - if (message && + if (message) { virAsprintf(message, _("host CPU vendor does not match required " "CPU vendor %s"), - cpu->vendor) < 0) - goto error; + cpu->vendor); + } return VIR_CPU_COMPARE_INCOMPATIBLE; } -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/hyperv/hyperv_driver.c | 9 +++------ src/hyperv/hyperv_wmi.c | 21 ++++++++------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 542253b8b8..eb35cf6115 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1378,11 +1378,9 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, } } - if (virAsprintf(&selector, - "CreationClassName=Msvm_Keyboard&DeviceID=%s&" + virAsprintf(&selector, "CreationClassName=Msvm_Keyboard&DeviceID=%s&" "SystemCreationClassName=Msvm_ComputerSystem&" - "SystemName=%s", keyboard->data.common->DeviceID, uuid_string) < 0) - goto cleanup; + "SystemName=%s", keyboard->data.common->DeviceID, uuid_string); /* press the keys */ for (i = 0; i < nkeycodes; i++) { @@ -1464,8 +1462,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virCheckFlags(0, -1); - if (virAsprintf(&memory_str, "%lu", memory_mb) < 0) - goto cleanup; + virAsprintf(&memory_str, "%lu", memory_mb); virUUIDFormat(domain->uuid, uuid_string); diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 04f82389c1..c0c9b7f77e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -439,8 +439,7 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr params, WsXmlDocH *docRoot) char *method = NULL; WsXmlNodeH xmlNodeMethod = NULL; - if (virAsprintf(&method, "%s_INPUT", params->method) < 0) - goto cleanup; + virAsprintf(&method, "%s_INPUT", params->method); *docRoot = ws_xml_create_doc(NULL, method); if (*docRoot == NULL) { @@ -849,9 +848,9 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, params->method, paramsDocRoot); /* check return code of invocation */ - if (virAsprintf(&returnValue_xpath, "/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", - params->method) < 0) - goto cleanup; + virAsprintf(&returnValue_xpath, + "/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", + params->method); returnValue = ws_xml_get_xpath_value(response, returnValue_xpath); if (!returnValue) { @@ -865,12 +864,10 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, goto cleanup; if (returnCode == CIM_RETURNCODE_TRANSITION_STARTED) { - if (virAsprintf(&jobcode_instance_xpath, + virAsprintf(&jobcode_instance_xpath, "/s:Envelope/s:Body/p:%s_OUTPUT/p:Job/a:ReferenceParameters/" "w:SelectorSet/w:Selector[@Name='InstanceID']", - params->method) < 0) { - goto cleanup; - } + params->method); instanceID = ws_xml_get_xpath_value(response, jobcode_instance_xpath); if (!instanceID) { @@ -1341,10 +1338,8 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, virUUIDFormat(domain->uuid, uuid_string); - if (virAsprintf(&selector, "Name=%s&CreationClassName=Msvm_ComputerSystem", - uuid_string) < 0 || - virAsprintf(&properties, "RequestedState=%d", requestedState) < 0) - goto cleanup; + virAsprintf(&selector, "Name=%s&CreationClassName=Msvm_ComputerSystem", uuid_string); + virAsprintf(&properties, "RequestedState=%d", requestedState); if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) resourceUri = MSVM_COMPUTERSYSTEM_V1_RESOURCE_URI; -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/libxl/libxl_conf.c | 34 +++++++++++----------------------- src/libxl/libxl_domain.c | 35 +++++++++++++---------------------- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_driver.c | 19 +++++++------------ src/libxl/libxl_logger.c | 11 ++++------- src/libxl/libxl_migration.c | 9 +++------ src/libxl/xen_common.c | 11 +++++------ src/libxl/xen_xl.c | 18 ++++++------------ src/libxl/xen_xm.c | 6 ++---- 9 files changed, 52 insertions(+), 93 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3f08f0f710..a984c9c8aa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -212,8 +212,7 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(buf, "%s:%s", type, srcdef->data.file.path) < 0) - return -1; + virAsprintf(buf, "%s:%s", type, srcdef->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_DEV: @@ -232,12 +231,8 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) if (bindService == NULL) bindService = "0"; - if (virAsprintf(buf, "udp:%s:%s@%s:%s", - connectHost, - srcdef->data.udp.connectService, - bindHost, - bindService) < 0) - return -1; + virAsprintf(buf, "udp:%s:%s@%s:%s", connectHost, + srcdef->data.udp.connectService, bindHost, bindService); break; } @@ -249,20 +244,15 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) else prefix = "tcp"; - if (virAsprintf(buf, "%s:%s:%s%s", - prefix, - srcdef->data.tcp.host, - srcdef->data.tcp.service, - srcdef->data.tcp.listen ? ",server,nowait" : "") < 0) - return -1; + virAsprintf(buf, "%s:%s:%s%s", prefix, srcdef->data.tcp.host, + srcdef->data.tcp.service, + srcdef->data.tcp.listen ? ",server,nowait" : ""); break; } case VIR_DOMAIN_CHR_TYPE_UNIX: - if (virAsprintf(buf, "unix:%s%s", - srcdef->data.nix.path, - srcdef->data.nix.listen ? ",server,nowait" : "") < 0) - return -1; + virAsprintf(buf, "unix:%s%s", srcdef->data.nix.path, + srcdef->data.nix.listen ? ",server,nowait" : ""); break; default: @@ -1937,11 +1927,9 @@ libxlPrepareChannel(virDomainChrDefPtr channel, if (channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN && channel->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && !channel->source->data.nix.path) { - if (virAsprintf(&channel->source->data.nix.path, - "%s/%s-%s", channelDir, domainName, - channel->target.name ? channel->target.name - : "unknown.sock") < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, "%s/%s-%s", channelDir, + domainName, + channel->target.name ? channel->target.name : "unknown.sock"); channel->source->data.nix.listen = true; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d79c3c1ed7..ebb739ae54 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -714,7 +714,7 @@ libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) char *ret; g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - ignore_value(virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name)); + virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name); return ret; } @@ -905,11 +905,11 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { - if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) - VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); - VIR_FREE(file); - } + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); + VIR_FREE(file); /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { @@ -931,7 +931,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, * * virDomainObjPtr must be locked on invocation */ -int +void libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { @@ -940,28 +940,19 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, char timestr[100]; struct tm time_info; char *dumpfile = NULL; - int ret = -1; localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); - if (virAsprintf(&dumpfile, "%s/%s-%s", - cfg->autoDumpDir, - vm->def->name, - timestr) < 0) - goto cleanup; + virAsprintf(&dumpfile, "%s/%s-%s", cfg->autoDumpDir, vm->def->name, + timestr); /* Unlock virDomainObj while dumping core */ virObjectUnlock(vm); libxl_domain_core_dump(cfg->ctx, vm->def->id, dumpfile, NULL); virObjectLock(vm); - ret = 0; - - cleanup: VIR_FREE(dumpfile); - - return ret; } int @@ -1130,7 +1121,7 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) for (i = 0; i < vm->def->nserials; i++) { chr = vm->def->serials[i]; - ignore_value(virAsprintf(&chr->info.alias, "serial%zd", i)); + virAsprintf(&chr->info.alias, "serial%zd", i); if (chr->source->type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source->data.file.path) continue; @@ -1170,9 +1161,9 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) if (net->ifname) continue; - ignore_value(virAsprintf(&net->ifname, - LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", - def->id, x_nic->devid, suffix)); + virAsprintf(&net->ifname, + LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", + def->id, x_nic->devid, suffix); } } diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 7e28093722..e78a3ce6b2 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -131,7 +131,7 @@ void libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event); -int +void libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, virDomainObjPtr vm); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5cc6b87b8c..69a949ee26 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -693,8 +693,7 @@ libxlStateInitialize(bool privileged, if (!(cfg = libxlDriverConfigNew())) goto error; - if (virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir) < 0) - goto error; + virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir); if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) goto error; @@ -5391,16 +5390,13 @@ libxlDiskSectorSize(int domid, int devno) } path = val = NULL; - if (virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", - domid, devno) < 0) - goto cleanup; + virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", domid, devno); if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) goto cleanup; VIR_FREE(path); - if (virAsprintf(&path, "%s/physical-sector-size", val) < 0) - goto cleanup; + virAsprintf(&path, "%s/physical-sector-size", val); VIR_FREE(val); if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) @@ -5438,9 +5434,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, stats->backend = g_strdup("vbd"); - if (virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", - vm->def->id, devno) < 0) - return ret; + virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", + vm->def->id, devno); if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -5449,8 +5444,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, } # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ - if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \ - (virFileReadAll(name, 256, &val) < 0) || \ + virAsprintf(&name, "%s/"FIELD, path); \ + if ((virFileReadAll(name, 256, &val) < 0) || \ (sscanf(val, "%llu", &status) != 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ _("cannot read %s"), name); \ diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 87ad793fb5..4bdca54fcc 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -158,8 +158,7 @@ libxlLoggerNew(const char *logDir, virLogPriority minLevel) if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL) return NULL; - if (virAsprintf(&path, "%s/libxl-driver.log", logDir) < 0) - goto error; + virAsprintf(&path, "%s/libxl-driver.log", logDir); if ((logger.defaultLogFile = fopen(path, "a")) == NULL) goto error; @@ -196,9 +195,8 @@ libxlLoggerOpenFile(libxlLoggerPtr logger, char *domidstr = NULL; char ebuf[1024]; - if (virAsprintf(&path, "%s/%s.log", logger->logDir, name) < 0 || - virAsprintf(&domidstr, "%d", id) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.log", logger->logDir, name); + virAsprintf(&domidstr, "%d", id); if (!(logFile = fopen(path, "a"))) { VIR_WARN("Failed to open log file %s: %s", @@ -222,8 +220,7 @@ void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) { char *domidstr = NULL; - if (virAsprintf(&domidstr, "%d", id) < 0) - return; + virAsprintf(&domidstr, "%d", id); ignore_value(virHashRemoveEntry(logger->files, domidstr)); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0a57b6fcb0..09b709e51b 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -709,14 +709,12 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto endjob; priv->migrationPort = port; - if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) - goto endjob; + virAsprintf(uri_out, "tcp://%s:%d", hostname, port); } else { if (!(STRPREFIX(uri_in, "tcp://"))) { /* not full URI, add prefix tcp:// */ char *tmp; - if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) - goto endjob; + virAsprintf(&tmp, "tcp://%s", uri_in); uri = virURIParse(tmp); VIR_FREE(tmp); } else { @@ -747,8 +745,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, port = uri->port; } - if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) - goto endjob; + virAsprintf(uri_out, "tcp://%s:%d", hostname, port); } snprintf(portstr, sizeof(portstr), "%d", port); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index cc9039a0cf..826e6699bf 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1838,12 +1838,11 @@ xenFormatPCI(virConfPtr conf, virDomainDefPtr def) virConfValuePtr val, tmp; char *buf; - if (virAsprintf(&buf, "%04x:%02x:%02x.%x", - def->hostdevs[i]->source.subsys.u.pci.addr.domain, - def->hostdevs[i]->source.subsys.u.pci.addr.bus, - def->hostdevs[i]->source.subsys.u.pci.addr.slot, - def->hostdevs[i]->source.subsys.u.pci.addr.function) < 0) - goto error; + virAsprintf(&buf, "%04x:%02x:%02x.%x", + def->hostdevs[i]->source.subsys.u.pci.addr.domain, + def->hostdevs[i]->source.subsys.u.pci.addr.bus, + def->hostdevs[i]->source.subsys.u.pci.addr.slot, + def->hostdevs[i]->source.subsys.u.pci.addr.function); if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6bdad2a59d..a7c51e3c98 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -83,11 +83,9 @@ static int xenParseCmdline(virConfPtr conf, char **r_cmdline) VIR_WARN("ignoring root= and extra= in favour of cmdline="); } else { if (root && extra) { - if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) - return -1; + virAsprintf(&cmdline, "root=%s %s", root, extra); } else if (root) { - if (virAsprintf(&cmdline, "root=%s", root) < 0) - return -1; + virAsprintf(&cmdline, "root=%s", root); } else if (extra) { cmdline = g_strdup(extra); } @@ -1396,10 +1394,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr def) policy = "0"; break; } - if (virAsprintf(&cpuid_pairs[j++], "%s=%s", - feature_name, - policy) < 0) - goto cleanup; + virAsprintf(&cpuid_pairs[j++], "%s=%s", feature_name, policy); } cpuid_pairs[j] = NULL; @@ -2073,10 +2068,9 @@ xenFormatXLUSB(virConfPtr conf, virConfValuePtr val, tmp; char *buf; - if (virAsprintf(&buf, "hostbus=%x,hostaddr=%x", - def->hostdevs[i]->source.subsys.u.usb.bus, - def->hostdevs[i]->source.subsys.u.usb.device) < 0) - goto error; + virAsprintf(&buf, "hostbus=%x,hostaddr=%x", + def->hostdevs[i]->source.subsys.u.usb.bus, + def->hostdevs[i]->source.subsys.u.usb.device); if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index fdf4e1cd29..d962b13cbb 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -90,11 +90,9 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) return -1; if (root && extra) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; + virAsprintf(&def->os.cmdline, "root=%s %s", root, extra); } else if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0) - return -1; + virAsprintf(&def->os.cmdline, "root=%s", root); } else if (extra) { def->os.cmdline = g_strdup(extra); } -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/locking/lock_daemon.c | 17 +++++------------ src/locking/lock_daemon_config.c | 5 +---- src/locking/lock_driver_lockd.c | 9 ++------- src/locking/lock_driver_sanlock.c | 12 ++++-------- src/locking/lock_manager.c | 4 +--- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 7d8c11a2a3..dc23179009 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -464,11 +464,8 @@ virLockDaemonUnixSocketPaths(bool privileged, } umask(old_umask); - if (virAsprintf(sockfile, "%s/virtlockd-sock", rundir) < 0 || - virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir) < 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(sockfile, "%s/virtlockd-sock", rundir); + virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir); VIR_FREE(rundir); } @@ -531,8 +528,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, /* Define the default output. This is only applied if there was no setting * from either the config or the environment. */ - if (virLogSetDefaultOutput("virtlockd", godaemon, privileged) < 0) - return -1; + virLogSetDefaultOutput("virtlockd", godaemon, privileged); if (virLogGetNbOutputs() == 0) virLogSetOutputs(virLogGetDefaultOutput()); @@ -845,10 +841,7 @@ virLockDaemonExecRestartStatePath(bool privileged, } umask(old_umask); - if (virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir) < 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir); VIR_FREE(rundir); } @@ -865,7 +858,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; - ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid())); + virAsprintf(&ret, "%lld", (long long int)getpid()); return ret; } diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index 6e635f1e0b..e77e2b7bf6 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -46,10 +46,7 @@ virLockDaemonConfigFilePath(bool privileged, char **configfile) if (!(configdir = virGetUserConfigDirectory())) goto error; - if (virAsprintf(configfile, "%s/virtlockd.conf", configdir) < 0) { - VIR_FREE(configdir); - goto error; - } + virAsprintf(configfile, "%s/virtlockd.conf", configdir); VIR_FREE(configdir); } diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 9452f2957c..73f699044b 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -127,10 +127,7 @@ static char *virLockManagerLockDaemonPath(bool privileged) if (!(rundir = virGetUserRuntimeDirectory())) return NULL; - if (virAsprintf(&path, "%s/virtlockd-sock", rundir) < 0) { - VIR_FREE(rundir); - return NULL; - } + virAsprintf(&path, "%s/virtlockd-sock", rundir); VIR_FREE(rundir); } @@ -577,9 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, _("Missing path or lockspace for lease resource")); goto cleanup; } - if (virAsprintf(&newLockspace, "%s/%s", - path, lockspace) < 0) - goto cleanup; + virAsprintf(&newLockspace, "%s/%s", path, lockspace); newName = g_strdup(name); } break; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index beeeb6066b..0aee93c195 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - ignore_value(virAsprintfQuiet(message, _("sanlock error %d"), err)); + virAsprintfQuiet(message, _("sanlock error %d"), err); #endif return true; } else { @@ -211,10 +211,8 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) char *dir = NULL; int retries = LOCKSPACE_RETRIES; - if (virAsprintf(&path, "%s/%s", - driver->autoDiskLeasePath, - VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0) - goto error; + virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, + VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0) { @@ -645,9 +643,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriverPtr driver, goto cleanup; } - if (virAsprintf(&path, "%s/%s", - driver->autoDiskLeasePath, res->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, res->name); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Lease path '%s' exceeds %d characters"), diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 6898bfc556..0986cafe6c 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -131,9 +131,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x", name, driverName, configDir, flags); - if (virAsprintf(&configFile, "%s/%s-%s.conf", - configDir, driverName, name) < 0) - return NULL; + virAsprintf(&configFile, "%s/%s-%s.conf", configDir, driverName, name); if (STREQ(name, "nop")) { driver = &virLockDriverNop; -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/lxc/lxc_container.c | 69 ++++++++++++++--------------------- src/lxc/lxc_controller.c | 79 +++++++++++++--------------------------- src/lxc/lxc_driver.c | 15 ++------ src/lxc/lxc_fuse.c | 10 ++--- src/lxc/lxc_monitor.c | 4 +- src/lxc/lxc_native.c | 11 ++---- src/lxc/lxc_process.c | 35 +++++------------- 7 files changed, 75 insertions(+), 148 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 88dc2e2bdf..090a22571d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -682,9 +682,7 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, if (lxcContainerResolveSymlinks(root, false) < 0) return -1; - if (virAsprintf(&dst, "%s/%s.root", - LXC_STATE_DIR, def->name) < 0) - return -1; + virAsprintf(&dst, "%s/%s.root", LXC_STATE_DIR, def->name); tmp = root->dst; root->dst = dst; @@ -719,8 +717,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if (virAsprintf(&oldroot, "%s/.oldroot", root->src->path) < 0) - goto err; + virAsprintf(&oldroot, "%s/.oldroot", root->src->path); if (virFileMakePath(oldroot) < 0) { virReportSystemError(errno, @@ -739,8 +736,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } /* Create a directory called 'new' in tmpfs */ - if (virAsprintf(&newroot, "%s/new", oldroot) < 0) - goto err; + virAsprintf(&newroot, "%s/new", oldroot); if (virFileMakePath(newroot) < 0) { virReportSystemError(errno, @@ -925,8 +921,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, char *hostdir; int ret; - if (virAsprintf(&hostdir, "/.oldroot%s", mnt->dst) < 0) - goto cleanup; + virAsprintf(&hostdir, "/.oldroot%s", mnt->dst); ret = virFileIsMountPoint(hostdir); VIR_FREE(hostdir); @@ -1017,11 +1012,10 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); - if ((ret = virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + virAsprintf(&meminfo_path, + "/.oldroot/%s/%s.fuse/meminfo", + stateDir, + def->name); if ((ret = mount(meminfo_path, "/proc/meminfo", NULL, MS_BIND, NULL)) < 0) { @@ -1050,9 +1044,7 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); - if ((ret = virAsprintf(&path, "/.oldroot/%s/%s.dev", - stateDir, def->name)) < 0) - return ret; + virAsprintf(&path, "/.oldroot/%s/%s.dev", stateDir, def->name); if (virFileMakePath("/dev") < 0) { virReportSystemError(errno, "%s", @@ -1086,9 +1078,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, VIR_DEBUG("Mount /dev/pts stateDir=%s", stateDir); - if (virAsprintf(&path, "/.oldroot/%s/%s.devpts", - stateDir, def->name) < 0) - return ret; + virAsprintf(&path, "/.oldroot/%s/%s.devpts", stateDir, def->name); if (virFileMakePath("/dev/pts") < 0) { virReportSystemError(errno, "%s", @@ -1140,8 +1130,7 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) for (i = 0; i < nttyPaths; i++) { char *tty; - if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) - return -1; + virAsprintf(&tty, "/dev/tty%zu", i + 1); if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { VIR_FREE(tty); @@ -1167,8 +1156,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, VIR_DEBUG("src=%s dst=%s", fs->src->path, fs->dst); - if (virAsprintf(&src, "%s%s", srcprefix, fs->src->path) < 0) - goto cleanup; + virAsprintf(&src, "%s%s", srcprefix, fs->src->path); if (stat(fs->dst, &st) < 0) { if (errno != ENOENT) { @@ -1338,9 +1326,8 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, /* First time around we use /etc/filesystems */ retry: - if (virAsprintf(&fslist, "%s%s", srcprefix, - tryProc ? "/proc/filesystems" : "/etc/filesystems") < 0) - goto cleanup; + virAsprintf(&fslist, "%s%s", srcprefix, + tryProc ? "/proc/filesystems" : "/etc/filesystems"); VIR_DEBUG("Open fslist %s", fslist); if (!(fp = fopen(fslist, "r"))) { @@ -1501,14 +1488,12 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, VIR_DEBUG("src=%s dst=%s", fs->src->path, fs->dst); - if (virAsprintf(&src, "%s%s", srcprefix, fs->src->path) < 0) - goto cleanup; + virAsprintf(&src, "%s%s", srcprefix, fs->src->path); ret = lxcContainerMountFSBlockHelper(fs, src, srcprefix, sec_mount_options); VIR_DEBUG("Done mounting filesystem ret=%d", ret); - cleanup: VIR_FREE(src); return ret; } @@ -1522,9 +1507,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); - if (virAsprintf(&data, - "size=%lld%s", fs->usage, sec_mount_options) < 0) - goto cleanup; + virAsprintf(&data, "size=%lld%s", fs->usage, sec_mount_options); if (virFileMakePath(fs->dst) < 0) { virReportSystemError(errno, @@ -1672,19 +1655,22 @@ static int lxcContainerUnmountForSharedRoot(const char *stateDir, /* These filesystems are created by libvirt temporarily, they * shouldn't appear in container. */ - if (virAsprintf(&tmp, "%s/%s.dev", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.dev", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; VIR_FREE(tmp); - if (virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; #if WITH_FUSE VIR_FREE(tmp); - if (virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; #endif @@ -2246,9 +2232,8 @@ static int lxcContainerChild(void *data) const char *tty = argv->ttyPaths[0]; if (STRPREFIX(tty, "/dev/pts/")) tty += strlen("/dev/pts/"); - if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", - LXC_STATE_DIR, vmDef->name, tty) < 0) - goto cleanup; + virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->name, + tty); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("At least one tty is required")); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0c5b9e713d..56e30eeaa9 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -565,10 +565,11 @@ static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, size_t loops = 0; pid_t pid; - if (!STRPREFIX(dev, "/dev/") || - virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5) < 0) + if (!STRPREFIX(dev, "/dev/")) goto cleanup; + virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5); + /* Wait for the pid file to appear */ while (!virFileExists(pidpath)) { /* wait for 100ms before checking again, but don't do it for ever */ @@ -945,9 +946,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) virNetServerServicePtr svc = NULL; char *sockpath; - if (virAsprintf(&sockpath, "%s/%s.sock", - LXC_STATE_DIR, ctrl->name) < 0) - return -1; + virAsprintf(&sockpath, "%s/%s.sock", LXC_STATE_DIR, ctrl->name); if (!(srv = virNetServerNew("LXC", 1, 0, 0, 0, 1, @@ -1435,16 +1434,14 @@ static int virLXCControllerSetupUserns(virLXCControllerPtr ctrl) } VIR_DEBUG("Setting up userns maps"); - if (virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid) < 0) - goto cleanup; + virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid); if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.uidmap, ctrl->def->idmap.nuidmap, uid_map) < 0) goto cleanup; - if (virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid) < 0) - goto cleanup; + virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid); if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.gidmap, ctrl->def->idmap.ngidmap, @@ -1470,18 +1467,14 @@ static int virLXCControllerSetupDev(virLXCControllerPtr ctrl) mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager, ctrl->def); - if (virAsprintf(&dev, "/%s/%s.dev", - LXC_STATE_DIR, ctrl->def->name) < 0) - goto cleanup; + virAsprintf(&dev, "/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); /* * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - if (virAsprintf(&opts, - "mode=755,size=65536%s", mount_options) < 0) - goto cleanup; + virAsprintf(&opts, "mode=755,size=65536%s", mount_options); if (virFileSetupDev(dev, opts) < 0) goto cleanup; @@ -1521,9 +1514,8 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) /* Populate /dev/ with a few important bits */ for (i = 0; i < G_N_ELEMENTS(devs); i++) { - if (virAsprintf(&path, "/%s/%s.dev/%s", - LXC_STATE_DIR, ctrl->def->name, devs[i].path) < 0) - goto cleanup; + virAsprintf(&path, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + devs[i].path); dev_t dev = makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || @@ -1561,19 +1553,13 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, mode_t mode; virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; - if (virAsprintf(&src, USB_DEVFS "/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&src, USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->device); - if (virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", - LXC_STATE_DIR, vmDef->name) < 0) - goto cleanup; + virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name); - if (virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus) < 0) - goto cleanup; + virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus); - if (virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device); if (stat(src, &sb) < 0) { virReportSystemError(errno, @@ -1647,10 +1633,8 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, while (*(path + len) == '/') len++; - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1725,10 +1709,8 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, while (*(path + len) == '/') len++; - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1883,9 +1865,8 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, goto cleanup; } - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, ctrl->def->name, def->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + def->dst); if (stat(def->src->path, &sb) < 0) { virReportSystemError(errno, @@ -2074,12 +2055,8 @@ lxcCreateTty(virLXCControllerPtr ctrl, int *ttymaster, * while glibc has to fstat(), fchmod(), and fchown() for older * kernels, we can skip those steps. ptyno shouldn't currently be * anything other than 0, but let's play it safe. */ - if ((virAsprintf(ttyName, "/dev/pts/%d", ptyno) < 0) || - (virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, - ctrl->def->name, ptyno) < 0)) { - errno = ENOMEM; - goto cleanup; - } + virAsprintf(ttyName, "/dev/pts/%d", ptyno); + virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, ctrl->def->name, ptyno); ret = 0; @@ -2135,11 +2112,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager, ctrl->def); - if (virAsprintf(&devpts, "%s/%s.devpts", - LXC_STATE_DIR, ctrl->def->name) < 0 || - virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", - LXC_STATE_DIR, ctrl->def->name) < 0) - goto cleanup; + virAsprintf(&devpts, "%s/%s.devpts", LXC_STATE_DIR, ctrl->def->name); + virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", LXC_STATE_DIR, ctrl->def->name); if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, @@ -2155,9 +2129,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) /* XXX should we support gid=X for X!=5 for distros which use * a different gid for tty? */ - if (virAsprintf(&opts, "newinstance,ptmxmode=0666,mode=0620,gid=%u%s", - ptsgid, NULLSTR_EMPTY(mount_options)) < 0) - goto cleanup; + virAsprintf(&opts, "newinstance,ptmxmode=0666,mode=0620,gid=%u%s", ptsgid, + NULLSTR_EMPTY(mount_options)); VIR_DEBUG("Mount devpts on %s type=tmpfs flags=0x%x, opts=%s", devpts, MS_NOSUID, opts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 41a6a446bd..acaeae9311 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3788,9 +3788,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) goto cleanup; - if (virAsprintf(&file, - "/dev/%s", def->dst) < 0) - goto cleanup; + virAsprintf(&file, "/dev/%s", def->dst); if (lxcDomainAttachDeviceMknod(driver, 0700 | S_IFBLK, @@ -3975,9 +3973,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver, } usbsrc = &def->source.subsys.u.usb; - if (virAsprintf(&src, "/dev/bus/usb/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&src, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL))) goto cleanup; @@ -4313,8 +4309,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, def = vm->def->disks[idx]; src = virDomainDiskGetSource(def); - if (virAsprintf(&dst, "/dev/%s", def->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/dev/%s", def->dst); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -4452,9 +4447,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, } usbsrc = &def->source.subsys.u.usb; - if (virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index b64b275a87..35dbad7986 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -47,8 +47,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) virDomainDefPtr def = (virDomainDefPtr)context->private_data; memset(stbuf, 0, sizeof(struct stat)); - if (virAsprintf(&mempath, "/proc/%s", path) < 0) - return -errno; + virAsprintf(&mempath, "/proc/%s", path); res = 0; @@ -251,8 +250,7 @@ static int lxcProcRead(const char *path G_GNUC_UNUSED, struct fuse_context *context = NULL; virDomainDefPtr def = NULL; - if (virAsprintf(&hostpath, "/proc/%s", path) < 0) - return -errno; + virAsprintf(&hostpath, "/proc/%s", path); context = fuse_get_context(); def = (virDomainDefPtr)context->private_data; @@ -307,9 +305,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) if (virMutexInit(&fuse->lock) < 0) goto cleanup2; - if (virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, - def->name) < 0) - goto cleanup1; + virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, def->name); if (virFileMakePath(fuse->mountpoint) < 0) { virReportSystemError(errno, _("Cannot create %s"), diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 028e401236..1983af135e 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -151,9 +151,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(virLXCMonitorClass))) return NULL; - if (virAsprintf(&sockpath, "%s/%s.sock", - socketdir, vm->def->name) < 0) - goto error; + virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name); if (!(mon->client = virNetClientNewUNIX(sockpath, false, NULL))) goto error; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 5df09a849e..c7cf2c4b0e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -265,8 +265,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) return -1; if (fstab->dst[0] != '/') { - if (virAsprintf(&dst, "/%s", fstab->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/%s", fstab->dst); } else { dst = g_strdup(fstab->dst); } @@ -492,9 +491,8 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) * on the host */ if (isVlan && data->vlanid) { VIR_FREE(hostdev->source.caps.u.net.ifname); - if (virAsprintf(&hostdev->source.caps.u.net.ifname, - "%s.%s", data->link, data->vlanid) < 0) - goto error; + virAsprintf(&hostdev->source.caps.u.net.ifname, "%s.%s", + data->link, data->vlanid); } hostdev->source.caps.u.net.ip.ips = data->ips; @@ -950,8 +948,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) goto cleanup; } - if (virAsprintf(&path, "/dev/block/%s", parts[0]) < 0) - goto cleanup; + virAsprintf(&path, "/dev/block/%s", parts[0]); /* Do we already have a device definition for this path? * Get that device or create a new one */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 450053d163..2ec5762856 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -138,8 +138,7 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, char ebuf[1024]; char *file = NULL; - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - return; + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -419,10 +418,8 @@ static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type, cons goto cleanup; } - if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long int)priv->initpid, - nsInfoLocal[ns_type]) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/%s", (long long int)priv->initpid, + nsInfoLocal[ns_type]); if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, @@ -443,10 +440,7 @@ static int virLXCProcessSetupNamespacePID(int ns_type, const char *name) int fd; char *path; - if (virAsprintf(&path, "/proc/%s/ns/%s", - name, - nsInfoLocal[ns_type]) < 0) - return -1; + virAsprintf(&path, "/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); fd = open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -470,8 +464,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, const char *name) return -1; } - if (virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name) < 0) - return -1; + virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name); fd = open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -632,8 +625,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, /* Make sure all net definitions will have a name in the container */ if (!net->ifname_guest) { - if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) - goto cleanup; + virAsprintf(&net->ifname_guest, "eth%zu", niface); niface++; } } @@ -757,9 +749,7 @@ virLXCProcessGetNsInode(pid_t pid, struct stat sb; int ret = -1; - if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long)pid, nsname) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/%s", (long long)pid, nsname); if (stat(path, &sb) < 0) { virReportSystemError(errno, @@ -984,9 +974,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, for (i = 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) { if (nsInheritFDs[i] > 0) { char *tmp = NULL; - if (virAsprintf(&tmp, "--share-%s", - nsInfoLocal[i]) < 0) - goto error; + virAsprintf(&tmp, "--share-%s", nsInfoLocal[i]); virCommandAddArg(cmd, tmp); virCommandAddArgFormat(cmd, "%d", nsInheritFDs[i]); virCommandPassFD(cmd, nsInheritFDs[i], 0); @@ -1269,9 +1257,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource = res; } - if (virAsprintf(&logfile, "%s/%s.log", - cfg->logDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name); if (!(pidfile = virPidFileBuildPath(cfg->stateDir, vm->def->name))) goto cleanup; @@ -1358,8 +1344,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->consoles[i]->source->data.file.path = ttyPath; VIR_FREE(vm->def->consoles[i]->info.alias); - if (virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i) < 0) - goto cleanup; + virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i); } VIR_DEBUG("Setting up Interfaces"); -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/node_device/node_device_driver.c | 3 +-- src/node_device/node_device_hal.c | 7 ++----- src/node_device/node_device_udev.c | 11 +++-------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 7ef55f45e9..53373140be 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -113,8 +113,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) VIR_FREE(def->driver); - if (virAsprintf(&driver_link, "%s/driver", def->sysfs_path) < 0) - goto cleanup; + virAsprintf(&driver_link, "%s/driver", def->sysfs_path); /* Some devices don't have an explicit driver, so just return without a name */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 688a0e0f06..a6042e6bfc 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -614,16 +614,13 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, nodeDeviceLock(); if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto failure; + virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto failure; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto failure; + virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 525e71f80c..92d7048ece 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1028,9 +1028,7 @@ udevProcessMediatedDevice(struct udev_device *dev, * it by waiting for the attributes to become available. */ - if (virAsprintf(&linkpath, "%s/mdev_type", - udev_device_get_syspath(dev)) < 0) - goto cleanup; + virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)); if (virFileWaitForExists(linkpath, 1, 100) < 0) { virReportSystemError(errno, @@ -1812,16 +1810,13 @@ nodeStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/openvz/openvz_conf.c | 18 ++++++------------ src/openvz/openvz_driver.c | 7 +++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 4646308c48..cb64ed57f0 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -362,8 +362,7 @@ openvzReadFSConf(virDomainDefPtr def, if (VIR_ALLOC(fs) < 0) goto error; - if (virAsprintf(&veid_str, "%d", veid) < 0) - goto error; + virAsprintf(&veid_str, "%d", veid); fs->type = VIR_DOMAIN_FS_TYPE_MOUNT; if (!(fs->src->path = virStringReplace(temp, "$VEID", veid_str))) @@ -534,8 +533,7 @@ int openvzLoadDomains(struct openvz_driver *driver) def->id = -1; else def->id = veid; - if (virAsprintf(&def->name, "%i", veid) < 0) - goto cleanup; + virAsprintf(&def->name, "%i", veid); openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); ret = virUUIDParse(uuidstr, def->uuid); @@ -626,8 +624,7 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va char *line = NULL; size_t line_size = 0; - if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) - return -1; + virAsprintf(&temp_file, "%s.tmp", conf_file); fp = fopen(conf_file, "r"); if (fp == NULL) @@ -823,9 +820,8 @@ openvzCopyDefaultConfig(int vpsid) if (confdir == NULL) goto cleanup; - if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, - configfile_value) < 0) - goto cleanup; + virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, + configfile_value); if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) goto cleanup; @@ -855,9 +851,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) if (confdir == NULL) return -1; - if (virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, - ext ? ext : "conf") < 0) - ret = -1; + virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); VIR_FREE(confdir); return ret; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 017eec3081..463751ec86 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -702,7 +702,7 @@ openvzGenerateVethName(int veid, char *dev_name_ve) if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) != 1) return NULL; - ignore_value(virAsprintf(&ret, "veth%d.%d.", veid, ifNo)); + virAsprintf(&ret, "veth%d.%d.", veid, ifNo); return ret; } @@ -729,7 +729,7 @@ openvzGenerateContainerVethName(int veid) } /* set new name */ - ignore_value(virAsprintf(&name, "eth%d", max + 1)); + virAsprintf(&name, "eth%d", max + 1); } VIR_FREE(temp); @@ -2207,8 +2207,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, } } - if (virAsprintf(uri_out, "ssh://%s", hostname) < 0) - goto error; + virAsprintf(uri_out, "ssh://%s", hostname); ret = 0; goto done; -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_agent.c | 9 +- src/qemu/qemu_alias.c | 114 +++++++++++----------- src/qemu/qemu_block.c | 41 +++----- src/qemu/qemu_blockjob.c | 12 +-- src/qemu/qemu_capabilities.c | 14 +-- src/qemu/qemu_checkpoint.c | 11 +-- src/qemu/qemu_command.c | 104 ++++++++------------ src/qemu/qemu_conf.c | 141 ++++++++++----------------- src/qemu/qemu_conf.h | 4 +- src/qemu/qemu_domain.c | 158 ++++++++++++------------------- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_firmware.c | 3 +- src/qemu/qemu_hotplug.c | 80 ++++++---------- src/qemu/qemu_interface.c | 5 +- src/qemu/qemu_interop_config.c | 9 +- src/qemu/qemu_migration.c | 33 +++---- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_monitor.c | 33 +++---- src/qemu/qemu_monitor_json.c | 26 ++--- src/qemu/qemu_monitor_text.c | 15 +-- src/qemu/qemu_process.c | 74 +++++---------- src/qemu/qemu_slirp.c | 18 ++-- src/qemu/qemu_tpm.c | 19 ++-- src/qemu/qemu_vhost_user_gpu.c | 3 +- 25 files changed, 357 insertions(+), 584 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4b914e6d3b..d1b590d842 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -916,10 +916,8 @@ qemuAgentGuestSync(qemuAgentPtr mon) if (virTimeMillisNow(&id) < 0) return -1; - if (virAsprintf(&sync_msg.txBuffer, - "{\"execute\":\"guest-sync\", " - "\"arguments\":{\"id\":%llu}}\n", id) < 0) - return -1; + virAsprintf(&sync_msg.txBuffer, "{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}\n", id); sync_msg.txLength = strlen(sync_msg.txBuffer); sync_msg.sync = true; @@ -1120,8 +1118,7 @@ qemuAgentCommand(qemuAgentPtr mon, if (!(cmdstr = virJSONValueToString(cmd, false))) goto cleanup; - if (virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr) < 0) - goto cleanup; + virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr); msg.txLength = strlen(msg.txBuffer); VIR_DEBUG("Send command '%s' for write, seconds = %d", cmdstr, seconds); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index f11099ce90..60ab5735a4 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -114,7 +114,8 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (idx == -1 && (idx = qemuGetNextChrDevIndex(def, chr, prefix)) < 0) return -1; - return virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + return 0; } @@ -141,13 +142,15 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ - return virAsprintf(&controller->info.alias, "pcie.%d", controller->idx); + virAsprintf(&controller->info.alias, "pcie.%d", controller->idx); + return 0; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ - return virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + return 0; } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the * first (and currently only) IDE controller is an integrated @@ -176,7 +179,8 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ - return virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + return 0; } @@ -200,23 +204,20 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { - if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.unit) < 0) - return -1; + virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.unit); } else { - if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.target, - disk->info.addr.drive.unit) < 0) - return -1; + virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.target, + disk->info.addr.drive.unit); } } else { int idx = virDiskNameToIndex(disk->dst); - if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0) - return -1; + virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx); } } @@ -235,17 +236,15 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/virtio-backend", - disk->info.alias) < 0) - return -1; + virAsprintf(&diskPriv->qomName, + "/machine/peripheral/%s/virtio-backend", + disk->info.alias); break; case VIR_DOMAIN_DISK_BUS_USB: - if (virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/%s.0/legacy[0]", - disk->info.alias, disk->info.alias) < 0) - return -1; + virAsprintf(&diskPriv->qomName, + "/machine/peripheral/%s/%s.0/legacy[0]", + disk->info.alias, disk->info.alias); break; case VIR_DOMAIN_DISK_BUS_XEN: @@ -291,8 +290,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, } } - if (virAsprintf(alias, "hostdev%d", idx) < 0) - return -1; + virAsprintf(alias, "hostdev%d", idx); return 0; } @@ -327,8 +325,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, } } - if (virAsprintf(&net->info.alias, "net%d", idx) < 0) - return -1; + virAsprintf(&net->info.alias, "net%d", idx); return 0; } @@ -340,7 +337,8 @@ qemuAssignDeviceFSAlias(virDomainFSDefPtr fss, if (fss->info.alias) return 0; - return virAsprintf(&fss->info.alias, "fs%d", idx); + virAsprintf(&fss->info.alias, "fs%d", idx); + return 0; } @@ -351,7 +349,8 @@ qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound, if (sound->info.alias) return 0; - return virAsprintf(&sound->info.alias, "sound%d", idx); + virAsprintf(&sound->info.alias, "sound%d", idx); + return 0; } @@ -362,7 +361,8 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, if (video->info.alias) return 0; - return virAsprintf(&video->info.alias, "video%d", idx); + virAsprintf(&video->info.alias, "video%d", idx); + return 0; } @@ -373,7 +373,8 @@ qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, if (hub->info.alias) return 0; - return virAsprintf(&hub->info.alias, "hub%d", idx); + virAsprintf(&hub->info.alias, "hub%d", idx); + return 0; } @@ -384,7 +385,8 @@ qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr smartcard, if (smartcard->info.alias) return 0; - return virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + return 0; } @@ -395,7 +397,8 @@ qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefPtr memballoon, if (memballoon->info.alias) return 0; - return virAsprintf(&memballoon->info.alias, "balloon%d", idx); + virAsprintf(&memballoon->info.alias, "balloon%d", idx); + return 0; } @@ -406,7 +409,8 @@ qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm, if (tpm->info.alias) return 0; - return virAsprintf(&tpm->info.alias, "tpm%d", idx); + virAsprintf(&tpm->info.alias, "tpm%d", idx); + return 0; } @@ -430,8 +434,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, } } - if (virAsprintf(&redirdev->info.alias, "redir%d", idx) < 0) - return -1; + virAsprintf(&redirdev->info.alias, "redir%d", idx); return 0; } @@ -452,8 +455,7 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, maxidx = idx + 1; } - if (virAsprintf(&rng->info.alias, "rng%d", maxidx) < 0) - return -1; + virAsprintf(&rng->info.alias, "rng%d", maxidx); return 0; } @@ -498,8 +500,7 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, maxidx = mem->info.addr.dimm.slot; } - if (virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx) < 0) - return -1; + virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx); return 0; } @@ -528,8 +529,7 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, } } - if (virAsprintf(&shmem->info.alias, "shmem%d", idx) < 0) - return -1; + virAsprintf(&shmem->info.alias, "shmem%d", idx); return 0; } @@ -565,8 +565,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, } } - if (virAsprintf(&input->info.alias, "input%d", idx) < 0) - return -1; + virAsprintf(&input->info.alias, "input%d", idx); return 0; } @@ -706,9 +705,7 @@ qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) return NULL; } - ignore_value(virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, - disk->info.alias)); - + virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); return ret; } @@ -744,9 +741,9 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) return NULL; } - ignore_value(virAsprintf(&ret, "%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias)); + virAsprintf(&ret, "%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info->type), + hostdev->info->alias); return ret; } @@ -789,9 +786,9 @@ qemuDomainGetSecretAESAlias(const char *srcalias, } if (isLuks) - ignore_value(virAsprintf(&alias, "%s-luks-secret0", srcalias)); + virAsprintf(&alias, "%s-luks-secret0", srcalias); else - ignore_value(virAsprintf(&alias, "%s-secret0", srcalias)); + virAsprintf(&alias, "%s-secret0", srcalias); return alias; } @@ -807,7 +804,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { char *ret; - ignore_value(virAsprintf(&ret, "obj%s_tls0", srcAlias)); + virAsprintf(&ret, "obj%s_tls0", srcAlias); return ret; } @@ -823,7 +820,7 @@ qemuAliasChardevFromDevAlias(const char *devAlias) { char *ret; - ignore_value(virAsprintf(&ret, "char%s", devAlias)); + virAsprintf(&ret, "char%s", devAlias); return ret; } @@ -841,7 +838,7 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias) { char *ret; - ignore_value(virAsprintf(&ret, "pr-helper-%s", parentalias)); + virAsprintf(&ret, "pr-helper-%s", parentalias); return ret; } @@ -852,8 +849,7 @@ qemuAliasDBusVMStateFromId(const char *id) char *ret; size_t i; - if (virAsprintf(&ret, "dbus-vms-%s", id) < 0) - return NULL; + virAsprintf(&ret, "dbus-vms-%s", id); for (i = 0; ret[i]; i++) { if (ret[i] == ':') diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4416bda6d2..f40915fe23 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -423,22 +423,17 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) uri->scheme = g_strdup(virStorageNetProtocolTypeToString(src->protocol)); } else { - if (virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) - return NULL; + virAsprintf(&uri->scheme, "%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->transport)); } if (src->path) { if (src->volume) { - if (virAsprintf(&uri->path, "/%s/%s", - src->volume, src->path) < 0) - return NULL; + virAsprintf(&uri->path, "/%s/%s", src->volume, src->path); } else { - if (virAsprintf(&uri->path, "%s%s", - src->path[0] == '/' ? "" : "/", - src->path) < 0) - return NULL; + virAsprintf(&uri->path, "%s%s", src->path[0] == '/' ? "" : "/", + src->path); } } @@ -477,8 +472,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, else transport = "inet"; - if (virAsprintf(&port, "%u", host->port) < 0) - return NULL; + virAsprintf(&port, "%u", host->port); if (virJSONValueObjectCreate(&server, "s:type", transport, @@ -570,8 +564,7 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) return NULL; } - if (virAsprintf(&port, "%u", host->port) < 0) - return NULL; + virAsprintf(&port, "%u", host->port); ignore_value(virJSONValueObjectCreate(&ret, "s:host", host->name, @@ -767,13 +760,10 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src, /* combine host and port into portal */ if (virSocketAddrNumericFamily(src->hosts[0].name) == AF_INET6) { - if (virAsprintf(&portal, "[%s]:%u", - src->hosts[0].name, src->hosts[0].port) < 0) - return NULL; + virAsprintf(&portal, "[%s]:%u", src->hosts[0].name, + src->hosts[0].port); } else { - if (virAsprintf(&portal, "%s:%u", - src->hosts[0].name, src->hosts[0].port) < 0) - return NULL; + virAsprintf(&portal, "%s:%u", src->hosts[0].name, src->hosts[0].port); } if (!onlytarget && src->auth) { @@ -1965,8 +1955,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src) if (!(backingJSON = virJSONValueToString(backingProps, false))) return NULL; - if (virAsprintf(&ret, "json:%s", backingJSON) < 0) - return NULL; + virAsprintf(&ret, "json:%s", backingJSON); return ret; } @@ -2048,11 +2037,11 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStorageSourcePtr src, return -1; if (src->encryption) { - if (src->encryption->encinfo.cipher_name && + if (src->encryption->encinfo.cipher_name) { virAsprintf(&cipheralg, "%s-%u", src->encryption->encinfo.cipher_name, - src->encryption->encinfo.cipher_size) < 0) - return -1; + src->encryption->encinfo.cipher_size); + } if (virJSONValueObjectAdd(props, "S:cipher-alg", cipheralg, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 8c418ecf6c..e59cab3478 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,8 +227,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeformat) < 0) - return NULL; + virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -262,8 +261,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, jobtype = QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat) < 0) - return NULL; + virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -296,8 +294,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, if (storage) nodename = src->nodestorage; - if (virAsprintf(&jobname, "create-%s", nodename) < 0) - return NULL; + virAsprintf(&jobname, "create-%s", nodename); if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_CREATE, jobname))) return NULL; @@ -326,8 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeformat) < 0) - return NULL; + virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c78ad56edf..b2ea7ec373 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -734,8 +734,7 @@ virQEMUCapsFindBinary(const char *format, char *ret = NULL; char *binary = NULL; - if (virAsprintf(&binary, format, archstr) < 0) - return NULL; + virAsprintf(&binary, format, archstr); ret = virFindFileInPath(binary); VIR_FREE(binary); @@ -2412,8 +2411,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - if (virAsprintf(&type, "%s-machine", canon) < 0) - return -1; + virAsprintf(&type, "%s-machine", canon); if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) return -1; @@ -4849,8 +4847,7 @@ virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePrivPtr priv = NULL; struct utsname uts; - if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) - goto error; + virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir); if (!(cache = virFileCacheNew(capsCacheDir, "xml", &qemuCapsCacheHandlers))) goto error; @@ -4867,9 +4864,8 @@ virQEMUCapsCacheNew(const char *libDir, priv->runGid = runGid; priv->kvmUsable = VIR_TRISTATE_BOOL_ABSENT; - if (uname(&uts) == 0 && - virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0) - goto error; + if (uname(&uts) == 0) + virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version); cleanup: VIR_FREE(capsCacheDir); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4a618f5236..4c224d6f40 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -92,16 +92,14 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, if (newxml == NULL) return -1; - if (virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name) < 0) - return -1; + virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name); if (virFileMakePath(chkDir) < 0) { virReportSystemError(errno, _("cannot create checkpoint directory '%s'"), chkDir); return -1; } - if (virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name) < 0) - return -1; + virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name); return virXMLSaveFile(chkFile, NULL, "checkpoint-edit", newxml); } @@ -127,9 +125,8 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, return -1; } - if (virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, - vm->def->name, chk->def->name) < 0) - return -1; + virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, vm->def->name, + chk->def->name); if (!metadata_only) { qemuDomainObjPrivatePtr priv = vm->privateData; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0160507737..a55a5826a7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -262,7 +262,7 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) return NULL; } - ignore_value(virAsprintf(&result, "set=%d,fd=%d", idx, fd)); + virAsprintf(&result, "set=%d,fd=%d", idx, fd); return result; } @@ -289,7 +289,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) return NULL; } - ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx)); + virAsprintf(&result, "/dev/fdset/%d", idx); return result; } @@ -795,10 +795,8 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, _("found non printable characters in secret")); return -1; } - if (virAsprintf(&uri->user, "%s:%s", - secinfo->s.plain.username, - secinfo->s.plain.secret) < 0) - return -1; + virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, + secinfo->s.plain.secret); } else { uri->user = g_strdup(secinfo->s.plain.username); } @@ -947,9 +945,8 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, if (!(uri = qemuBlockStorageSourceGetURI(src))) return NULL; - if (src->hosts->socket && - virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) - return NULL; + if (src->hosts->socket) + virAsprintf(&uri->query, "socket=%s", src->hosts->socket); if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) return NULL; @@ -1038,13 +1035,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } if (src->nhosts == 0) { - if (virAsprintf(&ret, "sheepdog:%s", src->path) < 0) - return NULL; + virAsprintf(&ret, "sheepdog:%s", src->path); } else if (src->nhosts == 1) { - if (virAsprintf(&ret, "sheepdog:%s:%u:%s", - src->hosts->name, src->hosts->port, - src->path) < 0) - return NULL; + virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, + src->hosts->port, src->path); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one host")); @@ -2375,18 +2369,16 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, else driveLetter = 'A'; - if (bootindex && - virAsprintf(&bootindexStr, "bootindex%c=%u", driveLetter, bootindex) < 0) - return -1; + if (bootindex) + virAsprintf(&bootindexStr, "bootindex%c=%u", driveLetter, bootindex); /* with -blockdev we setup the floppy device and it's backend with -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0) return -1; - if (backendAlias && - virAsprintf(&backendStr, "drive%c=%s", driveLetter, backendAlias) < 0) - return -1; + if (backendAlias) + virAsprintf(&backendStr, "drive%c=%s", driveLetter, backendAlias); } if (!explicitfdc) { @@ -3588,8 +3580,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, unsigned long long memsize = virDomainNumaGetNodeMemorySize(def->numa, cell); - if (virAsprintf(&alias, "ram-node%zu", cell) < 0) - return -1; + virAsprintf(&alias, "ram-node%zu", cell); mem.size = memsize; mem.targetNode = cell; @@ -3622,8 +3613,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, return -1; } - if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) - return -1; + virAsprintf(&alias, "mem%s", mem->info.alias); if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) @@ -3707,14 +3697,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel = virDomainNetGetModelString(net); - ignore_value(virAsprintf(&str, - "nic,macaddr=%s,netdev=host%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=" : ""), - NULLSTR_EMPTY(net->info.alias))); + virAsprintf(&str, + "nic,macaddr=%s,netdev=host%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, + netmodel ? ",model=" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=" : ""), + NULLSTR_EMPTY(net->info.alias)); return str; } @@ -4708,8 +4698,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } - if (virAsprintf(&chardev, "socket,id=chr-vu-%s,fd=%d", alias, *fd) < 0) - return NULL; + virAsprintf(&chardev, "socket,id=chr-vu-%s,fd=%d", alias, *fd); virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd = -1; @@ -5554,10 +5543,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) return -1; - if (virAsprintf(&vhostfdName, "%d", vhostfd) < 0) { - VIR_FORCE_CLOSE(vhostfd); - return -1; - } + virAsprintf(&vhostfdName, "%d", vhostfd); virCommandPassFD(cmd, vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -5791,8 +5777,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, g_autofree char *objAlias = NULL; g_autofree char *charBackendAlias = NULL; - if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - return -1; + virAsprintf(&objAlias, "obj%s", rng->info.alias); switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -8581,8 +8566,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int slirpfd = qemuSlirpGetFD(slirp); virCommandPassFD(cmd, slirpfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - if (virAsprintf(&slirpfdName, "%d", slirpfd) < 0) - goto cleanup; + virAsprintf(&slirpfdName, "%d", slirpfd); } @@ -8590,16 +8574,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (qemuSecuritySetTapFDLabel(driver->securityManager, def, tapfd[i]) < 0) goto cleanup; - if (virAsprintf(&tapfdName[i], "%d", tapfd[i]) < 0) - goto cleanup; + virAsprintf(&tapfdName[i], "%d", tapfd[i]); virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); tapfd[i] = -1; } for (i = 0; i < vhostfdSize; i++) { - if (virAsprintf(&vhostfdName[i], "%d", vhostfd[i]) < 0) - goto cleanup; + virAsprintf(&vhostfdName[i], "%d", vhostfd[i]); virCommandPassFD(cmd, vhostfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); vhostfd[i] = -1; @@ -8975,11 +8957,9 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) g_autofree char *mem_path = NULL; virJSONValuePtr ret = NULL; - if (virAsprintf(&mem_path, "/dev/shm/%s", shmem->name) < 0) - return NULL; + virAsprintf(&mem_path, "/dev/shm/%s", shmem->name); - if (virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias) < 0) - return NULL; + virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias); qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9709,9 +9689,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=chrtpm"); - if (virAsprintf(chardev, "socket,id=chrtpm,path=%s", - tpm->data.emulator.source.data.nix.path) < 0) - return NULL; + virAsprintf(chardev, "socket,id=chrtpm,path=%s", + tpm->data.emulator.source.data.nix.path); break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9796,15 +9775,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virBufferAsprintf(&buf, ",policy=0x%x", sev->policy); if (sev->dh_cert) { - if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) - return -1; + virAsprintf(&path, "%s/dh_cert.base64", priv->libDir); virBufferAsprintf(&buf, ",dh-cert-file=%s", path); VIR_FREE(path); } if (sev->session) { - if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) - return -1; + virAsprintf(&path, "%s/session.base64", priv->libDir); virBufferAsprintf(&buf, ",session-file=%s", path); VIR_FREE(path); } @@ -10601,9 +10578,8 @@ static int qemuBuildParallelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { - if (virAsprintf(deviceStr, "isa-parallel,chardev=char%s,id=%s", - chr->info.alias, chr->info.alias) < 0) - return -1; + virAsprintf(deviceStr, "isa-parallel,chardev=char%s,id=%s", + chr->info.alias, chr->info.alias); return 0; } @@ -10624,10 +10600,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; port = virSocketAddrGetPort(chr->target.addr); - if (virAsprintf(deviceStr, - "user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s", - addr, port, chr->info.alias, chr->info.alias) < 0) - return -1; + virAsprintf(deviceStr, "user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s", + addr, port, chr->info.alias, chr->info.alias); break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fae697a2ef..41fd134afc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,49 +130,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->cgroupControllers = -1; /* -1 == auto-detect */ if (privileged) { - if (virAsprintf(&cfg->logDir, - "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->logDir, "%s/log/libvirt/qemu", LOCALSTATEDIR); - if (virAsprintf(&cfg->swtpmLogDir, - "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->swtpmLogDir, "%s/log/swtpm/libvirt/qemu", + LOCALSTATEDIR); cfg->configBaseDir = g_strdup(SYSCONFDIR "/libvirt"); - if (virAsprintf(&cfg->stateDir, - "%s/libvirt/qemu", RUNSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR); - if (virAsprintf(&cfg->swtpmStateDir, - "%s/libvirt/qemu/swtpm", RUNSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->swtpmStateDir, "%s/libvirt/qemu/swtpm", RUNSTATEDIR); - if (virAsprintf(&cfg->cacheDir, - "%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR); - if (virAsprintf(&cfg->libDir, - "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; - if (virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->channelTargetDir, - "%s/channel/target", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->libDir, "%s/lib/libvirt/qemu", LOCALSTATEDIR); + virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir); + virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir); + virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir); + virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir); + virAsprintf(&cfg->channelTargetDir, "%s/channel/target", cfg->libDir); + virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir); + virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir); + virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", + LOCALSTATEDIR); if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) cfg->swtpm_user = 0; /* fall back to root */ @@ -187,55 +167,39 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) if (!cachedir) return NULL; - if (virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir) < 0) - return NULL; - if (virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir) < 0) - return NULL; + virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir); + virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir); + virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir); rundir = virGetUserRuntimeDirectory(); if (!rundir) return NULL; - if (virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir) < 0) - return NULL; + virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir); - if (virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir) < 0) - return NULL; + virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir); if (!(cfg->configBaseDir = virGetUserConfigDirectory())) return NULL; - if (virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->channelTargetDir, - "%s/qemu/channel/target", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->nvramDir, - "%s/qemu/nvram", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", cfg->configBaseDir) < 0) - return NULL; + virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir); + virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir); + virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBaseDir); + virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", + cfg->configBaseDir); + virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir); + virAsprintf(&cfg->channelTargetDir, "%s/qemu/channel/target", + cfg->configBaseDir); + virAsprintf(&cfg->nvramDir, "%s/qemu/nvram", cfg->configBaseDir); + virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBaseDir); + virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", + cfg->configBaseDir); cfg->swtpm_user = (uid_t)-1; cfg->swtpm_group = (gid_t)-1; } - if (virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir) < 0) - return NULL; + virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir); + virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDir); + virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir); /* Set the default directory to find TLS X.509 certificates. * This will then be used as a fallback if the service specific @@ -1390,12 +1354,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; - if (virAsprintf(&key, "%d:%d:%s:%s", - data.arch, - data.virttype, - NULLSTR(data.machine), - NULLSTR(data.path)) < 0) - return NULL; + virAsprintf(&key, "%d:%d:%s:%s", data.arch, data.virttype, + NULLSTR(data.machine), NULLSTR(data.path)); if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; @@ -1426,8 +1386,7 @@ qemuGetSharedDeviceKey(const char *device_path) return NULL; } - if (virAsprintf(&key, "%d:%d", maj, min) < 0) - return NULL; + virAsprintf(&key, "%d:%d", maj, min); return key; } @@ -1703,7 +1662,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) scsihostsrc->unit))) return NULL; - ignore_value(virAsprintf(&dev_path, "/dev/%s", dev_name)); + virAsprintf(&dev_path, "/dev/%s", dev_name); return dev_path; } @@ -1880,8 +1839,7 @@ qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) { char *ret; - if (virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir) < 0) - return NULL; + virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir); return ret; } @@ -1896,7 +1854,7 @@ qemuGetDomainHugepagePath(const virDomainDef *def, char *ret = NULL; if (base && domPath) - ignore_value(virAsprintf(&ret, "%s/%s", base, domPath)); + virAsprintf(&ret, "%s/%s", base, domPath); return ret; } @@ -1944,11 +1902,11 @@ qemuGetDomainHupageMemPath(const virDomainDef *def, } -int +void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, char **path) { - return virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); + virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); } @@ -1960,11 +1918,12 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *def, g_autofree char *shortName = NULL; g_autofree char *base = NULL; - if (!(shortName = virDomainDefGetShortName(def)) || - qemuGetMemoryBackingBasePath(cfg, &base) < 0 || - virAsprintf(path, "%s/%s", base, shortName) < 0) + if (!(shortName = virDomainDefGetShortName(def))) return -1; + qemuGetMemoryBackingBasePath(cfg, &base); + virAsprintf(path, "%s/%s", base, shortName); + return 0; } @@ -1996,9 +1955,9 @@ qemuGetMemoryBackingPath(const virDomainDef *def, return -1; } - if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0 || - virAsprintf(memPath, "%s/%s", domainPath, alias) < 0) + if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0) return -1; + virAsprintf(memPath, "%s/%s", domainPath, alias); return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 7247199d3e..7334a440f8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -376,8 +376,8 @@ int qemuGetDomainHupageMemPath(const virDomainDef *def, unsigned long long pagesize, char **memPath); -int qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, - char **path); +void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, + char **path); int qemuGetMemoryBackingDomainPath(const virDomainDef *def, virQEMUDriverConfigPtr cfg, char **path); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3e8da13794..25d4a0eb07 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2017,28 +2017,21 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, /* This is the old way of setting up per-domain directories */ -static int +static void qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int ret = -1; - if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", - cfg->libDir, vm->def->name) < 0) - goto cleanup; + if (!priv->libDir) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, vm->def->name); - if (!priv->channelTargetDir && + if (!priv->channelTargetDir) virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name) < 0) - goto cleanup; + cfg->channelTargetDir, vm->def->name); - ret = 0; - cleanup: virObjectUnref(cfg); - return ret; } @@ -2054,14 +2047,12 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, if (!domname) goto cleanup; - if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname) < 0) - goto cleanup; + if (!priv->libDir) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname); - if (!priv->channelTargetDir && + if (!priv->channelTargetDir) virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, domname) < 0) - goto cleanup; + cfg->channelTargetDir, domname); ret = 0; cleanup: @@ -3675,8 +3666,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->channelTargetDir = tmp; tmp = NULL; - if (qemuDomainSetPrivatePathsOld(driver, vm) < 0) - goto error; + qemuDomainSetPrivatePathsOld(driver, vm); if (virCPUDefParseXML(ctxt, "./cpu", VIR_CPU_TYPE_GUEST, &priv->origCPU) < 0) goto error; @@ -4632,8 +4622,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, goto cleanup; } - if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) - goto cleanup; + qemuDomainNVRAMPathGenerate(cfg, def); if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) goto cleanup; @@ -9327,8 +9316,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, ctxt->writefd = -1; ctxt->readfd = -1; - if (virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name) < 0) - goto error; + virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name); if (cfg->stdioLogD) { ctxt->manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver)); @@ -9508,8 +9496,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, VIR_DEBUG("Append log message (vm='%s' message='%s) stdioLogD=%d", vm->def->name, message, cfg->stdioLogD); - if (virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name); if (cfg->stdioLogD) { if (!(manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver)))) @@ -9602,16 +9589,14 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (newxml == NULL) return -1; - if (virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name); if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; } - if (virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name) < 0) - goto cleanup; + virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name); ret = virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); @@ -9744,9 +9729,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, } } - if (virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, - vm->def->name, snap->def->name) < 0) - goto cleanup; + virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, + snap->def->name); if (snap == virDomainSnapshotGetCurrent(vm->snapshots)) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); @@ -9833,23 +9817,21 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); - } else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, - vm->def->name) < 0) { - VIR_WARN("unable to remove snapshot directory %s/%s", - cfg->snapshotDir, vm->def->name); - } else if (rmdir(snapDir) < 0 && errno != ENOENT) { - VIR_WARN("unable to remove snapshot directory %s", snapDir); + } else { + virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, vm->def->name); + + if (rmdir(snapDir) < 0 && errno != ENOENT) + VIR_WARN("unable to remove snapshot directory %s", snapDir); } /* Remove any checkpoint metadata prior to removing the domain */ if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); - } else if (virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, - vm->def->name) < 0) { - VIR_WARN("unable to remove checkpoint directory %s/%s", - cfg->checkpointDir, vm->def->name); - } else if (rmdir(chkDir) < 0 && errno != ENOENT) { - VIR_WARN("unable to remove checkpoint directory %s", chkDir); + } else { + virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, + vm->def->name); + if (rmdir(chkDir) < 0 && errno != ENOENT) + VIR_WARN("unable to remove checkpoint directory %s", chkDir); } qemuExtDevicesCleanupHost(driver, vm->def); @@ -10195,7 +10177,7 @@ qemuDomainStorageAlias(const char *device, int depth) if (!depth) alias = g_strdup(device); else - ignore_value(virAsprintf(&alias, "%s.%d", device, depth)); + virAsprintf(&alias, "%s.%d", device, depth); return alias; } @@ -11744,9 +11726,8 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) for (i = 0; i < G_N_ELEMENTS(nvlink2Files); i++) { g_autofree char *file = NULL; - if ((virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", - device, nvlink2Files[i])) < 0) - return false; + virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", + device, nvlink2Files[i]); if (!virFileExists(file)) return false; @@ -12425,19 +12406,15 @@ qemuDomainPrepareChannel(virDomainChrDefPtr channel, return 0; if (channel->target.name) { - if (virAsprintf(&channel->source->data.nix.path, - "%s/%s", domainChannelTargetDir, - channel->target.name) < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, "%s/%s", + domainChannelTargetDir, channel->target.name); } else { /* Generate a unique name */ - if (virAsprintf(&channel->source->data.nix.path, - "%s/vioser-%02d-%02d-%02d.sock", - domainChannelTargetDir, - channel->info.addr.vioserial.controller, - channel->info.addr.vioserial.bus, - channel->info.addr.vioserial.port) < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, + "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDir, + channel->info.addr.vioserial.controller, + channel->info.addr.vioserial.bus, + channel->info.addr.vioserial.port); } return 0; @@ -12620,16 +12597,16 @@ qemuDomainPrepareStorageSourceTLS(virStorageSourcePtr src, } -int +void qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) { if (!shmem->server.enabled || shmem->server.chr.data.nix.path) - return 0; + return; - return virAsprintf(&shmem->server.chr.data.nix.path, - "/var/lib/libvirt/shmem-%s-sock", - shmem->name); + virAsprintf(&shmem->server.chr.data.nix.path, + "/var/lib/libvirt/shmem-%s-sock", + shmem->name); } @@ -12955,9 +12932,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfigPtr cfg, if (STREQ(mountpoint, "/dev")) suffix = "dev"; - if (virAsprintf(&path, "%s/%s.%s", - cfg->stateDir, domname, suffix) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.%s", cfg->stateDir, domname, suffix); /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller @@ -12973,7 +12948,6 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfigPtr cfg, tmp++; } - cleanup: VIR_FREE(domname); return path; } @@ -13138,9 +13112,8 @@ qemuDomainCreateDeviceRecursive(const char *device, if (i == data->ndevMountsPath) { /* Okay, @device is in /dev but not in any mount point under /dev. * Create it. */ - if (virAsprintf(&devicePath, "%s/%s", - data->path, device + strlen(QEMU_DEVPREFIX)) < 0) - goto cleanup; + virAsprintf(&devicePath, "%s/%s", data->path, + device + strlen(QEMU_DEVPREFIX)); if (virFileMakeParentPath(devicePath) < 0) { virReportSystemError(errno, @@ -13194,10 +13167,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if ((c = strrchr(devTmp, '/'))) *(c + 1) = '\0'; - if (virAsprintf(&tmp, "%s%s", devTmp, target) < 0) { - VIR_FREE(devTmp); - goto cleanup; - } + virAsprintf(&tmp, "%s%s", devTmp, target); VIR_FREE(devTmp); VIR_FREE(target); target = g_steal_pointer(&tmp); @@ -13360,9 +13330,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - if (virAsprintf(&opts, - "mode=755,size=65536%s", mount_options) < 0) - goto cleanup; + virAsprintf(&opts, "mode=755,size=65536%s", mount_options); if (virFileSetupDev(data->path, opts) < 0) goto cleanup; @@ -14171,10 +14139,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, if ((c = strrchr(fileTmp, '/'))) *(c + 1) = '\0'; - if (virAsprintf(&tmp, "%s%s", fileTmp, target) < 0) { - VIR_FREE(fileTmp); - goto cleanup; - } + virAsprintf(&tmp, "%s%s", fileTmp, target); VIR_FREE(fileTmp); VIR_FREE(target); target = g_steal_pointer(&tmp); @@ -14730,7 +14695,7 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk, char *ret = NULL; if (idx) - ignore_value(virAsprintf(&ret, "%s[%d]", disk->dst, idx)); + virAsprintf(&ret, "%s[%d]", disk->dst, idx); else ret = g_strdup(disk->dst); @@ -15173,9 +15138,8 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDefPtr disk, { src->id = qemuDomainStorageIdNew(priv); - if (virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id) < 0 || - virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id) < 0) - return -1; + virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id); + virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id); if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; @@ -15208,9 +15172,8 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDefPtr disk, virStorageSourcePtr n; if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON && - !diskPriv->nodeCopyOnRead && - virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst) < 0) - return -1; + !diskPriv->nodeCopyOnRead) + virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst); for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) @@ -15363,8 +15326,7 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv) { char *ret = NULL; - ignore_value(virAsprintf(&ret, "%s/%s.sock", priv->libDir, - qemuDomainGetManagedPRAlias())); + virAsprintf(&ret, "%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAlias()); return ret; } @@ -15451,27 +15413,25 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk) } -int +void qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, char **path) { - return virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); + virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); } -int +void qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def) { if (def->os.loader && def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && def->os.loader->readonly == VIR_TRISTATE_BOOL_YES && - !def->os.loader->nvram) { - return qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); - } + !def->os.loader->nvram) + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); - return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b23912ee98..88d1acb64f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1054,7 +1054,7 @@ void qemuDomainPrepareChardevSource(virDomainDefPtr def, virQEMUDriverConfigPtr cfg) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) +void qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) ATTRIBUTE_NONNULL(1); bool qemuDomainVcpuHotplugIsInOrder(virDomainDefPtr def) @@ -1206,12 +1206,12 @@ qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv); bool qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk); -int +void qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, char **path); -int +void qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af8cbf40f4..0c94261ba8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -942,8 +942,7 @@ qemuStateInitialize(bool privileged, goto error; } - if (qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath) < 0) - goto error; + qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath); if (virFileMakePath(memoryBackingPath) < 0) { virReportSystemError(errno, @@ -7756,8 +7755,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - if (qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path) < 0) - goto endjob; + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); } else { if (vm->def->os.loader) nvram_path = g_strdup(vm->def->os.loader->nvram); diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 670662fd4b..c6462c723e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1058,8 +1058,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, VIR_FREE(def->os.loader->templt); def->os.loader->templt = g_strdup(flash->nvram_template.filename); - if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) - return -1; + qemuDomainNVRAMPathGenerate(cfg, def); VIR_DEBUG("decided on firmware '%s' varstore template '%s'", def->os.loader->path, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef0c..1bf0c63eb1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,8 +154,7 @@ qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, { g_autofree char *zpciAlias = NULL; - if (virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid) < 0) - return -1; + virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid); if (qemuMonitorDelDevice(mon, zpciAlias) < 0) return -1; @@ -1308,8 +1307,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } slirpfd = qemuSlirpGetFD(slirp); - if (virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias) < 0) - goto cleanup; + virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias); } break; @@ -1357,15 +1355,11 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_ALLOC_N(vhostfdName, vhostfdSize) < 0) goto cleanup; - for (i = 0; i < tapfdSize; i++) { - if (virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i) < 0) - goto cleanup; - } + for (i = 0; i < tapfdSize; i++) + virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i); - for (i = 0; i < vhostfdSize; i++) { - if (virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i) < 0) - goto cleanup; - } + for (i = 0; i < vhostfdSize; i++) + virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i); if (!(netstr = qemuBuildHostNetStr(net, tapfdName, tapfdSize, @@ -1508,19 +1502,18 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; virErrorPreserveLast(&originalError); - if (virAsprintf(&netdev_name, "host%s", net->info.alias) >= 0) { - if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) - qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver, net, true); - qemuDomainObjEnterMonitor(driver, vm); - if (charDevPlugged && - qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) - VIR_WARN("Failed to remove associated chardev %s", charDevAlias); - if (netdevPlugged && - qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) - VIR_WARN("Failed to remove network backend for netdev %s", - netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - } + virAsprintf(&netdev_name, "host%s", net->info.alias); + if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) + qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver, net, true); + qemuDomainObjEnterMonitor(driver, vm); + if (charDevPlugged && + qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) + VIR_WARN("Failed to remove associated chardev %s", charDevAlias); + if (netdevPlugged && + qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN("Failed to remove network backend for netdev %s", + netdev_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&originalError); goto cleanup; } @@ -2360,8 +2353,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuAssignDeviceMemoryAlias(vm->def, mem, priv->memAliasOrderMismatch) < 0) goto cleanup; - if (virAsprintf(&objalias, "mem%s", mem->info.alias) < 0) - goto cleanup; + virAsprintf(&objalias, "mem%s", mem->info.alias); if (!(devstr = qemuBuildMemoryDeviceStr(mem, priv))) goto cleanup; @@ -2707,8 +2699,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) goto cleanup; - if (virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd) < 0) - goto cleanup; + virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd); if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (qemuDomainIsS390CCW(vm->def) && @@ -2965,8 +2956,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceShmemAlias(vm->def, shmem, -1) < 0) return -1; - if (qemuDomainPrepareShmemChardev(shmem) < 0) - return -1; + qemuDomainPrepareShmemChardev(shmem); if (VIR_REALLOC_N(vm->def->shmems, vm->def->nshmems + 1) < 0) return -1; @@ -2980,8 +2970,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, goto cleanup; if (shmem->server.enabled) { - if (virAsprintf(&charAlias, "char%s", shmem->info.alias) < 0) - goto cleanup; + virAsprintf(&charAlias, "char%s", shmem->info.alias); } else { if (!(props = qemuBuildShmemBackendMemProps(shmem))) goto cleanup; @@ -3253,8 +3242,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; - if (virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd) < 0) - goto cleanup; + virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd); if (!(devstr = qemuBuildVsockDevStr(vm->def, vsock, priv->qemuCaps, fdprefix))) goto cleanup; @@ -3987,8 +3975,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, (auth->expires && auth->validTo <= now)) { expire = "now"; } else if (auth->expires) { - if (virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo) < 0) - goto end_job; + virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo); expire = validTo; } else { expire = "never"; @@ -4343,8 +4330,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); - if (virAsprintf(&backendAlias, "mem%s", mem->info.alias) < 0) - return -1; + virAsprintf(&backendAlias, "mem%s", mem->info.alias); qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDelObject(priv->mon, backendAlias); @@ -4562,8 +4548,8 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing network interface %s from domain %p %s", net->info.alias, vm, vm->def->name); - if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0 || - !(charDevAlias = qemuAliasChardevFromDevAlias(net->info.alias))) + virAsprintf(&hostnet_name, "host%s", net->info.alias); + if (!(charDevAlias = qemuAliasChardevFromDevAlias(net->info.alias))) return -1; if (virDomainNetGetActualBandwidth(net) && @@ -4717,8 +4703,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rng->info.alias, vm, vm->def->name); - if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - return -1; + virAsprintf(&objAlias, "obj%s", rng->info.alias); if (!(charAlias = qemuAliasChardevFromDevAlias(rng->info.alias))) return -1; @@ -4777,11 +4762,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, shmem->info.alias, vm, vm->def->name); if (shmem->server.enabled) { - if (virAsprintf(&charAlias, "char%s", shmem->info.alias) < 0) - return -1; + virAsprintf(&charAlias, "char%s", shmem->info.alias); } else { - if (virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias) < 0) - return -1; + virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias); } qemuDomainObjEnterMonitor(driver, vm); @@ -6022,8 +6005,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver, size_t i; if (newhotplug) { - if (virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu) < 0) - goto cleanup; + virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu); if (!(vcpuprops = qemuBuildHotpluggableCPUProps(vcpuinfo))) goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 70832e0c9a..8377b4d01d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -364,9 +364,8 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, goto cleanup; virCommandAbort(cmd); - if (errbuf && *errbuf && - virAsprintf(&errstr, "\nstderr=%s", errbuf) < 0) - goto cleanup; + if (errbuf && *errbuf) + virAsprintf(&errstr, "\nstderr=%s", errbuf); virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: failed to communicate with bridge helper: %s%s"), diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index d05ff56221..00b86fde83 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -57,8 +57,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) filename = g_strdup(ent->d_name); - if (virAsprintf(&path, "%s/%s", dir, filename) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", dir, filename); if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Unable to access %s"), path); @@ -122,12 +121,10 @@ qemuInteropFetchConfigs(const char *name, if (!home) return -1; - if (virAsprintf(&xdgConfig, "%s/.config", home) < 0) - return -1; + virAsprintf(&xdgConfig, "%s/.config", home); } - if (virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name) < 0) - return -1; + virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name); } if (!(files = virHashCreate(10, virHashValueFree))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3f90536339..aad2f77cb7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -818,9 +818,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, copysrc->tlsAlias = g_strdup(tlsAlias); - if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst) < 0 || - virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst) < 0) - return -1; + virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst); + virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst); /* Migration via blockdev-mirror was supported sooner than the auto-read-only * feature was added to qemu */ @@ -865,13 +864,11 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, int mon_ret; if (strchr(host, ':')) { - if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", - host, port, diskAlias) < 0) - return -1; + virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", host, port, + diskAlias); } else { - if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", - host, port, diskAlias) < 0) - return -1; + virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", host, port, + diskAlias); } if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -1834,7 +1831,7 @@ qemuMigrationDstGetURI(const char *migrateFrom, char *uri = NULL; if (STREQ(migrateFrom, "stdio")) - ignore_value(virAsprintf(&uri, "fd:%d", migrateFd)); + virAsprintf(&uri, "fd:%d", migrateFd); else uri = g_strdup(migrateFrom); @@ -2258,9 +2255,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, incFormat = "%s:[%s]:%d"; else incFormat = "%s:%s:%d"; - if (virAsprintf(&migrateFrom, incFormat, - protocol, listenAddress, port) < 0) - goto cleanup; + virAsprintf(&migrateFrom, incFormat, protocol, listenAddress, port); } inc = qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, @@ -2700,8 +2695,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellFormed) /* For compatibility reasons tcp://... URIs are sent as tcp:... * We need to transform them to a well-formed URI before parsing. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri + 4, "//")) { - if (virAsprintf(&tmp, "tcp://%s", uri + 4) < 0) - return NULL; + virAsprintf(&tmp, "tcp://%s", uri + 4); uri = tmp; } @@ -2796,8 +2790,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, else incFormat = "%s:%s:%d"; - if (virAsprintf(uri_out, incFormat, "tcp", hostname, port) < 0) - goto cleanup; + virAsprintf(uri_out, incFormat, "tcp", hostname, port); } else { bool well_formed_uri; @@ -2835,8 +2828,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (!(*uri_out = virURIFormat(uri))) goto cleanup; } else { - if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) - goto cleanup; + virAsprintf(uri_out, "%s:%d", uri_in, port); } } else { port = uri->port; @@ -3302,8 +3294,7 @@ qemuMigrationSrcConnect(virQEMUDriverPtr driver, int ret = -1; host = spec->dest.host.name; - if (virAsprintf(&port, "%d", spec->dest.host.port) < 0) - return -1; + virAsprintf(&port, "%d", spec->dest.host.port); spec->destType = MIGRATION_DEST_FD; spec->dest.fd.qemu = -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index f625c7086b..990f2b06d0 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -141,8 +141,7 @@ qemuDomainExtractTLSSubject(const char *certdir) int ret; size_t subjectlen; - if (virAsprintf(&certfile, "%s/server-cert.pem", certdir) < 0) - goto error; + virAsprintf(&certfile, "%s/server-cert.pem", certdir); if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db27b0e796..6495447188 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -961,7 +961,7 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) { char *id; - ignore_value(virAsprintf(&id, "libvirt-%d", ++mon->nextSerial)); + virAsprintf(&id, "libvirt-%d", ++mon->nextSerial); return id; } @@ -2560,11 +2560,8 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (strchr(hostname, ':')) { - if (virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port) < 0) - return -1; - } else if (virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port) < 0) { - return -1; - } + virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port); + } else virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port); ret = qemuMonitorJSONMigrate(mon, flags, uri); @@ -4249,20 +4246,20 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfoPtr info) switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - ignore_value(virAsprintf(&ret, - "hyper-v: arg1='0x%llx', arg2='0x%llx', " - "arg3='0x%llx', arg4='0x%llx', arg5='0x%llx'", - info->data.hyperv.arg1, info->data.hyperv.arg2, - info->data.hyperv.arg3, info->data.hyperv.arg4, - info->data.hyperv.arg5)); + virAsprintf(&ret, + "hyper-v: arg1='0x%llx', arg2='0x%llx', " + "arg3='0x%llx', arg4='0x%llx', arg5='0x%llx'", + info->data.hyperv.arg1, info->data.hyperv.arg2, + info->data.hyperv.arg3, info->data.hyperv.arg4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - ignore_value(virAsprintf(&ret, "s390: core='%d' psw-mask='0x%016llx' " - "psw-addr='0x%016llx' reason='%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason)); + virAsprintf(&ret, "s390: core='%d' psw-mask='0x%016llx' " + "psw-addr='0x%016llx' reason='%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 99f55c420a..697b302a7c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7120,8 +7120,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, switch ((virStorageNetHostTransport)server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - if (virAsprintf(&port_str, "%u", server->port) < 0) - return ret; + virAsprintf(&port_str, "%u", server->port); addr = qemuMonitorJSONBuildInetSocketAddress(server->name, port_str); break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: @@ -8052,9 +8051,7 @@ qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, char *path = NULL; qemuMonitorJSONObjectProperty prop; - if (virAsprintf(&path, "/objects/iothread%u", - iothreadInfo->iothread_id) < 0) - goto cleanup; + virAsprintf(&path, "/objects/iothread%u", iothreadInfo->iothread_id); #define VIR_IOTHREAD_SET_PROP(propName, propVal) \ if (iothreadInfo->set_##propVal) { \ @@ -8212,13 +8209,11 @@ qemuMonitorJSONFindObjectPathByAlias(qemuMonitorPtr mon, if (npaths < 0) return -1; - if (virAsprintf(&child, "child<%s>", name) < 0) - goto cleanup; + virAsprintf(&child, "child<%s>", name); for (i = 0; i < npaths; i++) { if (STREQ(paths[i]->name, alias) && STREQ(paths[i]->type, child)) { - if (virAsprintf(path, "/machine/peripheral/%s", alias) < 0) - goto cleanup; + virAsprintf(path, "/machine/peripheral/%s", alias); ret = 0; goto cleanup; @@ -8270,10 +8265,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mon, if (STREQ_NULLABLE(paths[i]->type, name)) { VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->name); ret = 0; - if (virAsprintf(path, "%s/%s", curpath, paths[i]->name) < 0) { - *path = NULL; - ret = -1; - } + virAsprintf(path, "%s/%s", curpath, paths[i]->name); goto cleanup; } @@ -8281,10 +8273,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mon, * traversed looking for more entries */ if (paths[i]->type && STRPREFIX(paths[i]->type, "child<")) { - if (virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name) < 0) { - ret = -1; - goto cleanup; - } + virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name); ret = qemuMonitorJSONFindObjectPathByName(mon, nextpath, name, path); VIR_FREE(nextpath); @@ -8327,8 +8316,7 @@ qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon, return ret; } - if (virAsprintf(&linkname, "link<%s>", name) < 0) - return -1; + virAsprintf(&linkname, "link<%s>", name); ret = qemuMonitorJSONFindObjectPathByName(mon, "/", linkname, path); VIR_FREE(linkname); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index b1abcacdd0..a5b2d2ccfd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -42,8 +42,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, /* 'dummy' here is just a placeholder since there is no PCI * address required when attaching drives to a controller */ - if (virAsprintf(&cmd, "drive_add dummy %s", drivestr) < 0) - goto cleanup; + virAsprintf(&cmd, "drive_add dummy %s", drivestr); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -92,8 +91,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - if (virAsprintf(&cmd, "drive_del %s", drivestr) < 0) - goto cleanup; + virAsprintf(&cmd, "drive_del %s", drivestr); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -131,8 +129,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - if (virAsprintf(&cmd, "savevm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "savevm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -166,8 +163,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) int ret = -1; char *safename; - if (virAsprintf(&cmd, "loadvm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "loadvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -210,8 +206,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) char *reply = NULL; int ret = -1; - if (virAsprintf(&cmd, "delvm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "delvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e0dc26658..925fc44a70 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -98,10 +98,8 @@ VIR_LOG_INIT("qemu.qemu_process"); * qemuProcessRemoveDomainStatus * * remove all state files of a domain from statedir - * - * Returns 0 on success */ -static int +static void qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, virDomainObjPtr vm) { @@ -109,10 +107,8 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, char *file = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int ret = -1; - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -125,10 +121,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - ret = 0; - cleanup: virObjectUnref(cfg); - return ret; } @@ -2105,8 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) - return -1; + virAsprintf(&id, "char%s", chr->info.alias); entry = virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -2175,7 +2167,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, } -static int +static void qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, virDomainObjPtr vm, virHashTablePtr info, @@ -2186,7 +2178,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, qemuMonitorChardevInfoPtr entry; virObjectEventPtr event = NULL; char *id = NULL; - int ret = -1; if (booted) agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DOMAIN_STARTED; @@ -2196,8 +2187,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, if (chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) - goto cleanup; + virAsprintf(&id, "char%s", chr->info.alias); /* port state not reported */ if (!(entry = virHashLookup(info, id)) || @@ -2214,10 +2204,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, } } - ret = 0; - cleanup: VIR_FREE(id); - return ret; } @@ -2240,7 +2227,8 @@ qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, if (ret < 0) goto cleanup; - ret = qemuProcessRefreshChannelVirtioState(driver, vm, info, false); + qemuProcessRefreshChannelVirtioState(driver, vm, info, false); + ret = 0; cleanup: virHashFree(info); @@ -2405,9 +2393,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) goto cleanup; - if ((ret = qemuProcessRefreshChannelVirtioState(driver, vm, info, - true)) < 0) - goto cleanup; + qemuProcessRefreshChannelVirtioState(driver, vm, info, true); } cleanup: @@ -3208,9 +3194,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig, monConfig->type = VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen = true; - if (virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", - domainDir) < 0) - return -1; + virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", domainDir); return 0; } @@ -3416,8 +3400,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) } else { newState = VIR_DOMAIN_PAUSED; newReason = reason; - ignore_value(virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason))); + virAsprintf(&msg, "was paused (%s)", + virDomainPausedReasonTypeToString(reason)); } } @@ -4082,9 +4066,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON) continue; - if (virAsprintf(&cpuFeature, "hv-%s", - virDomainHypervTypeToString(i)) < 0) - return -1; + virAsprintf(&cpuFeature, "hv-%s", virDomainHypervTypeToString(i)); rc = virCPUDataCheckFeature(cpu, cpuFeature); VIR_FREE(cpuFeature); @@ -4916,9 +4898,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) - goto cleanup; + virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, + type); glisten->fromConfig = true; glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET; } else if (listenAddr) { @@ -4939,9 +4920,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) - goto cleanup; + virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, + type); glisten->autoGenerated = true; } break; @@ -6018,8 +5998,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr driver, if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_YES && vcpu->online && vcpupriv->vcpus != 0) { - if (virAsprintf(&vcpupriv->alias, "vcpu%zu", i) < 0) - goto cleanup; + virAsprintf(&vcpupriv->alias, "vcpu%zu", i); if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) goto cleanup; @@ -6370,10 +6349,8 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < 0) goto cleanup; - for (i = 0; i < vm->def->nshmems; i++) { - if (qemuDomainPrepareShmemChardev(vm->def->shmems[i]) < 0) - goto cleanup; - } + for (i = 0; i < vm->def->nshmems; i++) + qemuDomainPrepareShmemChardev(vm->def->shmems[i]); ret = 0; cleanup: @@ -8503,8 +8480,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) VIR_DEBUG("proc=%p, emulator=%s", proc, proc->binary); - if (virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir) < 0) - goto cleanup; + virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir); if (!(proc->uniqDir = mkdtemp(template))) { virReportSystemError(errno, @@ -8517,20 +8493,16 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; - if (virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, - "qmp.monitor") < 0) - goto cleanup; + virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor"); - if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath) < 0) - goto cleanup; + virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath); /* * Normally we'd use runDir for pid files, but because we're using * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - if (virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid") < 0) - goto cleanup; + virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid"); ret = 0; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 0b45315a0b..c08a365548 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -153,10 +153,11 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, g_autofree char *shortName = NULL; g_autofree char *name = NULL; - if (!(shortName = virDomainDefGetShortName(def)) || - virAsprintf(&name, "%s-%s-slirp", shortName, alias) < 0) + if (!(shortName = virDomainDefGetShortName(def))) return NULL; + virAsprintf(&name, "%s-%s-slirp", shortName, alias); + return virPidFileBuildPath(cfg->slirpStateDir, name); } @@ -209,8 +210,7 @@ qemuSlirpGetDBusVMStateId(virDomainNetDefPtr net) char *id = NULL; /* can't use alias, because it's not stable across restarts */ - if (virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)) < 0) - return NULL; + virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)); return id; } @@ -224,11 +224,12 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, g_autofree char *shortName = NULL; char *path = NULL; - if (!(shortName = virDomainDefGetShortName(def)) || - virAsprintf(&path, "%s/%s-%s-slirp", - cfg->slirpStateDir, shortName, alias) < 0) + if (!(shortName = virDomainDefGetShortName(def))) return NULL; + virAsprintf(&path, "%s/%s-%s-slirp", + cfg->slirpStateDir, shortName, alias); + return path; } @@ -379,8 +380,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, return -1; } - if (virAsprintf(&dbus_addr, "unix:path=%s", dbus_path) < 0) - return -1; + virAsprintf(&dbus_addr, "unix:path=%s", dbus_path); virCommandAddArgFormat(cmd, "--dbus-id=%s", id); diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f21dbf9727..d6d418533c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -78,9 +78,7 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorageDir, return NULL; } - ignore_value(virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, - dir)); - + virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, dir); return path; } @@ -208,8 +206,7 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, { char *path = NULL; - ignore_value(virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, - shortName)); + virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, shortName); return path; } @@ -252,8 +249,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, char *pidfile = NULL; char *devicename = NULL; - if (virAsprintf(&devicename, "%s-swtpm", shortName) < 0) - return NULL; + virAsprintf(&devicename, "%s-swtpm", shortName); pidfile = virPidFileBuildPath(swtpmStateDir, devicename); @@ -335,10 +331,8 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, goto cleanup; /* create logfile name ... */ - if (!tpm->data.emulator.logfile && - virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", - logDir, vmname) < 0) - goto cleanup; + if (!tpm->data.emulator.logfile) + virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir, vmname); if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { @@ -492,8 +486,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, goto cleanup; virUUIDFormat(vmuuid, uuid); - if (virAsprintf(&vmid, "%s:%s", vmname, uuid) < 0) - goto cleanup; + virAsprintf(&vmid, "%s:%s", vmname, uuid); virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 49f48c6d08..7355ae70f8 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -47,8 +47,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, { g_autofree char *devicename = NULL; - if (virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias) < 0) - return NULL; + virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias); return virPidFileBuildPath(stateDir, devicename); } -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/rpc/virnetclient.c | 23 +++++++-------------- src/rpc/virnetlibsshsession.c | 17 ++++----------- src/rpc/virnetsocket.c | 3 +-- src/rpc/virnetsshsession.c | 18 +++++----------- src/rpc/virnettlscontext.c | 39 ++++++++++++----------------------- 5 files changed, 30 insertions(+), 70 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 678e6f7815..a423f4db2f 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -343,8 +343,7 @@ virNetClientCheckKeyExists(const char *homedir, { char *path; - if (virAsprintf(&path, "%s/.ssh/%s", homedir, name) < 0) - return -1; + virAsprintf(&path, "%s/.ssh/%s", homedir, name); if (!(virFileExists(path))) { VIR_FREE(path); @@ -565,10 +564,8 @@ virNetClientPtr virNetClientNewLibssh(const char *host, knownhosts = g_strdup(knownHostsPath); } else { confdir = virGetUserConfigDirectory(); - if (confdir) { - if (virAsprintf(&knownhosts, "%s/known_hosts", confdir) < 0) - goto cleanup; - } + if (confdir) + virAsprintf(&knownhosts, "%s/known_hosts", confdir); } if (privkeyPath) { @@ -602,16 +599,10 @@ virNetClientPtr virNetClientNewLibssh(const char *host, if (!(nc = virBufferContentAndReset(&buf))) goto no_memory; - if (virAsprintf(&command, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath) < 0) - goto cleanup; + virAsprintf(&command, "sh -c " + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " + "ARG=-q0;" "else " "ARG=;" "fi;" "'%s' $ARG -U %s'", nc, nc, + socketPath); if (virNetSocketNewConnectLibssh(host, port, family, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 0b98236f38..4a9f976914 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -341,15 +341,9 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (!keyhashstr) return -1; - if (virAsprintf(&tmp, - _("Accept SSH host key with hash '%s' for " - "host '%s:%d' (%s/%s)?"), - keyhashstr, - sess->hostname, sess->port, - "y", "n") < 0) { - ssh_string_free_char(keyhashstr); - return -1; - } + virAsprintf(&tmp, + _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, "y", "n"); askKey.prompt = tmp; if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -530,10 +524,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSessionPtr sess, VIR_DEBUG("sess=%p", sess); - if (virAsprintf(&tmp, "%s.pub", priv->filename) < 0) { - err = SSH_AUTH_ERROR; - goto error; - } + virAsprintf(&tmp, "%s.pub", priv->filename); /* try to open the public part of the private key */ ret = ssh_pki_import_pubkey_file(tmp, &public_key); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 6574ee0d16..2b66bc609b 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -698,8 +698,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } - if (virAsprintf(&lockpath, "%s/%s.lock", rundir, binname) < 0) - goto cleanup; + virAsprintf(&lockpath, "%s/%s.lock", rundir, binname); if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 931c7091cc..384bedfc34 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -365,15 +365,9 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr = virBufferContentAndReset(&buff); askKey.type = VIR_CRED_ECHOPROMPT; - if (virAsprintf((char **)&askKey.prompt, - _("Accept SSH host key with hash '%s' for " - "host '%s:%d' (%s/%s)?"), - keyhashstr, - sess->hostname, sess->port, - "y", "n") < 0) { - VIR_FREE(keyhashstr); - return -1; - } + virAsprintf((char **)&askKey.prompt, + _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, "y", "n"); if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", @@ -634,10 +628,8 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } - if (virAsprintf((char **)&retr_passphrase.prompt, - _("Passphrase for key '%s'"), - priv->filename) < 0) - return -1; + virAsprintf((char **)&retr_passphrase.prompt, + _("Passphrase for key '%s'"), priv->filename); if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2420ad8681..af6d29b376 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -796,19 +796,13 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, */ if (pkipath) { VIR_DEBUG("Told to use TLS credentials in %s", pkipath); - if ((virAsprintf(cacert, "%s/%s", pkipath, - "cacert.pem")) < 0) - goto error; - if ((virAsprintf(cacrl, "%s/%s", pkipath, - "cacrl.pem")) < 0) - goto error; - if ((virAsprintf(key, "%s/%s", pkipath, - isServer ? "serverkey.pem" : "clientkey.pem")) < 0) - goto error; + virAsprintf(cacert, "%s/%s", pkipath, "cacert.pem"); + virAsprintf(cacrl, "%s/%s", pkipath, "cacrl.pem"); + virAsprintf(key, "%s/%s", pkipath, + isServer ? "serverkey.pem" : "clientkey.pem"); - if ((virAsprintf(cert, "%s/%s", pkipath, - isServer ? "servercert.pem" : "clientcert.pem")) < 0) - goto error; + virAsprintf(cert, "%s/%s", pkipath, + isServer ? "servercert.pem" : "clientcert.pem"); } else if (tryUserPkiPath) { /* Check to see if $HOME/.pki contains at least one of the * files and if so, use that @@ -818,26 +812,19 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, if (!userdir) goto error; - if (virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir) < 0) - goto error; + virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir); VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_path); - if ((virAsprintf(cacert, "%s/%s", user_pki_path, - "cacert.pem")) < 0) - goto error; + virAsprintf(cacert, "%s/%s", user_pki_path, "cacert.pem"); - if ((virAsprintf(cacrl, "%s/%s", user_pki_path, - "cacrl.pem")) < 0) - goto error; + virAsprintf(cacrl, "%s/%s", user_pki_path, "cacrl.pem"); - if ((virAsprintf(key, "%s/%s", user_pki_path, - isServer ? "serverkey.pem" : "clientkey.pem")) < 0) - goto error; + virAsprintf(key, "%s/%s", user_pki_path, + isServer ? "serverkey.pem" : "clientkey.pem"); - if ((virAsprintf(cert, "%s/%s", user_pki_path, - isServer ? "servercert.pem" : "clientcert.pem")) < 0) - goto error; + virAsprintf(cert, "%s/%s", user_pki_path, + isServer ? "servercert.pem" : "clientcert.pem"); /* * If some of the files can't be found, fallback -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/storage/storage_backend_disk.c | 7 +- src/storage/storage_backend_gluster.c | 16 +--- src/storage/storage_backend_iscsi.c | 17 ++--- src/storage/storage_backend_iscsi_direct.c | 31 ++++---- src/storage/storage_backend_logical.c | 16 ++-- src/storage/storage_backend_mpath.c | 9 +-- src/storage/storage_backend_rbd.c | 16 +--- src/storage/storage_backend_scsi.c | 11 +-- src/storage/storage_backend_sheepdog.c | 7 +- src/storage/storage_backend_vstorage.c | 6 +- src/storage/storage_backend_zfs.c | 13 +--- src/storage/storage_driver.c | 17 ++--- src/storage/storage_file_gluster.c | 10 +-- src/storage/storage_util.c | 87 +++++++--------------- 14 files changed, 90 insertions(+), 173 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index f37bcd2b15..d4bd526c14 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -605,17 +605,14 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, /* XXX Only support one extended partition */ switch (virStorageBackendDiskPartTypeToCreate(pool)) { case VIR_STORAGE_VOL_DISK_TYPE_PRIMARY: - if (virAsprintf(partFormat, "primary %s", partedFormat) < 0) - return -1; + virAsprintf(partFormat, "primary %s", partedFormat); break; case VIR_STORAGE_VOL_DISK_TYPE_LOGICAL: /* make sure we have an extended partition */ if (virStoragePoolObjSearchVolume(pool, virStorageVolPartFindExtended, NULL)) { - if (virAsprintf(partFormat, "logical %s", - partedFormat) < 0) - return -1; + virAsprintf(partFormat, "logical %s", partedFormat); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no extended partition found and no " diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 69de95a9ed..0022ed2f21 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -101,9 +101,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) return NULL; ret->volname = g_strdup(name); - if (virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", - trailing_slash ? "" : "/") < 0) - goto error; + virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", trailing_slash ? "" : "/"); /* FIXME: Currently hard-coded to tcp transport; XML needs to be * extended to allow alternate transport */ @@ -111,8 +109,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) goto error; ret->uri->scheme = g_strdup("gluster"); ret->uri->server = g_strdup(def->source.hosts[0].name); - if (virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir) < 0) - goto error; + virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir); ret->uri->port = def->source.hosts[0].port; /* Actually connect to glfs */ @@ -196,15 +193,10 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, vol->name = g_strdup(name); } - if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, - vol->name) < 0) - return -1; + virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name); tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", path) < 0) { - state->uri->path = tmp; - return -1; - } + virAsprintf(&state->uri->path, "/%s", path); if (!(vol->target.path = virURIFormat(state->uri))) { VIR_FREE(state->uri->path); state->uri->path = tmp; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index b11d1d6622..b61abb7cbd 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -63,13 +63,13 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) source->hosts[0].port = ISCSI_DEFAULT_TARGET_PORT; if (strchr(source->hosts[0].name, ':')) { - ignore_value(virAsprintf(&portal, "[%s]:%d,1", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "[%s]:%d,1", + source->hosts[0].name, + source->hosts[0].port); } else { - ignore_value(virAsprintf(&portal, "%s:%d,1", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "%s:%d,1", + source->hosts[0].name, + source->hosts[0].port); } return portal; @@ -133,9 +133,8 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, uint32_t host; g_autofree char *sysfs_path = NULL; - if (virAsprintf(&sysfs_path, - "/sys/class/iscsi_session/session%s/device", session) < 0) - return -1; + virAsprintf(&sysfs_path, "/sys/class/iscsi_session/session%s/device", + session); if (virStorageBackendISCSIGetHostNumber(sysfs_path, &host) < 0) return -1; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index e8bf42d0d0..f0b27451f0 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -68,17 +68,17 @@ virStorageBackendISCSIDirectPortal(virStoragePoolSourcePtr source) return NULL; } if (source->hosts[0].port == 0) { - ignore_value(virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - ISCSI_DEFAULT_TARGET_PORT)); + virAsprintf(&portal, "%s:%d", + source->hosts[0].name, + ISCSI_DEFAULT_TARGET_PORT); } else if (strchr(source->hosts[0].name, ':')) { - ignore_value(virAsprintf(&portal, "[%s]:%d", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "[%s]:%d", + source->hosts[0].name, + source->hosts[0].port); } else { - ignore_value(virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "%s:%d", + source->hosts[0].name, + source->hosts[0].port); } return portal; } @@ -230,14 +230,11 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - if (virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun) < 0) - return -1; - if (virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun) < 0) - return -1; - if (virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun) < 0) - return -1; + virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun); + virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); + virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); return 0; } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 208ca0792f..4a5d61e57d 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -290,11 +290,8 @@ virStorageBackendLogicalMakeVol(char **const groups, } - if (vol->target.path == NULL) { - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - goto cleanup; - } + if (vol->target.path == NULL) + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); /* Mark the (s) sparse/snapshot lv, e.g. the lv created using * the --virtualsize/-V option. We've already ignored the (t)hin @@ -316,9 +313,8 @@ virStorageBackendLogicalMakeVol(char **const groups, if (!(vol->target.backingStore = virStorageSourceNew())) goto cleanup; - if (virAsprintf(&vol->target.backingStore->path, "%s/%s", - def->target.path, groups[1]) < 0) - goto cleanup; + virAsprintf(&vol->target.backingStore->path, "%s/%s", + def->target.path, groups[1]); vol->target.backingStore->format = VIR_STORAGE_POOL_LOGICAL_LVM2; vol->target.backingStore->type = VIR_STORAGE_TYPE_BLOCK; @@ -916,9 +912,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); if (virStorageBackendLogicalLVCreate(vol, def) < 0) return -1; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index fd3ee76371..6912977657 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -53,11 +53,9 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; - if (virAsprintf(&(vol->name), "dm-%u", devnum) < 0) - return -1; + virAsprintf(&(vol->name), "dm-%u", devnum); - if (virAsprintf(&vol->target.path, "/dev/%s", dev) < 0) - return -1; + virAsprintf(&vol->target.path, "/dev/%s", dev); if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT, 0) < 0) { @@ -165,8 +163,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, if (is_mpath == 1) { - if (virAsprintf(&map_device, "mapper/%s", names->name) < 0) - return -1; + virAsprintf(&map_device, "mapper/%s", names->name); if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 1c59c18b0d..491b85e0e0 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -570,14 +570,10 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, vol->target.allocation, info.obj_size, info.num_objs); VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->source.name, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); ret = 0; @@ -895,14 +891,10 @@ virStorageBackendRBDCreateVol(virStoragePoolObjPtr pool, } VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); return 0; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 98d9d92ac5..80965bc349 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -60,9 +60,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) VIR_DEBUG("Triggering rescan of host %d", host); - if (virAsprintf(&path, "%s/host%u/scan", - LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) - return -1; + virAsprintf(&path, "%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFIX, host); VIR_DEBUG("Scan trigger path is '%s'", path); @@ -261,8 +259,7 @@ checkParent(const char *name, goto cleanup; } - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; + virAsprintf(&scsi_host_name, "scsi_%s", name); if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; @@ -376,9 +373,7 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr pool, if (virSCSIHostGetNumber(name, &host) < 0) return -1; - if (virAsprintf(&path, "%s/host%d", - LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) - return -1; + virAsprintf(&path, "%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, host); *isActive = virFileExists(path); diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index e481eea816..ff13d2d9bd 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -226,9 +226,7 @@ virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); VIR_FREE(vol->target.path); vol->target.path = g_strdup(vol->name); @@ -340,8 +338,7 @@ virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); VIR_FREE(vol->target.path); vol->target.path = g_strdup(vol->name); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index 8a4023014d..9a34d87ec3 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -61,8 +61,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) if (!(usr_name = virGetUserName(def->target.perms.uid))) return -1; - if (virAsprintf(&mode, "%o", def->target.perms.mode) < 0) - return -1; + virAsprintf(&mode, "%o", def->target.perms.mode); cmd = virCommandNewArgList(VSTORAGE_MOUNT, "-c", def->source.name, @@ -91,8 +90,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) char buf[1024]; g_autofree char *cluster = NULL; - if (virAsprintf(&cluster, "vstorage://%s", def->source.name) < 0) - return -1; + virAsprintf(&cluster, "vstorage://%s", def->source.name); if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) { virReportSystemError(errno, diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index c3057fede6..793eb06f5c 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -87,9 +87,7 @@ virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); g_autofree char *devpath = NULL; - if (virAsprintf(&devpath, "/dev/zvol/%s", - def->source.name) < 0) - return -1; + virAsprintf(&devpath, "/dev/zvol/%s", def->source.name); *isActive = virFileIsDir(devpath); return 0; @@ -139,9 +137,8 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, volume->key = g_strdup(tokens[0]); if (volume->target.path == NULL) { - if (virAsprintf(&volume->target.path, "%s/%s", - def->target.path, volume->name) < 0) - goto cleanup; + virAsprintf(&volume->target.path, "%s/%s", def->target.path, + volume->name); } if (virStrToLong_ull(tokens[1], NULL, 10, &volume->target.capacity) < 0) { @@ -308,9 +305,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); vol->key = g_strdup(vol->target.path); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b8332af01..dfe3dd1354 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -281,13 +281,9 @@ storageStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; - if ((virAsprintf(&driver->configDir, - "%s/storage", configdir) < 0) || - (virAsprintf(&driver->autostartDir, - "%s/storage/autostart", configdir) < 0) || - (virAsprintf(&driver->stateDir, - "%s/storage/run", rundir) < 0)) - goto error; + virAsprintf(&driver->configDir, "%s/storage", configdir); + virAsprintf(&driver->autostartDir, "%s/storage/autostart", configdir); + virAsprintf(&driver->stateDir, "%s/storage/run", rundir); } driver->privileged = privileged; @@ -2293,8 +2289,7 @@ virStorageBackendPloopRestoreDesc(char *path) g_autofree char *refresh_tool = NULL; g_autofree char *desc = NULL; - if (virAsprintf(&desc, "%s/DiskDescriptor.xml", path) < 0) - return -1; + virAsprintf(&desc, "%s/DiskDescriptor.xml", path); if (virFileRemove(desc, 0, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2856,8 +2851,8 @@ virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); char *tmp = NULL; - ignore_value(virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name)); + virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", + driver->stateDir, def->name, voldef->name); return tmp; } diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_gluster.c index 28f9962c0c..1577239431 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -311,11 +311,11 @@ virStorageFileBackendGlusterGetUniqueIdentifier(virStorageSourcePtr src) priv))) return NULL; - ignore_value(virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", - src->hosts->name, - src->hosts->port, - src->volume, - filePath)); + virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", + src->hosts->name, + src->hosts->port, + src->volume, + filePath); return priv->canonpath; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7b934b61e0..88fb8b5223 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -897,10 +897,8 @@ storageBackendCreateQemuImgSetBacking(virStoragePoolObjPtr pool, /* Convert relative backing store paths to absolute paths for access * validation. */ - if ('/' != *(info->backingPath) && - virAsprintf(&absolutePath, "%s/%s", def->target.path, - info->backingPath) < 0) - return -1; + if (*(info->backingPath) != '/') + virAsprintf(&absolutePath, "%s/%s", def->target.path, info->backingPath); accessRetCode = access(absolutePath ? absolutePath : info->backingPath, R_OK); if (accessRetCode != 0) { @@ -1142,8 +1140,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, _("path to secret data file is required")); goto error; } - if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0) - goto error; + virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name); if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, info.secretAlias) < 0) goto error; @@ -1156,9 +1153,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, _("path to inputvol secret data file is required")); goto error; } - if (virAsprintf(&inputSecretAlias, "%s_encrypt0", - inputvol->name) < 0) - goto error; + virAsprintf(&inputSecretAlias, "%s_encrypt0", inputvol->name); if (storageBackendCreateQemuImgSecretObject(cmd, inputSecretPath, inputSecretAlias) < 0) goto error; @@ -1683,12 +1678,10 @@ storageBackendIsPloopDir(char *path) g_autofree char *root = NULL; g_autofree char *desc = NULL; - if (virAsprintf(&root, "%s/root.hds", path) < 0) - return false; + virAsprintf(&root, "%s/root.hds", path); if (!virFileExists(root)) return false; - if (virAsprintf(&desc, "%s/DiskDescriptor.xml", path) < 0) - return false; + virAsprintf(&desc, "%s/DiskDescriptor.xml", path); if (!virFileExists(desc)) return false; @@ -1706,8 +1699,7 @@ storageBackendRedoPloopUpdate(virStorageSourcePtr target, struct stat *sb, { g_autofree char *path = NULL; - if (virAsprintf(&path, "%s/root.hds", target->path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", target->path); VIR_FORCE_CLOSE(*fd); if ((*fd = virStorageBackendVolOpen(path, sb, flags)) < 0) return -1; @@ -1957,11 +1949,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, */ retry: while ((direrr = virDirRead(dh, &dent, NULL)) > 0) { - if (virAsprintf(&stablepath, "%s/%s", - def->target.path, dent->d_name) < 0) { - VIR_DIR_CLOSE(dh); - return NULL; - } + virAsprintf(&stablepath, "%s/%s", def->target.path, dent->d_name); if (virFileLinkPointsTo(stablepath, devpath)) { VIR_DIR_CLOSE(dh); @@ -2057,9 +2045,7 @@ virStorageBackendVolCreateLocal(virStoragePoolObjPtr pool, } VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); if (virFileExists(vol->target.path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2296,8 +2282,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, storageBackendCreateQemuImgSecretPath(pool, vol))) goto cleanup; - if (virAsprintf(&secretAlias, "%s_encrypt0", vol->name) < 0) - goto cleanup; + virAsprintf(&secretAlias, "%s_encrypt0", vol->name); } /* Round capacity as qemu-img resize errors out on sizes which are not @@ -2434,8 +2419,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, return -1; } - if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", vol->target.path); target_path = path; } @@ -2469,8 +2453,7 @@ virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, " will be lost")); return -1; } - if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", vol->target.path); target_path = path; } @@ -2682,11 +2665,9 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, return -1; } - if (virAsprintf(&target_path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&target_path, "%s/root.hds", vol->target.path); - if (virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path) < 0) - return -1; + virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path); if (storageBackendVolWipeLocalFile(target_path, algorithm, vol->target.allocation, false) < 0) @@ -3544,9 +3525,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) vol->name = g_strdup(ent->d_name); vol->type = VIR_STORAGE_VOL_FILE; - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); vol->key = g_strdup(vol->target.path); @@ -3687,11 +3666,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, * in the volume name. We only need uniqueness per-pool, so * just leave 'host' out */ - if (virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun) < 0) - return -1; + virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun); - if (virAsprintf(&devpath, "/dev/%s", dev) < 0) - return -1; + virAsprintf(&devpath, "/dev/%s", dev); VIR_DEBUG("Trying to create volume for '%s'", devpath); @@ -3751,8 +3728,7 @@ getNewStyleBlockDevice(const char *lun_path, int direrr; g_autofree char *block_path = NULL; - if (virAsprintf(&block_path, "%s/block", lun_path) < 0) - goto cleanup; + virAsprintf(&block_path, "%s/block", lun_path); VIR_DEBUG("Looking for block device in '%s'", block_path); @@ -3830,9 +3806,8 @@ getBlockDevice(uint32_t host, *block_device = NULL; - if (virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", - host, bus, target, lun) < 0) - goto cleanup; + virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", host, bus, + target, lun); if (virDirOpen(&lun_dir, lun_path) < 0) goto cleanup; @@ -3884,9 +3859,8 @@ getDeviceType(uint32_t host, FILE *typefile; g_autofree char *type_path = NULL; - if (virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", - host, bus, target, lun) < 0) - return -1; + virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, + bus, target, lun); typefile = fopen(type_path, "r"); if (typefile == NULL) { @@ -4074,15 +4048,11 @@ virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool) if (def->type == VIR_STORAGE_POOL_NETFS) { if (def->source.format == VIR_STORAGE_POOL_NETFS_CIFS) { - if (virAsprintf(&src, "//%s/%s", - def->source.hosts[0].name, - def->source.dir) < 0) - return NULL; + virAsprintf(&src, "//%s/%s", def->source.hosts[0].name, + def->source.dir); } else { - if (virAsprintf(&src, "%s:%s", - def->source.hosts[0].name, - def->source.dir) < 0) - return NULL; + virAsprintf(&src, "%s:%s", def->source.hosts[0].name, + def->source.dir); } } else { src = g_strdup(def->source.devices[0].path); @@ -4197,9 +4167,8 @@ virStorageBackendFileSystemMountCmd(const char *cmdstr, virCommandPtr cmd = NULL; g_autofree char *nfsVers = NULL; - if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0 && - virAsprintf(&nfsVers, "nfsvers=%u", def->source.protocolVer) < 0) - return NULL; + if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0) + virAsprintf(&nfsVers, "nfsvers=%u", def->source.protocolVer); cmd = virCommandNew(cmdstr); if (netauto) -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/viraudit.c | 3 +- src/util/virauth.c | 17 ++--- src/util/virauthconfig.c | 9 +-- src/util/vircgroup.c | 39 ++++------- src/util/vircgroupv1.c | 102 ++++++++++----------------- src/util/vircgroupv2.c | 97 +++++++++----------------- src/util/virconf.c | 10 +-- src/util/virdevmapper.c | 7 +- src/util/virdnsmasq.c | 39 ++++------- src/util/virebtables.c | 5 +- src/util/virerror.c | 3 +- src/util/virfile.c | 39 ++++------- src/util/virhostcpu.c | 11 ++- src/util/virhostdev.c | 3 +- src/util/virhostmem.c | 21 ++---- src/util/viriptables.c | 16 ++--- src/util/viriscsi.c | 6 +- src/util/virjson.c | 12 ++-- src/util/virkmod.c | 3 +- src/util/virlockspace.c | 2 +- src/util/virlog.c | 120 ++++++++++++++------------------ src/util/virlog.h | 2 +- src/util/virmacmap.c | 2 +- src/util/virmdev.c | 11 ++- src/util/virnetdev.c | 40 ++++------- src/util/virnetdevbandwidth.c | 61 +++++++--------- src/util/virnetdevbridge.c | 16 ++--- src/util/virnetdevip.c | 5 +- src/util/virnetdevmacvlan.c | 6 +- src/util/virnetdevopenvswitch.c | 18 ++--- src/util/virnetdevtap.c | 6 +- src/util/virnetdevveth.c | 9 +-- src/util/virnuma.c | 32 ++++----- src/util/virpci.c | 86 +++++++++-------------- src/util/virpidfile.c | 9 +-- src/util/virprocess.c | 24 +++---- src/util/virqemu.c | 6 +- src/util/virrandom.c | 5 +- src/util/virresctrl.c | 21 ++---- src/util/virrotatingfile.c | 12 ++-- src/util/virscsi.c | 31 +++------ src/util/virscsihost.c | 18 ++--- src/util/virscsivhost.c | 4 +- src/util/virsocketaddr.c | 19 ++--- src/util/virstoragefile.c | 14 ++-- src/util/virstring.c | 5 +- src/util/virstring.h | 2 +- src/util/virsystemd.c | 3 +- src/util/virtpm.c | 44 ++++++------ src/util/virtypedparam.c | 12 ++-- src/util/viruri.c | 3 +- src/util/virusb.c | 19 ++--- src/util/virutil.c | 18 +++-- src/util/virvhba.c | 52 +++++--------- 54 files changed, 436 insertions(+), 743 deletions(-) diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 9bf42824f6..9d423e8f53 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -158,8 +158,7 @@ char *virAuditEncode(const char *key, const char *value) return audit_encode_nv_string(key, value, 0); #else char *str; - if (virAsprintf(&str, "%s=%s", key, value) < 0) - return NULL; + virAsprintf(&str, "%s=%s", key, value); return str; #endif } diff --git a/src/util/virauth.c b/src/util/virauth.c index ddb46cc498..9ff639ffa8 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -69,8 +69,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (!(userdir = virGetUserConfigDirectory())) return -1; - if (virAsprintf(path, "%s/auth.conf", userdir) < 0) - return -1; + virAsprintf(path, "%s/auth.conf", userdir); VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) @@ -158,13 +157,10 @@ virAuthGetUsernamePath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); if (defaultUsername != NULL) { - if (virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, - defaultUsername) < 0) { - return NULL; - } + virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, + defaultUsername); } else { - if (virAsprintf(&prompt, _("Enter username for %s"), hostname) < 0) - return NULL; + virAsprintf(&prompt, _("Enter username for %s"), hostname); } for (ncred = 0; ncred < auth->ncredtype; ncred++) { @@ -241,10 +237,7 @@ virAuthGetPasswordPath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); - if (virAsprintf(&prompt, _("Enter %s's password for %s"), username, - hostname) < 0) { - return NULL; - } + virAsprintf(&prompt, _("Enter %s's password for %s"), username, hostname); for (ncred = 0; ncred < auth->ncredtype; ncred++) { if (auth->credtype[ncred] != VIR_CRED_PASSPHRASE && diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 6a9001f2d8..b7263ebccb 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -113,13 +113,11 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!hostname) hostname = "localhost"; - if (virAsprintf(&authgroup, "auth-%s-%s", service, hostname) < 0) - return -1; + virAsprintf(&authgroup, "auth-%s-%s", service, hostname); if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0) - return -1; + virAsprintf(&authgroup, "auth-%s-%s", service, "default"); } if (!virKeyFileHasGroup(auth->keyfile, authgroup)) @@ -132,8 +130,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth, return -1; } - if (virAsprintf(&credgroup, "credentials-%s", authcred) < 0) - return -1; + virAsprintf(&credgroup, "credentials-%s", authcred); if (!virKeyFileHasGroup(auth->keyfile, credgroup)) { virReportError(VIR_ERR_CONF_SYNTAX, diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index b46f20abfd..8545cd3049 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -206,8 +206,7 @@ virCgroupPartitionEscape(char **path) if ((rc = virCgroupPartitionNeedsEscaping(*path)) <= 0) return rc; - if (virAsprintf(&newstr, "_%s", *path) < 0) - return -1; + virAsprintf(&newstr, "_%s", *path); VIR_FREE(*path); *path = newstr; @@ -291,9 +290,7 @@ virCgroupDetectPlacement(virCgroupPtr group, if (pid == -1) { procfile = g_strdup("/proc/self/cgroup"); } else { - if (virAsprintf(&procfile, "/proc/%lld/cgroup", - (long long) pid) < 0) - goto cleanup; + virAsprintf(&procfile, "/proc/%lld/cgroup", (long long)pid); } mapping = fopen(procfile, "r"); @@ -446,8 +443,7 @@ virCgroupGetBlockDevString(const char *path) /* Automatically append space after the string since all callers * use it anyway */ - if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) - return NULL; + virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); return ret; } @@ -563,8 +559,7 @@ virCgroupSetValueU64(virCgroupPtr group, { g_autofree char *strval = NULL; - if (virAsprintf(&strval, "%llu", value) < 0) - return -1; + virAsprintf(&strval, "%llu", value); return virCgroupSetValueStr(group, controller, key, strval); } @@ -578,8 +573,7 @@ virCgroupSetValueI64(virCgroupPtr group, { g_autofree char *strval = NULL; - if (virAsprintf(&strval, "%lld", value) < 0) - return -1; + virAsprintf(&strval, "%lld", value); return virCgroupSetValueStr(group, controller, key, strval); } @@ -682,11 +676,8 @@ virCgroupNew(pid_t pid, if (path[0] == '/' || !parent) { (*group)->path = g_strdup(path); } else { - if (virAsprintf(&(*group)->path, "%s%s%s", - parent->path, - STREQ(parent->path, "") ? "" : "/", - path) < 0) - goto error; + virAsprintf(&(*group)->path, "%s%s%s", parent->path, + STREQ(parent->path, "") ? "" : "/", path); } if (virCgroupDetect(*group, pid, controllers, path, parent) < 0) @@ -918,9 +909,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, { g_autofree char *grpname = NULL; - if (virAsprintf(&grpname, "%s.libvirt-%s", - name, driver) < 0) - return -1; + virAsprintf(&grpname, "%s.libvirt-%s", name, driver); if (virCgroupPartitionEscape(&grpname) < 0) return -1; @@ -971,15 +960,13 @@ virCgroupNewThread(virCgroupPtr domain, switch (nameval) { case VIR_CGROUP_THREAD_VCPU: - if (virAsprintf(&name, "vcpu%d", id) < 0) - return -1; + virAsprintf(&name, "vcpu%d", id); break; case VIR_CGROUP_THREAD_EMULATOR: name = g_strdup("emulator"); break; case VIR_CGROUP_THREAD_IOTHREAD: - if (virAsprintf(&name, "iothread%d", id) < 0) - return -1; + virAsprintf(&name, "iothread%d", id); break; case VIR_CGROUP_THREAD_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2356,10 +2343,8 @@ virCgroupRemoveRecursively(char *grppath) if (ent->d_type != DT_DIR) continue; - if (virAsprintf(&path, "%s/%s", grppath, ent->d_name) == -1) { - rc = -ENOMEM; - break; - } + virAsprintf(&path, "%s/%s", grppath, ent->d_name); + rc = virCgroupRemoveRecursively(path); if (rc != 0) break; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 0820c5d638..d04fa521fc 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -97,16 +97,15 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename_new = NULL; g_autofree char *partmachinename = NULL; - if (virAsprintf(&partname, "%s.libvirt-%s", - name, drivername) < 0) - return false; + virAsprintf(&partname, "%s.libvirt-%s", name, drivername); if (virCgroupPartitionEscape(&partname) < 0) return false; - if (virAsprintf(&partmachinename, "%s.libvirt-%s", - machinename, drivername) < 0 || - virCgroupPartitionEscape(&partmachinename) < 0) + virAsprintf(&partmachinename, "%s.libvirt-%s", + machinename, drivername); + + if (virCgroupPartitionEscape(&partmachinename) < 0) return false; if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true))) @@ -204,13 +203,10 @@ virCgroupV1CopyPlacement(virCgroupPtr group, * parent == "/libvirt.service" + path == "" => "/libvirt.service" * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo" */ - if (virAsprintf(&group->legacy[i].placement, - "%s%s%s", - parent->legacy[i].placement, - (STREQ(parent->legacy[i].placement, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->legacy[i].placement, "%s%s%s", + parent->legacy[i].placement, + (STREQ(parent->legacy[i].placement, "/") || STREQ(path, "") ? "" : "/"), + path); } } @@ -241,8 +237,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, return 0; *dirName = '\0'; - if (virAsprintf(&linkSrc, "%s/%s", tmp, typeStr) < 0) - return -1; + virAsprintf(&linkSrc, "%s/%s", tmp, typeStr); *dirName = '/'; if (lstat(linkSrc, &sb) < 0) { @@ -354,12 +349,9 @@ virCgroupV1DetectPlacement(virCgroupPtr group, if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { group->legacy[i].placement = g_strdup(selfpath); } else { - if (virAsprintf(&group->legacy[i].placement, - "%s%s%s", selfpath, - (STREQ(selfpath, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->legacy[i].placement, "%s%s%s", selfpath, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), + path); } } } @@ -524,11 +516,8 @@ virCgroupV1PathOfController(virCgroupPtr group, return -1; } - if (virAsprintf(path, "%s%s/%s", - group->legacy[controller].mountPoint, - group->legacy[controller].placement, - NULLSTR_EMPTY(key)) < 0) - return -1; + virAsprintf(path, "%s%s/%s", group->legacy[controller].mountPoint, + group->legacy[controller].placement, NULLSTR_EMPTY(key)); return 0; } @@ -817,9 +806,7 @@ virCgroupV1BindMount(virCgroupPtr group, return -1; } - if (virAsprintf(&opts, - "mode=755,size=65536%s", mountopts) < 0) - return -1; + virAsprintf(&opts, "mode=755,size=65536%s", mountopts); if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) { virReportSystemError(errno, @@ -834,10 +821,7 @@ virCgroupV1BindMount(virCgroupPtr group, if (!virFileExists(group->legacy[i].mountPoint)) { g_autofree char *src = NULL; - if (virAsprintf(&src, "%s%s", - oldroot, - group->legacy[i].mountPoint) < 0) - return -1; + virAsprintf(&src, "%s%s", oldroot, group->legacy[i].mountPoint); VIR_DEBUG("Create mount point '%s'", group->legacy[i].mountPoint); @@ -897,9 +881,8 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, if (!cgroup->legacy[i].mountPoint) continue; - if (virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, - cgroup->legacy[i].placement) < 0) - goto cleanup; + virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, + cgroup->legacy[i].placement); if (virDirOpen(&dh, base) < 0) goto cleanup; @@ -907,8 +890,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, while ((direrr = virDirRead(dh, &de, base)) > 0) { g_autofree char *entry = NULL; - if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) - goto cleanup; + virAsprintf(&entry, "%s/%s", base, de->d_name); if (chown(entry, uid, gid) < 0) { virReportSystemError(errno, @@ -965,8 +947,7 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, return -1; } - if (virAsprintf(&value, "%u", weight) < 0) - return -1; + virAsprintf(&value, "%u", weight); return virCgroupSetValueRaw(path, value); } @@ -1208,8 +1189,7 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; - if (virAsprintf(&str, "%s%d", blkstr, weight) < 0) - return -1; + virAsprintf(&str, "%s%d", blkstr, weight); if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", &path) < 0) { @@ -1276,8 +1256,7 @@ virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - if (virAsprintf(&str, "%s%u", blkstr, riops) < 0) - return -1; + virAsprintf(&str, "%s%u", blkstr, riops); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1328,8 +1307,7 @@ virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0) - return -1; + virAsprintf(&str, "%s%u", blkstr, wiops); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1380,8 +1358,7 @@ virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0) - return -1; + virAsprintf(&str, "%s%llu", blkstr, rbps); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1432,8 +1409,7 @@ virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0) - return -1; + virAsprintf(&str, "%s%llu", blkstr, wbps); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1784,17 +1760,16 @@ virCgroupV1AllowDevice(virCgroupPtr group, if (major < 0) majorstr = g_strdup("*"); - if (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0) - return -1; + else + virAsprintf(&majorstr, "%i", major); if (minor < 0) minorstr = g_strdup("*"); - if (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0) - return -1; + else + virAsprintf(&minorstr, "%i", minor); - if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)) < 0) - return -1; + virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, @@ -1819,17 +1794,16 @@ virCgroupV1DenyDevice(virCgroupPtr group, if (major < 0) majorstr = g_strdup("*"); - if (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0) - return -1; + else + virAsprintf(&majorstr, "%i", major); if (minor < 0) minorstr = g_strdup("*"); - if (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0) - return -1; + else + virAsprintf(&minorstr, "%i", minor); - if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)) < 0) - return -1; + virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index e976a8d241..f0ce4a48bc 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -75,8 +75,7 @@ virCgroupV2Available(void) /* Systemd uses cgroup v2 for process tracking but no controller is * available. We should consider this configuration as cgroup v2 is * not available. */ - if (virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir) < 0) - goto cleanup; + virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir); if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0) goto cleanup; @@ -104,10 +103,7 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename = NULL; char *tmp; - if (virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, - drivername) < 0) { - return false; - } + virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, drivername); if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -166,12 +162,10 @@ virCgroupV2CopyPlacement(virCgroupPtr group, * parent == "/libvirt.service" + path == "" => "/libvirt.service" * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo" */ - if (virAsprintf(&group->unified.placement, "%s%s%s", - parent->unified.placement, - (STREQ(parent->unified.placement, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->unified.placement, "%s%s%s", + parent->unified.placement, + (STREQ(parent->unified.placement, "/") || STREQ(path, "") ? "" : "/"), + path); } return 0; @@ -215,12 +209,8 @@ virCgroupV2DetectPlacement(virCgroupPtr group, * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" */ - if (virAsprintf(&group->unified.placement, - "%s%s%s", selfpath, - (STREQ(selfpath, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->unified.placement, "%s%s%s", selfpath, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path); return 0; } @@ -262,15 +252,13 @@ virCgroupV2ParseControllersFile(virCgroupPtr group, char **tmp; if (parent) { - if (virAsprintf(&contFile, "%s%s/cgroup.subtree_control", - parent->unified.mountPoint, - NULLSTR_EMPTY(parent->unified.placement)) < 0) - return -1; + virAsprintf(&contFile, "%s%s/cgroup.subtree_control", + parent->unified.mountPoint, + NULLSTR_EMPTY(parent->unified.placement)); } else { - if (virAsprintf(&contFile, "%s%s/cgroup.controllers", - group->unified.mountPoint, - NULLSTR_EMPTY(group->unified.placement)) < 0) - return -1; + virAsprintf(&contFile, "%s%s/cgroup.controllers", + group->unified.mountPoint, + NULLSTR_EMPTY(group->unified.placement)); } rc = virFileReadAll(contFile, 1024 * 1024, &contStr); @@ -357,11 +345,8 @@ virCgroupV2PathOfController(virCgroupPtr group, return -1; } - if (virAsprintf(path, "%s%s/%s", - group->unified.mountPoint, - group->unified.placement, - NULLSTR_EMPTY(key)) < 0) - return -1; + virAsprintf(path, "%s%s/%s", group->unified.mountPoint, + group->unified.placement, NULLSTR_EMPTY(key)); return 0; } @@ -383,10 +368,7 @@ virCgroupV2EnableController(virCgroupPtr group, g_autofree char *val = NULL; g_autofree char *path = NULL; - if (virAsprintf(&val, "+%s", - virCgroupV2ControllerTypeToString(controller)) < 0) { - return -1; - } + virAsprintf(&val, "+%s", virCgroupV2ControllerTypeToString(controller)); if (virCgroupPathOfController(parent, controller, "cgroup.subtree_control", &path) < 0) { @@ -568,11 +550,9 @@ virCgroupV2BindMount(virCgroupPtr group, return -1; } - if (virAsprintf(&opts, "mode=755,size=65536%s", mountopts) < 0) - return -1; + virAsprintf(&opts, "mode=755,size=65536%s", mountopts); - if (virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint) < 0) - return -1; + virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint); if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) { virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"), @@ -592,10 +572,8 @@ virCgroupV2SetOwner(virCgroupPtr cgroup, { g_autofree char *base = NULL; - if (virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, - cgroup->unified.placement) < 0) { - return -1; - } + virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, + cgroup->unified.placement); if (virFileChownFiles(base, uid, gid) < 0) return -1; @@ -639,8 +617,7 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, return -1; } - if (virAsprintf(&value, format, weight) < 0) - return -1; + virAsprintf(&value, format, weight); return virCgroupSetValueRaw(path, value); } @@ -833,8 +810,7 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; - if (virAsprintf(&str, "%s%d", blkstr, weight) < 0) - return -1; + virAsprintf(&str, "%s%d", blkstr, weight); if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -903,11 +879,9 @@ virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group, return -1; if (riops == 0) { - if (virAsprintf(&str, "%sriops=max", blkstr) < 0) - return -1; + virAsprintf(&str, "%sriops=max", blkstr); } else { - if (virAsprintf(&str, "%sriops=%u", blkstr, riops) < 0) - return -1; + virAsprintf(&str, "%sriops=%u", blkstr, riops); } return virCgroupSetValueStr(group, @@ -974,11 +948,9 @@ virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group, return -1; if (wiops == 0) { - if (virAsprintf(&str, "%swiops=max", blkstr) < 0) - return -1; + virAsprintf(&str, "%swiops=max", blkstr); } else { - if (virAsprintf(&str, "%swiops=%u", blkstr, wiops) < 0) - return -1; + virAsprintf(&str, "%swiops=%u", blkstr, wiops); } return virCgroupSetValueStr(group, @@ -1045,11 +1017,9 @@ virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group, return -1; if (rbps == 0) { - if (virAsprintf(&str, "%srbps=max", blkstr) < 0) - return -1; + virAsprintf(&str, "%srbps=max", blkstr); } else { - if (virAsprintf(&str, "%srbps=%llu", blkstr, rbps) < 0) - return -1; + virAsprintf(&str, "%srbps=%llu", blkstr, rbps); } return virCgroupSetValueStr(group, @@ -1116,11 +1086,9 @@ virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group, return -1; if (wbps == 0) { - if (virAsprintf(&str, "%swbps=max", blkstr) < 0) - return -1; + virAsprintf(&str, "%swbps=max", blkstr); } else { - if (virAsprintf(&str, "%swbps=%llu", blkstr, wbps) < 0) - return -1; + virAsprintf(&str, "%swbps=%llu", blkstr, wbps); } return virCgroupSetValueStr(group, @@ -1520,8 +1488,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, } *tmp = '\0'; - if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0) - return -1; + virAsprintf(&value, "%s %llu", str, cfs_period); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", value); diff --git a/src/util/virconf.c b/src/util/virconf.c index 3b678015f5..d4071d1945 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1520,19 +1520,13 @@ virConfLoadConfigPath(const char *name) { char *path; if (geteuid() == 0) { - if (virAsprintf(&path, "%s/libvirt/%s", - SYSCONFDIR, name) < 0) - return NULL; + virAsprintf(&path, "%s/libvirt/%s", SYSCONFDIR, name); } else { char *userdir = virGetUserConfigDirectory(); if (!userdir) return NULL; - if (virAsprintf(&path, "%s/%s", - userdir, name) < 0) { - VIR_FREE(userdir); - return NULL; - } + virAsprintf(&path, "%s/%s", userdir, name); VIR_FREE(userdir); } diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index a9996b067c..1c8f356387 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,10 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; for (i = 0; i < deps->count; i++) { - if (virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])) < 0) - goto cleanup; + virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } recursiveDevPaths = NULL; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index f22250a07e..a93c851f7d 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -180,8 +180,7 @@ addnhostsWrite(const char *path, * for runtime addition. */ - if (virAsprintf(&tmp, "%s.new", path) < 0) - return -ENOMEM; + virAsprintf(&tmp, "%s.new", path); if (!(f = fopen(tmp, "w"))) { istmp = false; @@ -312,30 +311,24 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, /* the first test determines if it is a dhcpv6 host */ if (ipv6) { if (name && id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,%s,[%s]", id, name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, + "id:%s,%s,[%s]", id, name, ipstr); } else if (name && !id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "%s,[%s]", name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,[%s]", + name, ipstr); } else if (!name && id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,[%s]", id, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, + "id:%s,[%s]", id, ipstr); } } else if (name && mac) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", - mac, ipstr, name) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", + mac, ipstr, name); } else if (name && !mac) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", name, + ipstr); } else { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - mac, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", mac, + ipstr); } VIR_FREE(ipstr); @@ -393,8 +386,7 @@ hostsfileWrite(const char *path, * for runtime addition. */ - if (virAsprintf(&tmp, "%s.new", path) < 0) - return -ENOMEM; + virAsprintf(&tmp, "%s.new", path); if (!(f = fopen(tmp, "w"))) { istmp = false; @@ -758,8 +750,7 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (virAsprintf(&complete, "%s\n%s", version, help) < 0) - goto cleanup; + virAsprintf(&complete, "%s\n%s", version, help); ret = dnsmasqCapsSetFromBuffer(caps, complete); diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 3fda362a13..9f4ba9013e 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -58,10 +58,7 @@ ebtablesContextNew(const char *driver) if (VIR_ALLOC(ctx) < 0) return NULL; - if (virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver) < 0) { - VIR_FREE(ctx); - return NULL; - } + virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver); return ctx; } diff --git a/src/util/virerror.c b/src/util/virerror.c index f0ef7e337c..c31103c3b7 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,8 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; - if (virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message) < 0) - goto cleanup; + virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message); VIR_FREE(err->message); err->message = g_steal_pointer(&newmsg); diff --git a/src/util/virfile.c b/src/util/virfile.c index 7c97317994..0636fb8f08 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -508,8 +508,7 @@ virFileRewrite(const char *path, int fd = -1; int ret = -1; - if (virAsprintf(&newfile, "%s.new", path) < 0) - goto cleanup; + virAsprintf(&newfile, "%s.new", path); if ((fd = open(newfile, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) { virReportSystemError(errno, _("cannot create file '%s'"), @@ -666,8 +665,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) VIR_DEBUG("Found free loop device number %i", devnr); - if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) - return -1; + virAsprintf(&looppath, "/dev/loop%i", devnr); if ((*fd = open(looppath, O_RDWR)) < 0) { virReportSystemError(errno, @@ -703,8 +701,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) !c_isdigit(de->d_name[4])) continue; - if (virAsprintf(&looppath, "/dev/%s", de->d_name) < 0) - goto cleanup; + virAsprintf(&looppath, "/dev/%s", de->d_name); VIR_DEBUG("Checking up on device %s", looppath); if ((fd = open(looppath, O_RDWR)) < 0) { @@ -834,9 +831,7 @@ virFileNBDDeviceIsBusy(const char *dev_name) { g_autofree char *path = NULL; - if (virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", - dev_name) < 0) - return -1; + virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", dev_name); if (!virFileExists(path)) { if (errno == ENOENT) @@ -868,7 +863,7 @@ virFileNBDDeviceFindUnused(void) if (rv < 0) goto cleanup; if (rv == 0) { - ignore_value(virAsprintf(&ret, "/dev/%s", de->d_name)); + virAsprintf(&ret, "/dev/%s", de->d_name); goto cleanup; } } @@ -1013,9 +1008,7 @@ int virFileDeleteTree(const char *dir) g_autofree char *filepath = NULL; struct stat sb; - if (virAsprintf(&filepath, "%s/%s", - dir, de->d_name) < 0) - goto cleanup; + virAsprintf(&filepath, "%s/%s", dir, de->d_name); if (lstat(filepath, &sb) < 0) { virReportSystemError(errno, _("Cannot access '%s'"), @@ -1556,8 +1549,7 @@ virFileRelLinkPointsTo(const char *directory, checkLink); return -1; } - if (virAsprintf(&candidate, "%s/%s", directory, checkLink) < 0) - return -1; + virAsprintf(&candidate, "%s/%s", directory, checkLink); return virFileLinkPointsTo(candidate, checkDest); } @@ -1693,8 +1685,8 @@ virFindFileInPath(const char *file) */ pathiter = path; while ((pathseg = strsep(&pathiter, ":")) != NULL) { - if (virAsprintf(&fullpath, "%s/%s", pathseg, file) < 0 || - virFileIsExecutable(fullpath)) + virAsprintf(&fullpath, "%s/%s", pathseg, file); + if (virFileIsExecutable(fullpath)) break; VIR_FREE(fullpath); } @@ -1757,8 +1749,7 @@ virFileFindResourceFull(const char *filename, else path = installdir; - if (virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix) < 0) - return NULL; + virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix); VIR_DEBUG("Resolved '%s' to '%s'", filename, ret); return ret; @@ -2985,8 +2976,7 @@ int virFileChownFiles(const char *name, while ((direrr = virDirRead(dir, &ent, name)) > 0) { g_autofree char *path = NULL; - if (virAsprintf(&path, "%s/%s", name, ent->d_name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", name, ent->d_name); if (!virFileIsRegular(path)) continue; @@ -3103,9 +3093,9 @@ virFileBuildPath(const char *dir, const char *name, const char *ext) char *path; if (ext == NULL) { - ignore_value(virAsprintf(&path, "%s/%s", dir, name)); + virAsprintf(&path, "%s/%s", dir, name); } else { - ignore_value(virAsprintf(&path, "%s/%s%s", dir, name, ext)); + virAsprintf(&path, "%s/%s%s", dir, name, ext); } return path; @@ -3293,8 +3283,7 @@ virFileAbsPath(const char *path, char **abspath) if (buf == NULL) return -1; - if (virAsprintf(abspath, "%s/%s", buf, path) < 0) - return -1; + virAsprintf(abspath, "%s/%s", buf, path); } return 0; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index d544d36c61..26b2fdc17f 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -627,8 +627,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the * core, node, socket, thread and topology information from /sys */ - if (virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH) < 0) - goto cleanup; + virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH); if (virDirOpenQuiet(&nodedir, sysfs_nodedir) < 0) { /* the host isn't probably running a NUMA architecture */ @@ -671,9 +670,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, (*nodes)++; - if (virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, - nodedirent->d_name) < 0) - goto cleanup; + virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, + nodedirent->d_name); if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, @@ -706,8 +704,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, fallback: VIR_FREE(sysfs_cpudir); - if (virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH) < 0) - goto cleanup; + virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH); if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 010eb551a9..ab40c5faaa 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -184,8 +184,7 @@ virHostdevManagerNew(void) if (!(rundir = virGetUserRuntimeDirectory())) return NULL; - if (virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir) < 0) - return NULL; + virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir); old_umask = umask(077); diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index c1dfc1225c..0d57d47529 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -280,10 +280,8 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, return -1; } - if (virAsprintf(&meminfo_path, - SYSFS_SYSTEM_PATH "/node/node%d/meminfo", - cellNum) < 0) - return -1; + virAsprintf(&meminfo_path, + SYSFS_SYSTEM_PATH "/node/node%d/meminfo", cellNum); } meminfo = fopen(meminfo_path, "r"); @@ -318,12 +316,9 @@ virHostMemSetParameterValue(virTypedParameterPtr param) char *field = strchr(param->field, '_'); sa_assert(field); field++; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return -2; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); - if (virAsprintf(&strval, "%u", param->value.ui) == -1) - return -2; + virAsprintf(&strval, "%u", param->value.ui); if ((rc = virFileWriteStr(path, strval, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), param->field); @@ -346,9 +341,7 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params, char *field = strchr(param->field, '_'); sa_assert(field); field++; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return false; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -412,9 +405,7 @@ virHostMemGetParameterValue(const char *field, char *tmp = NULL; int rc = -1; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return -1; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); if (!virFileExists(path)) return -2; diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e95aaa4773..e339368040 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -401,7 +401,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netaddr, if (!netstr) return NULL; - ignore_value(virAsprintf(&ret, "%s/%d", netstr, prefix)); + virAsprintf(&ret, "%s/%d", netstr, prefix); return ret; } @@ -905,31 +905,25 @@ iptablesForwardMasquerade(virFirewallPtr fw, } if (port->start < port->end && port->end < 65536) { - if (virAsprintf(&portRangeStr, ":%u-%u", - port->start, port->end) < 0) - return -1; + virAsprintf(&portRangeStr, ":%u-%u", port->start, port->end); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid port range '%u-%u'."), port->start, port->end); + return -1; } } /* Use --jump SNAT if public addr is specified */ if (addrStartStr && addrStartStr[0]) { - int r = 0; - if (addrEndStr && addrEndStr[0]) { - r = virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, + virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, portRangeStr ? portRangeStr : ""); } else { - r = virAsprintf(&natRangeStr, "%s%s", addrStartStr, + virAsprintf(&natRangeStr, "%s%s", addrStartStr, portRangeStr ? portRangeStr : ""); } - if (r < 0) - return -1; - virFirewallRuleAddArgList(fw, rule, "--jump", "SNAT", "--to-source", natRangeStr, NULL); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index ba90c41763..55a30470d6 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -213,10 +213,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, g_autofree char *temp_ifacename = NULL; g_autoptr(virCommand) cmd = NULL; - if (virAsprintf(&temp_ifacename, - "libvirt-iface-%08llx", - (unsigned long long)virRandomBits(32)) < 0) - return -1; + virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", + (unsigned long long)virRandomBits(32)); VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", temp_ifacename, initiatoriqn); diff --git a/src/util/virjson.c b/src/util/virjson.c index eb6207f13f..ec8d706edd 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -497,8 +497,7 @@ virJSONValuePtr virJSONValueNewNumberInt(int data) { g_autofree char *str = NULL; - if (virAsprintf(&str, "%i", data) < 0) - return NULL; + virAsprintf(&str, "%i", data); return virJSONValueNewNumber(str); } @@ -507,8 +506,7 @@ virJSONValuePtr virJSONValueNewNumberUint(unsigned int data) { g_autofree char *str = NULL; - if (virAsprintf(&str, "%u", data) < 0) - return NULL; + virAsprintf(&str, "%u", data); return virJSONValueNewNumber(str); } @@ -517,8 +515,7 @@ virJSONValuePtr virJSONValueNewNumberLong(long long data) { g_autofree char *str = NULL; - if (virAsprintf(&str, "%lld", data) < 0) - return NULL; + virAsprintf(&str, "%lld", data); return virJSONValueNewNumber(str); } @@ -527,8 +524,7 @@ virJSONValuePtr virJSONValueNewNumberUlong(unsigned long long data) { g_autofree char *str = NULL; - if (virAsprintf(&str, "%llu", data) < 0) - return NULL; + virAsprintf(&str, "%llu", data); return virJSONValueNewNumber(str); } diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 2f6ab90ded..962b132d31 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,8 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst = NULL; g_autofree char *outbuf = NULL; - if (virAsprintfQuiet(&drvblklst, "blacklist %s\n", module) < 0) - return false; + virAsprintfQuiet(&drvblklst, "blacklist %s\n", module); /* modprobe will convert all '-' into '_', so we need to as well */ for (i = 0; i < drvblklst[i]; i++) diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index b0f73c2a8a..30868035a9 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -67,7 +67,7 @@ static char *virLockSpaceGetResourcePath(virLockSpacePtr lockspace, { char *ret; if (lockspace->dir) - ignore_value(virAsprintf(&ret, "%s/%s", lockspace->dir, resname)); + virAsprintf(&ret, "%s/%s", lockspace->dir, resname); else ret = g_strdup(resname); return ret; diff --git a/src/util/virlog.c b/src/util/virlog.c index 27843363e7..bfb2430ed3 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -149,15 +149,15 @@ virLogUnlock(void) } -static int +static void virLogSetDefaultOutputToStderr(void) { - return virAsprintf(&virLogDefaultOutput, "%d:stderr", - virLogDefaultPriority); + virAsprintf(&virLogDefaultOutput, "%d:stderr", + virLogDefaultPriority); } -static int +static void virLogSetDefaultOutputToJournald(void) { virLogPriority priority = virLogDefaultPriority; @@ -167,7 +167,7 @@ virLogSetDefaultOutputToJournald(void) if (priority == VIR_LOG_DEBUG) priority = VIR_LOG_INFO; - return virAsprintf(&virLogDefaultOutput, "%d:journald", priority); + virAsprintf(&virLogDefaultOutput, "%d:journald", priority); } @@ -179,10 +179,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) mode_t old_umask; if (privileged) { - if (virAsprintf(&virLogDefaultOutput, - "%d:file:%s/log/libvirt/%s.log", virLogDefaultPriority, - LOCALSTATEDIR, binary) < 0) - goto cleanup; + virAsprintf(&virLogDefaultOutput, "%d:file:%s/log/libvirt/%s.log", + virLogDefaultPriority, LOCALSTATEDIR, binary); } else { if (!(logdir = virGetUserCacheDirectory())) goto cleanup; @@ -194,9 +192,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) } umask(old_umask); - if (virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", - virLogDefaultPriority, logdir, binary) < 0) - goto cleanup; + virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", + virLogDefaultPriority, logdir, binary); } ret = 0; @@ -216,25 +213,23 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) * Decides on what the default output (journald, file, stderr) should be * according to @binary, @godaemon, @privileged. This function should be run * exactly once at daemon startup, so no locks are used. - * - * Returns 0 on success, -1 in case of a failure. */ -int +void virLogSetDefaultOutput(const char *binary, bool godaemon, bool privileged) { bool have_journald = access("/run/systemd/journal/socket", W_OK) >= 0; if (godaemon) { if (have_journald) - return virLogSetDefaultOutputToJournald(); + virLogSetDefaultOutputToJournald(); + else + virLogSetDefaultOutputToFile(binary, privileged); } else { if (!isatty(STDIN_FILENO) && have_journald) - return virLogSetDefaultOutputToJournald(); - - return virLogSetDefaultOutputToStderr(); + virLogSetDefaultOutputToJournald(); + else + virLogSetDefaultOutputToStderr(); } - - return virLogSetDefaultOutputToFile(binary, privileged); } @@ -443,15 +438,13 @@ virLogOutputListFree(virLogOutputPtr *list, int count) } -static int +static void virLogFormatString(char **msg, int linenr, const char *funcname, virLogPriority priority, const char *str) { - int ret; - /* * Be careful when changing the following log message formatting, we rely * on it when stripping libvirt debug messages from qemu log files. So when @@ -460,44 +453,38 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname != NULL)) { - ret = virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - funcname, linenr, str); + virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + funcname, linenr, str); } else { - ret = virAsprintfQuiet(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - str); + virAsprintfQuiet(msg, "%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + str); } - return ret; } -static int +static void virLogVersionString(const char **rawmsg, char **msg) { *rawmsg = VIR_LOG_VERSION_STRING; - return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); + virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } /* Similar to virGetHostname() but avoids use of error * reporting APIs or logging APIs, to prevent recursion */ -static int +static void virLogHostnameString(char **rawmsg, char **msg) { char *hoststr; - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) - return -1; + virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname); - if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { - VIR_FREE(hoststr); - return -1; - } + virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg = hoststr; - return 0; } @@ -582,7 +569,6 @@ virLogVMessage(virLogSourcePtr source, char *str = NULL; char *msg = NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; - int ret; size_t i; int saved_errno = errno; @@ -611,9 +597,7 @@ virLogVMessage(virLogSourcePtr source, if (virVasprintfQuiet(&str, fmt, vargs) < 0) goto cleanup; - ret = virLogFormatString(&msg, linenr, funcname, priority, str); - if (ret < 0) - goto cleanup; + virLogFormatString(&msg, linenr, funcname, priority, str); if (virTimeStringNowRaw(timestamp) < 0) timestamp[0] = '\0'; @@ -630,17 +614,18 @@ virLogVMessage(virLogSourcePtr source, const char *rawinitmsg; char *hoststr = NULL; char *initmsg = NULL; - if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) - virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, rawinitmsg, initmsg, - virLogOutputs[i]->data); + virLogVersionString(&rawinitmsg, &initmsg); + virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, rawinitmsg, initmsg, + virLogOutputs[i]->data); VIR_FREE(initmsg); - if (virLogHostnameString(&hoststr, &initmsg) >= 0) - virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, hoststr, initmsg, - virLogOutputs[i]->data); + + virLogHostnameString(&hoststr, &initmsg); + virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, hoststr, initmsg, + virLogOutputs[i]->data); VIR_FREE(hoststr); VIR_FREE(initmsg); virLogOutputs[i]->logInitMessage = false; @@ -656,17 +641,18 @@ virLogVMessage(virLogSourcePtr source, const char *rawinitmsg; char *hoststr = NULL; char *initmsg = NULL; - if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) - virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, rawinitmsg, initmsg, - (void *) STDERR_FILENO); + virLogVersionString(&rawinitmsg, &initmsg); + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, rawinitmsg, initmsg, + (void *) STDERR_FILENO); VIR_FREE(initmsg); - if (virLogHostnameString(&hoststr, &initmsg) >= 0) - virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, hoststr, initmsg, - (void *) STDERR_FILENO); + + virLogHostnameString(&hoststr, &initmsg); + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, hoststr, initmsg, + (void *) STDERR_FILENO); VIR_FREE(hoststr); VIR_FREE(initmsg); logInitMessageStderr = false; @@ -703,9 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; - if (virAsprintfQuiet(&msg, "%s: %s", timestamp, str) < 0) - return; - + virAsprintfQuiet(&msg, "%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virlog.h b/src/util/virlog.h index 8846fae9aa..feb2f85904 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -181,7 +181,7 @@ void virLogFilterListFree(virLogFilterPtr *list, int count); int virLogSetOutputs(const char *outputs); int virLogSetFilters(const char *filters); char *virLogGetDefaultOutput(void); -int virLogSetDefaultOutput(const char *fname, bool godaemon, bool privileged); +void virLogSetDefaultOutput(const char *fname, bool godaemon, bool privileged); /* * Internal logging API diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 43cefc1e8e..c515e3e7b0 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -290,7 +290,7 @@ virMacMapFileName(const char *dnsmasqStateDir, { char *filename; - ignore_value(virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge)); + virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge); return filename; } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 9f8cb95423..c5fd4ad42f 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -80,8 +80,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev, g_autofree char *file = NULL; char *tmp = NULL; - if (virAsprintf(&file, "%s/mdev_type/device_api", dev->path) < 0) - return -1; + virAsprintf(&file, "%s/mdev_type/device_api", dev->path); /* TODO - make this a generic method to access sysfs files for various * kinds of devices @@ -218,8 +217,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) if (!dev_path) return NULL; - if (virAsprintf(&iommu_path, "%s/iommu_group", dev_path) < 0) - return NULL; + virAsprintf(&iommu_path, "%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path); @@ -231,8 +229,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) return NULL; } - if (virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path)) < 0) - return NULL; + virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path)); return vfio_path; } @@ -428,7 +425,7 @@ virMediatedDeviceGetSysfsPath(const char *uuidstr) { char *ret = NULL; - ignore_value(virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr)); + virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr); return ret; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5391f0030b..20f7ef5428 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -511,8 +511,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pidInNs) char *phy_path = NULL; int len; - if (virAsprintf(&pid, "%lld", (long long) pidInNs) == -1) - return -1; + virAsprintf(&pid, "%lld", (long long) pidInNs); /* The 802.11 wireless devices only move together with their PHY. */ if (virNetDevSysfsFile(&phy_path, ifname, "phy80211/name") < 0) @@ -1069,8 +1068,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file) < 0) - return -1; + virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file); return 0; } @@ -1078,9 +1076,8 @@ static int virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname, - file) < 0) - return -1; + virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname, + file); return 0; } @@ -1102,8 +1099,7 @@ virNetDevIsPCIDevice(const char *devpath) char *subsys = NULL; bool ret = false; - if (virAsprintf(&subsys_link, "%s/subsystem", devpath) < 0) - return false; + virAsprintf(&subsys_link, "%s/subsystem", devpath); if (!virFileExists(subsys_link)) goto cleanup; @@ -1404,8 +1400,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname) if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) goto cleanup; - if (virAsprintf(&virtfnName, "virtfn%d", vf) < 0) - goto cleanup; + virAsprintf(&virtfnName, "virtfn%d", vf); /* this provides the path to the VF's directory in sysfs, * e.g. "/sys/class/net/enp2s0f0/virtfn3" @@ -1893,8 +1888,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, */ if (pfDevName && saveVlan) { - if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); /* get admin MAC and vlan tag */ if (virNetDevGetVfConfig(pfDevName, vf, &oldMAC, &oldVlanTag) < 0) @@ -1910,8 +1904,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, } } else { - if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s", stateDir, linkdev); } if (linkdev) { @@ -2016,8 +2009,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, */ if (pfDevName) { - if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); if (linkdev && !virFileExists(filePath)) { /* the device may have been stored in a file named for the @@ -2030,10 +2022,8 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } } - if (!pfDevName) { - if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0) - goto cleanup; - } + if (!pfDevName) + virAsprintf(&filePath, "%s/%s", stateDir, linkdev); if (!virFileExists(filePath)) { /* having no file to read is not necessarily an error, so we @@ -2913,8 +2903,7 @@ virNetDevRDMAFeature(const char *ifname, if (virDirOpen(&dirp, SYSFS_INFINIBAND_DIR) < 0) return -1; - if (virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0) - goto cleanup; + virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname); /* If /sys/class/net/<ifname>/device/resource doesn't exist it is not a PCI * device and therefore it will not have RDMA. */ @@ -2927,9 +2916,8 @@ virNetDevRDMAFeature(const char *ifname, goto cleanup; while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { - if (virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", - dp->d_name) < 0) - continue; + virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", + dp->d_name); if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0 && STREQ(eth_res_buf, ib_res_buf)) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b90bd55d32..b7e0c0c7c1 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -114,8 +114,7 @@ virNetDevBandwidthManipulateFilter(const char *ifname, } /* u32 filters must have 800:: prefix. Don't ask. */ - if (virAsprintf(&filter_id, "800::%u", id) < 0) - goto cleanup; + virAsprintf(&filter_id, "800::%u", id); if (remove_old) { int cmd_ret = 0; @@ -132,10 +131,9 @@ virNetDevBandwidthManipulateFilter(const char *ifname, if (create_new) { virMacAddrGetRaw(ifmac_ptr, ifmac); - if (virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], - ifmac[3], ifmac[4], ifmac[5]) < 0 || - virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]) < 0) - goto cleanup; + virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], + ifmac[3], ifmac[4], ifmac[5]); + virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]); virCommandFree(cmd); cmd = virCommandNew(TC); @@ -232,14 +230,11 @@ virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthClear(ifname); if (tx && tx->average) { - if (virAsprintf(&average, "%llukbps", tx->average) < 0) - goto cleanup; - if (tx->peak && - (virAsprintf(&peak, "%llukbps", tx->peak) < 0)) - goto cleanup; - if (tx->burst && - (virAsprintf(&burst, "%llukb", tx->burst) < 0)) - goto cleanup; + virAsprintf(&average, "%llukbps", tx->average); + if (tx->peak) + virAsprintf(&peak, "%llukbps", tx->peak); + if (tx->burst) + virAsprintf(&burst, "%llukb", tx->burst); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", @@ -362,10 +357,8 @@ virNetDevBandwidthSet(const char *ifname, } if (rx) { - if (virAsprintf(&average, "%llukbps", rx->average) < 0) - goto cleanup; - if (virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->average) < 0) - goto cleanup; + virAsprintf(&average, "%llukbps", rx->average); + virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->average); virCommandFree(cmd); cmd = virCommandNew(TC); @@ -575,13 +568,12 @@ virNetDevBandwidthPlug(const char *brname, return -1; } - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&qdisc_id, "%x:", id) < 0 || - virAsprintf(&floor, "%llukbps", bandwidth->in->floor) < 0 || - virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? - net_bandwidth->in->peak : - net_bandwidth->in->average) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&qdisc_id, "%x:", id); + virAsprintf(&floor, "%llukbps", bandwidth->in->floor); + virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? + net_bandwidth->in->peak : + net_bandwidth->in->average); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "class", "add", "dev", brname, "parent", "1:1", @@ -640,9 +632,8 @@ virNetDevBandwidthUnplug(const char *brname, return -1; } - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&qdisc_id, "%x:", id) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&qdisc_id, "%x:", id); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", brname, @@ -700,12 +691,11 @@ virNetDevBandwidthUpdateRate(const char *ifname, char *rate = NULL; char *ceil = NULL; - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&rate, "%llukbps", new_rate) < 0 || - virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? - bandwidth->in->peak : - bandwidth->in->average) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&rate, "%llukbps", new_rate); + virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? + bandwidth->in->peak : + bandwidth->in->average); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "class", "change", "dev", ifname, @@ -751,8 +741,7 @@ virNetDevBandwidthUpdateFilter(const char *ifname, int ret = -1; char *class_id = NULL; - if (virAsprintf(&class_id, "1:%x", id) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); if (virNetDevBandwidthManipulateFilter(ifname, ifmac_ptr, id, class_id, true, true) < 0) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index edf4cc6236..0a0834be69 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -122,8 +122,7 @@ static int virNetDevBridgeSet(const char *brname, { g_autofree char *path = NULL; - if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); if (virFileExists(path)) { char valuestr[INT_BUFSIZE_BOUND(value)]; @@ -165,8 +164,7 @@ static int virNetDevBridgeGet(const char *brname, g_autofree char *path = NULL; VIR_AUTOCLOSE fd = -1; - if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); if (virFileExists(path)) { g_autofree char *valuestr = NULL; @@ -223,9 +221,8 @@ virNetDevBridgePortSet(const char *brname, snprintf(valuestr, sizeof(valuestr), "%lu", value); - if (virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", - brname, ifname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); if (!virFileExists(path)) errno = EINVAL; @@ -251,9 +248,8 @@ virNetDevBridgePortGet(const char *brname, g_autofree char *path = NULL; g_autofree char *valuestr = NULL; - if (virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", - brname, ifname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) < 0) return -1; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 1bd18ea30a..057e75e5e1 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -487,9 +487,8 @@ virNetDevIPGetAcceptRA(const char *ifname) char *suffix; int accept_ra = -1; - if (virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", - ifname ? ifname : "all") < 0) - return -1; + virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", + ifname ? ifname : "all"); if ((virFileReadAll(path, 512, &buf) < 0) || (virStrToLong_i(buf, &suffix, 10, &accept_ra) < 0)) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2ccd83d1bb..11fcb96400 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -294,8 +294,7 @@ virNetDevMacVLanIsMacvtap(const char *ifname) if (virNetDevGetIndex(ifname, &ifindex) < 0) return false; - if (virAsprintf(&tapname, "/dev/tap%d", ifindex) < 0) - return false; + virAsprintf(&tapname, "/dev/tap%d", ifindex); return virFileExists(tapname); } @@ -393,8 +392,7 @@ virNetDevMacVLanTapOpen(const char *ifname, if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; - if (virAsprintf(&tapname, "/dev/tap%d", ifindex) < 0) - goto cleanup; + virAsprintf(&tapname, "/dev/tap%d", ifindex); for (i = 0; i < tapfdSize; i++) { int fd = -1; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 1d2bbf9dd7..9862e550b7 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,19 +151,13 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, virUUIDFormat(ovsport->interfaceID, ifuuidstr); virUUIDFormat(vmuuid, vmuuidstr); - if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", - macaddrstr) < 0) - return -1; - if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", - ifuuidstr) < 0) - return -1; - if (virAsprintf(&vmid_ex_id, "external-ids:vm-id=\"%s\"", - vmuuidstr) < 0) - return -1; + virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", + macaddrstr); + virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", ifuuidstr); + virAsprintf(&vmid_ex_id, "external-ids:vm-id=\"%s\"", vmuuidstr); if (ovsport->profileID[0] != '\0') { - if (virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"", - ovsport->profileID) < 0) - return -1; + virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"", + ovsport->profileID); } cmd = virCommandNew(OVSVSCTL); diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index fe4f55f8fc..23f2882bc3 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -395,8 +395,7 @@ int virNetDevTapCreate(char **ifname, for (i = 0; i <= IF_MAXUNIT; i++) { g_autofree char *newname = NULL; - if (virAsprintf(&newname, *ifname, i) < 0) - goto cleanup; + virAsprintf(&newname, *ifname, i); if (virNetDevExists(newname) == 0) { newifname = g_steal_pointer(&newname); @@ -416,8 +415,7 @@ int virNetDevTapCreate(char **ifname, if (tapfd) { g_autofree char *dev_path = NULL; - if (virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name) < 0) - goto cleanup; + virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name); if ((*tapfd = open(dev_path, O_RDWR)) < 0) { virReportSystemError(errno, diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 4e10cdf12b..5e5074dd68 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -44,8 +44,7 @@ static int virNetDevVethExists(int devNum) int ret; g_autofree char *path = NULL; - if (virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum); ret = virFileExists(path) ? 1 : 0; VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret); return ret; @@ -128,8 +127,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth1num = virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; - if (virAsprintf(&veth1auto, "vnet%d", veth1num) < 0) - goto cleanup; + virAsprintf(&veth1auto, "vnet%d", veth1num); vethNum = veth1num + 1; } if (!*veth2) { @@ -137,8 +135,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth2num = virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; - if (virAsprintf(&veth2auto, "vnet%d", veth2num) < 0) - goto cleanup; + virAsprintf(&veth2auto, "vnet%d", veth2num); vethNum = veth2num + 1; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 448833d8d1..e6213df6da 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -538,23 +538,20 @@ virNumaGetHugePageInfoPath(char **path, unsigned int page_size, const char *suffix) { - int ret; - if (node == -1) { /* We are aiming at overall system info */ - ret = virAsprintf(path, - HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", - page_size, NULLSTR_EMPTY(suffix)); + virAsprintf(path, + HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", + page_size, NULLSTR_EMPTY(suffix)); } else { /* We are aiming on specific NUMA node */ - ret = virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" - HUGEPAGES_PREFIX "%ukB/%s", - node, page_size, NULLSTR_EMPTY(suffix)); + virAsprintf(path, + HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" + HUGEPAGES_PREFIX "%ukB/%s", + node, page_size, NULLSTR_EMPTY(suffix)); } - if (ret >= 0 && !virFileExists(*path)) { - ret = -1; + if (!virFileExists(*path)) { if (node != -1) { if (!virNumaNodeIsAvailable(node)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -570,9 +567,10 @@ virNumaGetHugePageInfoPath(char **path, _("page size %u is not available"), page_size); } + return -1; } - return ret; + return 0; } static int @@ -582,9 +580,10 @@ virNumaGetHugePageInfoDir(char **path, int node) *path = g_strdup(HUGEPAGES_SYSTEM_PREFIX); return 0; } else { - return virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", - node); + virAsprintf(path, + HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", + node); + return 0; } } @@ -930,8 +929,7 @@ virNumaSetPagePoolSize(int node, * all the pages we wanted. So do the second read to check. */ VIR_FREE(nr_buf); - if (virAsprintf(&nr_buf, "%llu", page_count) < 0) - return -1; + virAsprintf(&nr_buf, "%llu", page_count); if (virFileWriteStr(nr_path, nr_buf, 0) < 0) { virReportSystemError(errno, diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..3ae13469bd 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -213,7 +213,7 @@ virPCIDriverDir(const char *driver) { char *buffer; - ignore_value(virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver)); + virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver); return buffer; } @@ -223,7 +223,7 @@ virPCIFile(const char *device, const char *file) { char *buffer; - ignore_value(virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, file)); + virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, file); return buffer; } @@ -604,8 +604,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr dev, int cfgfd) * device is a VF, we just assume FLR works */ - if (virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name) < 0) - return -1; + virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name); found = virFileExists(path); if (found) { @@ -1354,12 +1353,12 @@ virPCIDeviceAddressAsString(const virPCIDeviceAddress *addr) { char *str; - ignore_value(virAsprintf(&str, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function)); + virAsprintf(&str, + VIR_PCI_DEVICE_ADDRESS_FMT, + addr->domain, + addr->bus, + addr->slot, + addr->function); return str; } @@ -1381,14 +1380,10 @@ virPCIDeviceNew(unsigned int domain, dev->address.slot = slot; dev->address.function = function; - if (virAsprintf(&dev->name, - VIR_PCI_DEVICE_ADDRESS_FMT, - domain, bus, slot, function) < 0) - return NULL; + virAsprintf(&dev->name, VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus, slot, + function); - if (virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", - dev->name) < 0) - return NULL; + virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", dev->name); if (!virFileExists(dev->path)) { virReportSystemError(errno, @@ -1733,10 +1728,9 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, struct dirent *ent; int direrr; - if (virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, - dev->address.domain, dev->address.bus, - dev->address.slot, dev->address.function) < 0) - goto cleanup; + virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, + dev->address.domain, dev->address.bus, dev->address.slot, + dev->address.function); if (virDirOpen(&dir, pcidir) < 0) goto cleanup; @@ -1753,8 +1747,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, STREQ(ent->d_name, "vendor") || STREQ(ent->d_name, "device") || STREQ(ent->d_name, "reset")) { - if (virAsprintf(&file, "%s/%s", pcidir, ent->d_name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s", pcidir, ent->d_name); if ((actor)(dev, file, opaque) < 0) goto cleanup; } @@ -1786,10 +1779,9 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddressPtr orig, struct dirent *ent; int direrr; - if (virAsprintf(&groupPath, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", - orig->domain, orig->bus, orig->slot, orig->function) < 0) - goto cleanup; + virAsprintf(&groupPath, + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", + orig->domain, orig->bus, orig->slot, orig->function); if (virDirOpenQuiet(&groupDir, groupPath) < 0) { /* just process the original device, nothing more */ @@ -1936,10 +1928,8 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) const char *groupNumStr; unsigned int groupNum; - if (virAsprintf(&devName, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, addr->bus, addr->slot, addr->function) < 0) - return -1; + virAsprintf(&devName, VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->bus, + addr->slot, addr->function); if (!(devPath = virPCIFile(devName, "iommu_group"))) return -1; @@ -1989,9 +1979,7 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) dev->name, devPath); return NULL; } - if (virAsprintf(&groupDev, "/dev/vfio/%s", - last_component(groupPath)) < 0) - return NULL; + virAsprintf(&groupDev, "/dev/vfio/%s", last_component(groupPath)); return groupDev; } @@ -2290,8 +2278,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, *num_virtual_functions = 0; *max_virtual_functions = 0; - if (virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path) < 0) - goto error; + virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path); if (virFileExists(totalvfs_file)) { char *end = NULL; /* so that terminating \n doesn't create error */ @@ -2308,8 +2295,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, do { g_autofree char *device_link = NULL; /* look for virtfn%d links until one isn't found */ - if (virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, *num_virtual_functions) < 0) - goto error; + virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, + *num_virtual_functions); if (!virFileExists(device_link)) break; @@ -2350,9 +2337,7 @@ virPCIIsVirtualFunction(const char *vf_sysfs_device_link) { g_autofree char *vf_sysfs_physfn_link = NULL; - if (virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", - vf_sysfs_device_link) < 0) - return -1; + virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", vf_sysfs_device_link); return virFileExists(vf_sysfs_physfn_link); } @@ -2410,9 +2395,8 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link, int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) { - if (virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", - virPCIDeviceName) < 0) - return -1; + virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", + virPCIDeviceName); return 0; } @@ -2420,11 +2404,9 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, char **pci_sysfs_device_link) { - if (virAsprintf(pci_sysfs_device_link, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, addr->bus, - addr->slot, addr->function) < 0) - return -1; + virAsprintf(pci_sysfs_device_link, + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, + addr->bus, addr->slot, addr->function); return 0; } @@ -2609,8 +2591,7 @@ virPCIGetMdevTypes(const char *sysfspath, size_t ntypes = 0; size_t i; - if (virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath) < 0) - return -1; + virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath); if ((dirret = virDirOpenIfExists(&dir, types_path)) < 0) goto cleanup; @@ -2623,8 +2604,7 @@ virPCIGetMdevTypes(const char *sysfspath, while ((dirret = virDirRead(dir, &entry, types_path)) > 0) { g_autofree char *tmppath = NULL; /* append the type id to the path and read the attributes from there */ - if (virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name) < 0) - goto cleanup; + virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name); if (virMediatedDeviceTypeReadAttrs(tmppath, &mdev_type) < 0) goto cleanup; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index f7849d91a6..2faa6215e4 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -233,8 +233,7 @@ int virPidFileReadPathIfAlive(const char *path, goto cleanup; } - if (virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid) < 0) - return -ENOMEM; + virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid); if ((ret = virFileIsLink(procPath)) < 0) return ret; @@ -495,8 +494,7 @@ virPidFileConstructPath(bool privileged, "%s", _("No runstatedir specified")); return -1; } - if (virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname) < 0) - return -1; + virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname); } else { if (!(rundir = virGetUserRuntimeDirectory())) return -1; @@ -508,8 +506,7 @@ virPidFileConstructPath(bool privileged, return -1; } - if (virAsprintf(pidfile, "%s/%s.pid", rundir, progname) < 0) - return -1; + virAsprintf(pidfile, "%s/%s.pid", rundir, progname); } return 0; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b5fda05e0c..032d09e904 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - ignore_value(virAsprintfQuiet(&buf, _("exit status %d"), - WEXITSTATUS(status))); + virAsprintfQuiet(&buf, _("exit status %d"), + WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - ignore_value(virAsprintfQuiet(&buf, _("fatal signal %d"), - WTERMSIG(status))); + virAsprintfQuiet(&buf, _("fatal signal %d"), + WTERMSIG(status)); } else { - ignore_value(virAsprintfQuiet(&buf, _("invalid value %d"), status)); + virAsprintfQuiet(&buf, _("invalid value %d"), status); } return buf; } @@ -586,8 +586,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) *npids = 0; *pids = NULL; - if (virAsprintf(&taskPath, "/proc/%llu/task", (long long) pid) < 0) - goto cleanup; + virAsprintf(&taskPath, "/proc/%llu/task", (long long)pid); if (virDirOpen(&dir, taskPath) < 0) goto cleanup; @@ -632,10 +631,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; g_autofree char *nsfile = NULL; - if (virAsprintf(&nsfile, "/proc/%llu/ns/%s", - (long long) pid, - ns[i]) < 0) - goto cleanup; + virAsprintf(&nsfile, "/proc/%llu/ns/%s", (long long)pid, ns[i]); if ((fd = open(nsfile, O_RDONLY)) >= 0) { if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { @@ -954,8 +950,7 @@ int virProcessGetStartTime(pid_t pid, g_autofree char *buf = NULL; VIR_AUTOSTRINGLIST tokens = NULL; - if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0) - return -1; + virAsprintf(&filename, "/proc/%llu/stat", (long long)pid); if ((len = virFileReadAll(filename, 1024, &buf)) < 0) return -1; @@ -1054,8 +1049,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, int ret = -1; g_autofree char *path = NULL; - if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long) data->pid) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/mnt", (long long)data->pid); if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 162c3c603f..1eee238771 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -89,8 +89,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member = virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix = NULL; - if (virAsprintf(&prefix, "%s.%zu", key, i) < 0) - return 0; + virAsprintf(&prefix, "%s.%zu", key, i); if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, virQEMUBuildCommandLineJSONArrayNumbered, @@ -113,8 +112,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, if (data->prefix) { g_autofree char *tmpkey = NULL; - if (virAsprintf(&tmpkey, "%s.%s", data->prefix, key) < 0) - return -1; + virAsprintf(&tmpkey, "%s.%s", data->prefix, key); return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, data->arrayFunc, false); diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 8dcab1ac47..12ea9bbbdc 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -194,8 +194,7 @@ virRandomGenerateWWN(char **wwn, return -1; } - if (virAsprintf(wwn, "5" "%s%09llx", oui, - (unsigned long long)virRandomBits(36)) < 0) - return -1; + virAsprintf(wwn, "5" "%s%09llx", oui, + (unsigned long long)virRandomBits(36)); return 0; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 29ea52a16f..55c15d04a4 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2319,8 +2319,7 @@ virResctrlDeterminePath(const char *parentpath, return NULL; } - if (virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id) < 0) - return NULL; + virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id); return path; } @@ -2416,8 +2415,7 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, if (!alloc_str) goto cleanup; - if (virAsprintf(&schemata_path, "%s/schemata", alloc->path) < 0) - goto cleanup; + virAsprintf(&schemata_path, "%s/schemata", alloc->path); VIR_DEBUG("Writing resctrl schemata '%s' into '%s'", alloc_str, schemata_path); if (virFileWriteStr(schemata_path, alloc_str, 0) < 0) { @@ -2451,11 +2449,9 @@ virResctrlAddPID(const char *path, return -1; } - if (virAsprintf(&tasks, "%s/tasks", path) < 0) - return -1; + virAsprintf(&tasks, "%s/tasks", path); - if (virAsprintf(&pidstr, "%lld", (long long int) pid) < 0) - goto cleanup; + virAsprintf(&pidstr, "%lld", (long long int)pid); if (virFileWriteStr(tasks, pidstr, 0) < 0) { virReportSystemError(errno, @@ -2566,8 +2562,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitorPtr monitor, return 0; } - if (virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path) < 0) - return -1; + virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path); monitor->path = virResctrlDeterminePath(parentpath, machinename, monitor->id); @@ -2699,8 +2694,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, return -1; } - if (virAsprintf(&datapath, "%s/mon_data", monitor->path) < 0) - return -1; + virAsprintf(&datapath, "%s/mon_data", monitor->path); if (virDirOpen(&dirp, datapath) < 0) goto cleanup; @@ -2717,8 +2711,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, * "mon_L3_01" are two target directories for a two nodes system * with resource utilization data file for each node respectively. */ - if (virAsprintf(&filepath, "%s/%s", datapath, ent->d_name) < 0) - goto cleanup; + virAsprintf(&filepath, "%s/%s", datapath, ent->d_name); if (!virFileIsDir(filepath)) continue; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 82a677b743..826a3db2c2 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -195,8 +195,7 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr file) for (i = 0; i < file->maxbackup; i++) { char *oldpath; - if (virAsprintf(&oldpath, "%s.%zu", file->basepath, i) < 0) - return -1; + virAsprintf(&oldpath, "%s.%zu", file->basepath, i); if (unlink(oldpath) < 0 && errno != ENOENT) { @@ -308,8 +307,7 @@ virRotatingFileReaderNew(const char *path, for (i = 0; i < maxbackup; i++) { char *tmppath; - if (virAsprintf(&tmppath, "%s.%zu", path, i) < 0) - goto error; + virAsprintf(&tmppath, "%s.%zu", path, i); file->entries[file->nentries - (i + 2)] = virRotatingFileReaderEntryNew(tmppath); VIR_FREE(tmppath); @@ -382,15 +380,13 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) goto cleanup; } } else { - if (virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxbackup - 1) < 0) - return -1; + virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxbackup - 1); for (i = file->maxbackup; i > 0; i--) { if (i == 1) { thispath = g_strdup(file->basepath); } else { - if (virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2) < 0) - goto cleanup; + virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2); } VIR_DEBUG("Rollover %s -> %s", thispath, nextpath); diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 705571f8ec..0f28c617b0 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -117,10 +117,8 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; - if (virAsprintf(&path, - "%s/%d:%u:%u:%llu/scsi_generic", - prefix, adapter_id, bus, target, unit) < 0) - return NULL; + virAsprintf(&path, "%s/%d:%u:%u:%llu/scsi_generic", prefix, adapter_id, + bus, target, unit); if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -156,10 +154,8 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; - if (virAsprintf(&path, - "%s/%d:%u:%u:%llu/block", - prefix, adapter_id, bus, target, unit) < 0) - return NULL; + virAsprintf(&path, "%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, + target, unit); if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -207,11 +203,10 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &dev->adapter) < 0) return NULL; - if (virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, - dev->bus, dev->target, dev->unit) < 0 || - virAsprintf(&dev->sg_path, "%s/%s", - sysfs_prefix ? sysfs_prefix : "/dev", sg) < 0) - return NULL; + virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, + dev->bus, dev->target, dev->unit); + virAsprintf(&dev->sg_path, "%s/%s", + sysfs_prefix ? sysfs_prefix : "/dev", sg); if (!virFileExists(dev->sg_path)) { virReportSystemError(errno, @@ -220,11 +215,8 @@ virSCSIDeviceNew(const char *sysfs_prefix, return NULL; } - if (virAsprintf(&vendor_path, - "%s/%s/vendor", prefix, dev->name) < 0 || - virAsprintf(&model_path, - "%s/%s/model", prefix, dev->name) < 0) - return NULL; + virAsprintf(&vendor_path, "%s/%s/vendor", prefix, dev->name); + virAsprintf(&model_path, "%s/%s/model", prefix, dev->name); if (virFileReadAll(vendor_path, 1024, &vendor) < 0) return NULL; @@ -235,8 +227,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, virTrimSpaces(vendor, NULL); virTrimSpaces(model, NULL); - if (virAsprintf(&dev->id, "%s:%s", vendor, model) < 0) - return NULL; + virAsprintf(&dev->id, "%s:%s", vendor, model); ret = g_steal_pointer(&dev); return ret; diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index 10524f49fa..53da460fdf 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -52,10 +52,8 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix, char *buf = NULL; int unique_id; - if (virAsprintf(&sysfs_path, "%s/host%d/unique_id", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, - host) < 0) - return -1; + virAsprintf(&sysfs_path, "%s/host%d/unique_id", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); if (virFileReadAll(sysfs_path, 1024, &buf) < 0) goto cleanup; @@ -118,8 +116,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, if (!virFileIsLink(entry->d_name)) continue; - if (virAsprintf(&host_link, "%s/%s", prefix, entry->d_name) < 0) - goto cleanup; + virAsprintf(&host_link, "%s/%s", prefix, entry->d_name); if (virFileResolveLink(host_link, &host_path) < 0) goto cleanup; @@ -132,9 +129,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, VIR_FREE(host_link); VIR_FREE(host_path); - if (virAsprintf(&unique_path, "%s/%s/unique_id", prefix, - entry->d_name) < 0) - goto cleanup; + virAsprintf(&unique_path, "%s/%s/unique_id", prefix, entry->d_name); if (!virFileExists(unique_path)) { VIR_FREE(unique_path); @@ -240,9 +235,8 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, char *name = NULL; char *parentaddr = NULL; - if (virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", - domain, bus, slot, function) < 0) - goto cleanup; + virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", domain, bus, slot, + function); if (!(name = virSCSIHostFindByPCI(NULL, parentaddr, unique_id))) { virReportError(VIR_ERR_XML_ERROR, _("Failed to find scsi_host using PCI '%s' " diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 5f523636be..4687c30f97 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -256,9 +256,7 @@ virSCSIVHostDeviceNew(const char *name) dev->name = g_strdup(name); - if (virAsprintf(&dev->path, "%s/%s", - SYSFS_VHOST_SCSI_DEVICES, name) < 0) - return NULL; + virAsprintf(&dev->path, "%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); VIR_DEBUG("%s: initialized", dev->name); diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index efe942b44c..ba1cde05cd 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -477,9 +477,8 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * nicely for UNIX sockets */ if (addr->data.sa.sa_family == AF_UNIX) { if (withService) { - if (virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR"%s0", - separator ? separator : ":") < 0) - return NULL; + virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR "%s0", + separator ? separator : ":"); } else { addrstr = g_strdup(VIR_LOOPBACK_IPV4_ADDR); } @@ -503,16 +502,12 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * a.b.c.d;port or e:f:g:h:i:j:k:l;port, so use square brackets for * IPv6 only if no separator is passed to the function */ - if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET6) { - if (virAsprintf(&ipv6_host, "[%s]", host) < 0) - return NULL; - } + if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET6) + virAsprintf(&ipv6_host, "[%s]", host); - if (virAsprintf(&addrstr, "%s%s%s", - ipv6_host ? ipv6_host : host, - separator ? separator : ":", port) == -1) { - return NULL; - } + virAsprintf(&addrstr, "%s%s%s", + ipv6_host ? ipv6_host : host, + separator ? separator : ":", port); } else { addrstr = g_strdup(host); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index be2b5479bb..f3b388a7bc 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1541,7 +1541,7 @@ virStorageFileGetNPIVKey(const char *path, *tmp = '\0'; if (*serial != '\0' && *port != '\0') - ignore_value(virAsprintf(key, "%s_PORT%s", serial, port)); + virAsprintf(key, "%s_PORT%s", serial, port); } return 0; @@ -2620,11 +2620,9 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, } if (STRNEQ(dirname, "/")) { - if (virAsprintf(&def->path, "%s/%s", dirname, rel) < 0) - return NULL; + virAsprintf(&def->path, "%s/%s", dirname, rel); } else { - if (virAsprintf(&def->path, "/%s", rel) < 0) - return NULL; + virAsprintf(&def->path, "/%s", rel); } if (virStorageSourceGetActualType(parent) == VIR_STORAGE_TYPE_NETWORK) { @@ -3283,8 +3281,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src, *port = '\0'; } - if (virAsprintf(&src->path, "%s/%s", target, lun) < 0) - return -1; + virAsprintf(&src->path, "%s/%s", target, lun); /* Libvirt doesn't handle inline authentication. Make the caller aware. */ if (virJSONValueObjectGetString(json, "user") || @@ -4196,8 +4193,7 @@ virStorageFileGetRelativeBackingPath(virStorageSourcePtr top, VIR_FREE(path); - if (virAsprintf(&path, "%s%s", tmp, next->relPath) < 0) - return -1; + virAsprintf(&path, "%s%s", tmp, next->relPath); VIR_FREE(tmp); diff --git a/src/util/virstring.c b/src/util/virstring.c index 4294b7456e..24a9e41493 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -709,18 +709,15 @@ int virDoubleToStr(char **strp, double number) { virLocale oldlocale; - int rc = -1; if (virLocaleSetRaw(&oldlocale) < 0) return -1; - rc = virAsprintf(strp, "%lf", number); + virAsprintf(strp, "%lf", number); virLocaleRevert(&oldlocale); virLocaleFixupRadix(strp); - if (rc < 0) - return -1; return 0; } diff --git a/src/util/virstring.h b/src/util/virstring.h index f5e2302b8b..d7881be2d1 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -111,7 +111,7 @@ int virStrToDouble(char const *s, G_GNUC_WARN_UNUSED_RESULT; int virDoubleToStr(char **strp, double number) - ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1); void virSkipSpaces(const char **str) ATTRIBUTE_NONNULL(1); void virSkipSpacesAndBackslash(const char **str) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 2ff0341b11..bb6ee24f4e 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -301,8 +301,7 @@ int virSystemdCreateMachine(const char *name, ret = -1; - if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) - goto cleanup; + virAsprintf(&creatorname, "libvirt-%s", drivername); if (partition) { if (!(slicename = virSystemdMakeSliceName(partition))) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 9244697902..149a82310d 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -59,33 +59,31 @@ virTPMCreateCancelPath(const char *devpath) const char *dev; const char *prefix[] = {"misc/", "tpm/"}; size_t i; - - if (devpath) { - dev = strrchr(devpath, '/'); - if (dev) { - dev++; - for (i = 0; i < G_N_ELEMENTS(prefix); i++) { - if (virAsprintf(&path, "/sys/class/%s%s/device/cancel", - prefix[i], dev) < 0) - goto cleanup; - - if (virFileExists(path)) - break; - - VIR_FREE(path); - } - if (!path) - path = g_strdup("/dev/null"); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("TPM device path %s is invalid"), devpath); - } - } else { + if (!devpath) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing TPM device path")); + return NULL; } - cleanup: + if (!(dev = strrchr(devpath, '/'))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("TPM device path %s is invalid"), devpath); + return NULL; + } + + dev++; + for (i = 0; i < G_N_ELEMENTS(prefix); i++) { + virAsprintf(&path, "/sys/class/%s%s/device/cancel", prefix[i], + dev); + + if (virFileExists(path)) + break; + + VIR_FREE(path); + } + if (!path) + path = g_strdup("/dev/null"); + return path; } diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f50d926860..d8c296c138 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -176,22 +176,22 @@ virTypedParameterToString(virTypedParameterPtr param) switch (param->type) { case VIR_TYPED_PARAM_INT: - ignore_value(virAsprintf(&value, "%d", param->value.i)); + virAsprintf(&value, "%d", param->value.i); break; case VIR_TYPED_PARAM_UINT: - ignore_value(virAsprintf(&value, "%u", param->value.ui)); + virAsprintf(&value, "%u", param->value.ui); break; case VIR_TYPED_PARAM_LLONG: - ignore_value(virAsprintf(&value, "%lld", param->value.l)); + virAsprintf(&value, "%lld", param->value.l); break; case VIR_TYPED_PARAM_ULLONG: - ignore_value(virAsprintf(&value, "%llu", param->value.ul)); + virAsprintf(&value, "%llu", param->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - ignore_value(virAsprintf(&value, "%g", param->value.d)); + virAsprintf(&value, "%g", param->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: - ignore_value(virAsprintf(&value, "%d", param->value.b)); + virAsprintf(&value, "%d", param->value.b); break; case VIR_TYPED_PARAM_STRING: value = g_strdup(param->value.s); diff --git a/src/util/viruri.c b/src/util/viruri.c index 3532fa5576..241e4ea102 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -234,8 +234,7 @@ virURIFormat(virURIPtr uri) if (xmluri.server != NULL && strchr(xmluri.server, ':') != NULL) { - if (virAsprintf(&tmpserver, "[%s]", xmluri.server) < 0) - return NULL; + virAsprintf(&tmpserver, "[%s]", xmluri.server); xmluri.server = tmpserver; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 5a9f369ac1..3e97480b1a 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -85,14 +85,11 @@ VIR_ONCE_GLOBAL_INIT(virUSB); static int virUSBSysReadFile(const char *f_name, const char *d_name, int base, unsigned int *value) { - int tmp; g_autofree char *buf = NULL; g_autofree char *filename = NULL; char *ignore = NULL; - tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); - if (tmp < 0) - return -1; + virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); if (virFileReadAll(filename, 1024, &buf) < 0) return -1; @@ -315,7 +312,6 @@ virUSBDeviceNew(unsigned int bus, const char *vroot) { virUSBDevicePtr dev; - int rc; if (VIR_ALLOC(dev) < 0) return NULL; @@ -333,16 +329,11 @@ virUSBDeviceNew(unsigned int bus, } if (vroot) { - rc = virAsprintf(&dev->path, "%s/%03d/%03d", - vroot, dev->bus, dev->dev); + virAsprintf(&dev->path, "%s/%03d/%03d", + vroot, dev->bus, dev->dev); } else { - rc = virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", - dev->bus, dev->dev); - } - - if (rc < 0) { - virUSBDeviceFree(dev); - return NULL; + virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", + dev->bus, dev->dev); } /* XXX fixme. this should be product/vendor */ diff --git a/src/util/virutil.c b/src/util/virutil.c index f2528e257c..705fb6bd74 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -744,11 +744,11 @@ static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir) char *home = NULL; if (path && path[0]) { - ignore_value(virAsprintf(&ret, "%s/libvirt", path)); + virAsprintf(&ret, "%s/libvirt", path); } else { home = virGetUserDirectory(); if (home) - ignore_value(virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir)); + virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir); } VIR_FREE(home); @@ -774,7 +774,7 @@ char *virGetUserRuntimeDirectory(void) } else { char *ret; - ignore_value(virAsprintf(&ret, "%s/libvirt", path)); + virAsprintf(&ret, "%s/libvirt", path); return ret; } } @@ -1587,9 +1587,9 @@ virGetUnprivSGIOSysfsPath(const char *path, return NULL; } - ignore_value(virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min)); + virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, + maj, min); return sysfs_path; } @@ -1612,8 +1612,7 @@ virSetDeviceUnprivSGIO(const char *path, goto cleanup; } - if (virAsprintf(&val, "%d", unpriv_sgio) < 0) - goto cleanup; + virAsprintf(&val, "%d", unpriv_sgio); if ((rc = virFileWriteStr(sysfs_path, val, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), sysfs_path); @@ -1878,8 +1877,7 @@ virHostGetDRMRenderNode(void) goto cleanup; } - if (virAsprintf(&ret, "%s/%s", driPath, ent->d_name) < 0) - goto cleanup; + virAsprintf(&ret, "%s/%s", driPath, ent->d_name); cleanup: VIR_DIR_CLOSE(driDir); diff --git a/src/util/virvhba.c b/src/util/virvhba.c index dbbd8d0f52..c78d5e2cd9 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -52,10 +52,8 @@ virVHBAPathExists(const char *sysfs_prefix, char *sysfs_path = NULL; bool ret = false; - if (virAsprintf(&sysfs_path, "%s/host%d", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host) < 0) - return false; + virAsprintf(&sysfs_path, "%s/host%d", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host); if (virFileExists(sysfs_path)) ret = true; @@ -85,24 +83,17 @@ virVHBAIsVportCapable(const char *sysfs_prefix, char *fc_host_path = NULL; bool ret = false; - if (virAsprintf(&fc_host_path, - "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host, - "vport_create") < 0) - return false; + virAsprintf(&fc_host_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, + "vport_create"); - if (virAsprintf(&scsi_host_path, - "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, - host, - "vport_create") < 0) - goto cleanup; + virAsprintf(&scsi_host_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host, + "vport_create"); if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret = true; - cleanup: VIR_FREE(fc_host_path); VIR_FREE(scsi_host_path); return ret; @@ -129,10 +120,8 @@ virVHBAGetConfig(const char *sysfs_prefix, char *buf = NULL; char *result = NULL; - if (virAsprintf(&sysfs_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host, entry) < 0) - goto cleanup; + virAsprintf(&sysfs_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, entry); if (!virFileExists(sysfs_path)) goto cleanup; @@ -269,15 +258,13 @@ virVHBAManageVport(const int parent_host, goto cleanup; } - if (virAsprintf(&operation_path, "%s/host%d/%s", - SYSFS_FC_HOST_PATH, parent_host, operation_file) < 0) - goto cleanup; + virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_FC_HOST_PATH, + parent_host, operation_file); if (!virFileExists(operation_path)) { VIR_FREE(operation_path); - if (virAsprintf(&operation_path, "%s/host%d/%s", - SYSFS_SCSI_HOST_PATH, parent_host, operation_file) < 0) - goto cleanup; + virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_SCSI_HOST_PATH, + parent_host, operation_file); if (!virFileExists(operation_path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -294,8 +281,7 @@ virVHBAManageVport(const int parent_host, * in calling either the Add or Remove device functions. This translates * into either adding or removing a node device object and a node device * lifecycle event for applications to consume. */ - if (virAsprintf(&vport_name, "%s:%s", wwpn, wwnn) < 0) - goto cleanup; + virAsprintf(&vport_name, "%s:%s", wwpn, wwnn); if (virFileWriteStr(operation_path, vport_name, 0) == 0) ret = 0; @@ -335,8 +321,7 @@ vhbaReadCompareWWN(const char *prefix, char *p; int ret = -1; - if (virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name) < 0) - return -1; + virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name); if (!virFileExists(path)) { ret = 0; @@ -440,9 +425,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, /* Existing vHBA's will have the same fabric_name, but won't * have the vport_create file - so we check for both */ - if (virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, - entry->d_name) < 0) - goto cleanup; + virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, + entry->d_name); if (!virFileExists(vport_create_path)) continue; -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vbox/vbox_XPCOMCGlue.c | 3 +- src/vbox/vbox_common.c | 62 +++++++++++++++-------------------- src/vbox/vbox_network.c | 13 +++----- src/vbox/vbox_snapshot_conf.c | 18 ++++------ src/vbox/vbox_storage.c | 5 ++- src/vbox/vbox_tmpl.c | 32 ++++++++---------- 6 files changed, 53 insertions(+), 80 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index a20b1c2a36..09768d5d38 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -85,8 +85,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; if (dir != NULL) { - if (virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME) < 0) - return -1; + virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME); if (!virFileExists(name)) { if (!ignoreMissing) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 475b3a3147..6ffa43addc 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1770,13 +1770,12 @@ vboxAttachUSB(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) /* Zero pad for nice alignment when fewer than 9999 * devices. */ - if (virAsprintf(&filtername, "filter%04zu", i) >= 0) { - VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); - VIR_FREE(filtername); - gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, - filternameUtf16, - &filter); - } + virAsprintf(&filtername, "filter%04zu", i); + VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); + VIR_FREE(filtername); + gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, + filternameUtf16, + &filter); VBOX_UTF16_FREE(filternameUtf16); if (!filter) @@ -2127,10 +2126,9 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid if (guiPresent) { if (guiDisplay) { char *displayutf8; - if (virAsprintf(&displayutf8, "DISPLAY=%s", guiDisplay) >= 0) { - VBOX_UTF8_TO_UTF16(displayutf8, &env); - VIR_FREE(displayutf8); - } + virAsprintf(&displayutf8, "DISPLAY=%s", guiDisplay); + VBOX_UTF8_TO_UTF16(displayutf8, &env); + VIR_FREE(displayutf8); VIR_FREE(guiDisplay); } @@ -2140,10 +2138,9 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid if (sdlPresent) { if (sdlDisplay) { char *displayutf8; - if (virAsprintf(&displayutf8, "DISPLAY=%s", sdlDisplay) >= 0) { - VBOX_UTF8_TO_UTF16(displayutf8, &env); - VIR_FREE(displayutf8); - } + virAsprintf(&displayutf8, "DISPLAY=%s", sdlDisplay); + VBOX_UTF8_TO_UTF16(displayutf8, &env); + VIR_FREE(displayutf8); VIR_FREE(sdlDisplay); } @@ -4619,8 +4616,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - if (virAsprintf(&nameTmpUse, "%s.vbox", machineName) < 0) - goto cleanup; + virAsprintf(&nameTmpUse, "%s.vbox", machineName); machineLocationPath = virStringReplace(settingsFilePath_Utf8, nameTmpUse, ""); if (machineLocationPath == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4636,9 +4632,8 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } if (snapshotMachineDesc->currentSnapshot != NULL) { - if (virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", machineLocationPath, - snapshotMachineDesc->currentSnapshot) < 0) - goto cleanup; + virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnapshot); snapshotFileExists = virFileExists(currentSnapshotXmlFilePath); } @@ -5206,8 +5201,8 @@ vboxSnapshotRedefine(virDomainPtr dom, vboxIIDUnalloc(&parentiid); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); - if (virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", machineLocationPath, it) < 0) - goto cleanup; + virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", + machineLocationPath, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc = gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -5305,8 +5300,8 @@ vboxSnapshotRedefine(virDomainPtr dom, * next define. This file is saved as "'machineLocation'/snapshot-'uuid'.xml" */ VIR_FREE(currentSnapshotXmlFilePath); - if (virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", machineLocationPath, snapshotMachineDesc->currentSnapshot) < 0) - goto cleanup; + virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnapshot); char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, data->caps, data->xmlopt, @@ -6893,8 +6888,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) goto cleanup; } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - if (virAsprintf(&nameTmpUse, "%s.vbox", machineName) < 0) - goto cleanup; + virAsprintf(&nameTmpUse, "%s.vbox", machineName); machineLocationPath = virStringReplace(settingsFilepath, nameTmpUse, ""); if (machineLocationPath == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6978,9 +6972,8 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) VBOX_UTF16_FREE(locationUtf16); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); - if (virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", - machineLocationPath, def->parent.parent_name, it) < 0) - goto cleanup; + virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", + machineLocationPath, def->parent.parent_name, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc = gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -7383,17 +7376,14 @@ vboxDomainScreenshot(virDomainPtr dom, return NULL; } - if ((privileged && virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR) < 0) || - (!privileged && !(cacheDir = virGetUserCacheDirectory()))) { + if (privileged) { + virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR); + } else if (!(cacheDir = virGetUserCacheDirectory())) { VBOX_RELEASE(machine); return NULL; } - if (virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir) < 0) { - VBOX_RELEASE(machine); - VIR_FREE(cacheDir); - return NULL; - } + virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir); if ((tmp_fd = mkostemp(tmp, O_CLOEXEC)) == -1) { virReportSystemError(errno, _("mkostemp(\"%s\") failed"), tmp); diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 9e632ab709..a942587bcb 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -432,8 +432,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) VBOX_UTF16_TO_UTF8(networkInterfaceNameUtf16, &networkInterfaceNameUtf8); - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", networkInterfaceNameUtf8) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", + networkInterfaceNameUtf8); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); @@ -588,8 +588,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) * show up in the net-list in virsh */ - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); @@ -693,8 +692,7 @@ static int vboxNetworkCreate(virNetworkPtr network) * server by giving the machine static IP */ - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); @@ -791,8 +789,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) def->ips = ipdef; def->nips = 1; - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 8cdfb35357..8c92d8797b 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -84,8 +84,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlNodePtr diskNode, } if (location[0] != '/') { /*The location is a relative path, so we must change it into an absolute one. */ - if (virAsprintf(&tmp, "%s%s", machineLocation, location) < 0) - goto cleanup; + virAsprintf(&tmp, "%s%s", machineLocation, location); hardDisk->location = g_strdup(tmp); } else { hardDisk->location = g_strdup(location); @@ -331,8 +330,7 @@ virVBoxSnapshotConfCreateHardDiskNode(virVBoxSnapshotConfHardDiskPtr hardDisk) size_t i = 0; char *uuid = NULL; xmlNodePtr ret = xmlNewNode(NULL, BAD_CAST "HardDisk"); - if (virAsprintf(&uuid, "{%s}", hardDisk->uuid) < 0) - goto cleanup; + virAsprintf(&uuid, "{%s}", hardDisk->uuid); if (xmlNewProp(ret, BAD_CAST "uuid", BAD_CAST uuid) == NULL) goto cleanup; @@ -378,8 +376,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, char **secondRegex = NULL; int secondRegexResult = 0; - if (virAsprintf(&uuid, "{%s}", snapshot->uuid) < 0) - goto cleanup; + virAsprintf(&uuid, "{%s}", snapshot->uuid); if (xmlNewProp(node, BAD_CAST "uuid", BAD_CAST uuid) == NULL) goto cleanup; @@ -400,8 +397,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, goto cleanup; if (secondRegexResult < 1) goto cleanup; - if (virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]) < 0) - goto cleanup; + virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) == NULL) goto cleanup; @@ -1073,8 +1069,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, } if (machine->currentSnapshot != NULL) { - if (virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot) < 0) - goto cleanup; + virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot); if (!xmlNewProp(machineNode, BAD_CAST "currentSnapshot", BAD_CAST currentSnapshot)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); @@ -1111,8 +1106,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, if (secondRegexResult < 1) goto cleanup; - if (virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]) < 0) - goto cleanup; + virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); if (!xmlNewProp(machineNode, BAD_CAST "lastStateChange", BAD_CAST timeStamp)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index c7bea2c219..8cd1b20628 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -448,9 +448,8 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, } /* If target.path isn't given, use default path ~/.VirtualBox/image_name */ - if (def->target.path == NULL && - virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDirectory(), def->name) < 0) - goto cleanup; + if (!def->target.path) + virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDirectory(), def->name); VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16); if (!hddFormatUtf16 || !hddNameUtf16) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 72011199cf..88e7deaea0 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -613,29 +613,23 @@ _virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine **mac { vboxIID iid = VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 = NULL; + char *createFlags = NULL; + PRUnichar *createFlagsUtf16 = NULL; nsresult rc = -1; VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); - { - char *createFlags = NULL; - PRUnichar *createFlagsUtf16 = NULL; - - if (virAsprintf(&createFlags, - "UUID=%s,forceOverwrite=0", uuidstr) < 0) - goto cleanup; - VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); - rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, - NULL, - machineNameUtf16, - 0, - nsnull, - nsnull, - createFlagsUtf16, - machine); - cleanup: - VIR_FREE(createFlags); - } + virAsprintf(&createFlags, "UUID=%s,forceOverwrite=0", uuidstr); + VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); + rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, + NULL, + machineNameUtf16, + 0, + nsnull, + nsnull, + createFlagsUtf16, + machine); + VIR_FREE(createFlags); VBOX_UTF16_FREE(machineNameUtf16); vboxIIDUnalloc(&iid); return rc; -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vmx/vmx.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0d1d87bac6..6f47546edf 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2081,8 +2081,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - if (virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit) < 0) - goto cleanup; + virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit); (*def)->dst = virIndexToDiskName @@ -2104,8 +2103,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - if (virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit) < 0) - goto cleanup; + virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit); (*def)->dst = virIndexToDiskName(controllerOrBus * 2 + unit, "hd"); @@ -2134,8 +2132,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - if (virAsprintf(&prefix, "floppy%d", unit) < 0) - goto cleanup; + virAsprintf(&prefix, "floppy%d", unit); (*def)->dst = virIndexToDiskName(unit, "fd"); @@ -2842,9 +2839,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, (*def)->source->data.tcp.host = g_strdup(parsedUri->server); - if (virAsprintf(&(*def)->source->data.tcp.service, "%d", - parsedUri->port) < 0) - goto cleanup; + virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->port); /* See vSphere API documentation about VirtualSerialPortURIBackingInfo */ if (parsedUri->scheme == NULL || -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/commandtest.c | 27 +++---- tests/cputest.c | 95 +++++++++--------------- tests/domaincapstest.c | 26 +++---- tests/domainconftest.c | 5 +- tests/fchosttest.c | 7 +- tests/fdstreamtest.c | 6 +- tests/genericxml2xmltest.c | 10 +-- tests/interfacexml2xmltest.c | 5 +- tests/libxlxml2domconfigtest.c | 8 +- tests/lxcconf2xmltest.c | 20 ++--- tests/lxcxml2xmltest.c | 10 +-- tests/networkxml2conftest.c | 9 +-- tests/networkxml2firewalltest.c | 16 ++-- tests/networkxml2xmltest.c | 9 +-- tests/networkxml2xmlupdatetest.c | 15 ++-- tests/nodedevxml2xmltest.c | 5 +- tests/nssmock.c | 9 +-- tests/nwfilterxml2firewalltest.c | 15 ++-- tests/nwfilterxml2xmltest.c | 9 +-- tests/openvzutilstest.c | 6 +- tests/qemuagenttest.c | 4 +- tests/qemublocktest.c | 34 +++------ tests/qemucapabilitiestest.c | 20 ++--- tests/qemucaps2xmltest.c | 15 ++-- tests/qemudomaincheckpointxml2xmltest.c | 5 +- tests/qemudomainsnapshotxml2xmltest.c | 5 +- tests/qemufirmwaretest.c | 4 +- tests/qemuhotplugtest.c | 29 ++++---- tests/qemumemlocktest.c | 5 +- tests/qemumigparamstest.c | 23 +++--- tests/qemumonitorjsontest.c | 56 +++++++------- tests/qemumonitortestutils.c | 38 +++------- tests/qemusecuritymock.c | 5 +- tests/qemusecuritytest.c | 3 +- tests/qemuvhostusertest.c | 4 +- tests/qemuxml2argvtest.c | 35 +++------ tests/qemuxml2xmltest.c | 41 +++-------- tests/scsihosttest.c | 26 ++----- tests/secretxml2xmltest.c | 14 ++-- tests/securityselinuxlabeltest.c | 23 ++---- tests/storagebackendsheepdogtest.c | 11 +-- tests/storagepoolcapstest.c | 6 +- tests/storagepoolxml2argvtest.c | 11 +-- tests/storagepoolxml2xmltest.c | 9 +-- tests/storagevolxml2argvtest.c | 31 +++----- tests/storagevolxml2xmltest.c | 13 ++-- tests/sysinfotest.c | 18 ++--- tests/testutils.c | 17 ++--- tests/testutils.h | 5 +- tests/testutilsqemu.c | 11 +-- tests/vboxsnapshotxmltest.c | 5 +- tests/virbuftest.c | 7 +- tests/vircaps2xmltest.c | 15 ++-- tests/vircgroupmock.c | 11 +-- tests/vircgrouptest.c | 5 +- tests/virconftest.c | 7 +- tests/virfilemock.c | 2 +- tests/virfiletest.c | 3 +- tests/virfilewrapper.c | 4 +- tests/virhostcputest.c | 38 ++++------ tests/virjsontest.c | 27 +++---- tests/virmacmaptest.c | 12 +-- tests/virnetdaemontest.c | 10 +-- tests/virnetdevmock.c | 8 +- tests/virnetdevopenvswitchtest.c | 5 +- tests/virnetsockettest.c | 6 +- tests/virnetworkportxml2xmltest.c | 6 +- tests/virnumamock.c | 3 +- tests/virnwfilterbindingxml2xmltest.c | 7 +- tests/virpcimock.c | 97 ++++++++++--------------- tests/virpcitest.c | 16 ++-- tests/virrandommock.c | 5 +- tests/virresctrltest.c | 15 ++-- tests/virschematest.c | 19 ++--- tests/virscsitest.c | 11 +-- tests/virshtest.c | 5 +- tests/virstoragetest.c | 63 ++++++++-------- tests/virtestmock.c | 8 +- tests/virusbmock.c | 9 +-- tests/virusbtest.c | 6 +- tests/vmwarevertest.c | 4 +- tests/vmx2xmltest.c | 18 ++--- tests/xlconfigtest.c | 8 +- tests/xmconfigtest.c | 8 +- tests/xml2vmxtest.c | 16 ++-- 85 files changed, 480 insertions(+), 842 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 6ff2039ab1..9ee23add4c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -67,11 +67,8 @@ static int checkoutput(const char *testname, char *actualname = NULL; char *actuallog = NULL; - if (virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, - testname) < 0) - goto cleanup; - if (virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir) < 0) - goto cleanup; + virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, testname); + virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir); if (virFileReadAll(expectname, 1024*64, &expectlog) < 0) { fprintf(stderr, "cannot read %s\n", expectname); @@ -86,8 +83,7 @@ static int checkoutput(const char *testname, if (prefix) { char *tmp = NULL; - if (virAsprintf(&tmp, "%s%s", prefix, expectlog) < 0) - goto cleanup; + virAsprintf(&tmp, "%s%s", prefix, expectlog); VIR_FREE(expectlog); expectlog = tmp; @@ -595,8 +591,7 @@ static int test15(const void *unused G_GNUC_UNUSED) char *cwd = NULL; int ret = -1; - if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) - goto cleanup; + virAsprintf(&cwd, "%s/commanddata", abs_srcdir); virCommandSetWorkingDirectory(cmd, cwd); virCommandSetUmask(cmd, 002); @@ -815,8 +810,7 @@ static int test20(const void *unused G_GNUC_UNUSED) sigaction(SIGPIPE, &sig_action, NULL); - if (virAsprintf(&buf, "1\n%100000d\n", 2) < 0) - goto cleanup; + virAsprintf(&buf, "1\n%100000d\n", 2); virCommandSetInputBuffer(cmd, buf); if (virCommandRun(cmd, NULL) < 0) { @@ -1174,13 +1168,10 @@ static int test27(const void *unused G_GNUC_UNUSED) buffer2[buflen - 2] = '\n'; buffer2[buflen - 1] = 0; - if (virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, - buffer0, buffer1, buffer2) < 0 || - virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, - buffer0, buffer1, buffer2) < 0) { - printf("Could not virAsprintf expected output\n"); - goto cleanup; - } + virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, + buffer0, buffer1, buffer2); + virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, + buffer0, buffer1, buffer2); if (pipe(pipe1) < 0 || pipe(pipe2) < 0) { printf("Could not create pipe: %s\n", g_strerror(errno)); diff --git a/tests/cputest.c b/tests/cputest.c index 83b494857f..e1b609ef73 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -75,9 +75,8 @@ cpuTestLoadXML(virArch arch, const char *name) xmlXPathContextPtr ctxt = NULL; virCPUDefPtr cpu = NULL; - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -105,9 +104,8 @@ cpuTestLoadMultiXML(virArch arch, int n; size_t i; - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -150,9 +148,8 @@ cpuTestCompareXML(virArch arch, char *actual = NULL; int ret = -1; - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(actual = virCPUDefFormat(cpu, NULL))) goto cleanup; @@ -345,8 +342,7 @@ cpuTestBaseline(const void *arg) suffix = "migratable"; else suffix = "result"; - if (virAsprintf(&result, "%s-%s", data->name, suffix) < 0) - goto cleanup; + virAsprintf(&result, "%s-%s", data->name, suffix); if (cpuTestCompareXML(data->arch, baseline, result) < 0) goto cleanup; @@ -399,8 +395,7 @@ cpuTestUpdate(const void *arg) if (virCPUUpdate(host->arch, cpu, migHost) < 0) goto cleanup; - if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0) - goto cleanup; + virAsprintf(&result, "%s+%s", data->host, data->name); ret = cpuTestCompareXML(data->arch, cpu, result); @@ -485,9 +480,8 @@ cpuTestMakeQEMUCaps(const struct data *data) bool fail_no_props = true; char *json = NULL; - if (virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", - abs_srcdir, virArchToString(data->arch), data->host) < 0) - goto error; + virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, + virArchToString(data->arch), data->host); if (!(testMon = qemuMonitorTestNewFromFile(json, driver.xmlopt, true))) goto error; @@ -589,9 +583,8 @@ cpuTestCPUID(bool guest, const void *arg) char *result = NULL; virDomainCapsCPUModelsPtr models = NULL; - if (virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", - abs_srcdir, virArchToString(data->arch), data->host) < 0) - goto cleanup; + virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); if (virTestLoadFile(hostFile, &host) < 0 || !(hostData = virCPUDataParse(host))) @@ -622,10 +615,7 @@ cpuTestCPUID(bool guest, const void *arg) if (cpuDecode(cpu, hostData, models) < 0) goto cleanup; - if (virAsprintf(&result, "cpuid-%s-%s", - data->host, - guest ? "guest" : "host") < 0) - goto cleanup; + virAsprintf(&result, "cpuid-%s-%s", data->host, guest ? "guest" : "host"); ret = cpuTestCompareXML(data->arch, cpu, result); @@ -667,17 +657,12 @@ cpuTestCompareSignature(const struct data *data, signature = virCPUx86DataGetSignature(hostData, &family, &model, &stepping); - if (virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", - abs_srcdir, virArchToString(data->arch), data->host) < 0) - return -1; + virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", abs_srcdir, + virArchToString(data->arch), data->host); - if (virAsprintf(&sigStr, - "%1$06lx\n" - "family: %2$3u (0x%2$02x)\n" - "model: %3$3u (0x%3$02x)\n" - "stepping: %4$3u (0x%4$02x)\n", - signature, family, model, stepping) < 0) - return -1; + virAsprintf(&sigStr, "%1$06lx\n" "family: %2$3u (0x%2$02x)\n" + "model: %3$3u (0x%3$02x)\n" "stepping: %4$3u (0x%4$02x)\n", + signature, family, model, stepping); return virTestCompareToFile(sigStr, result); } @@ -692,9 +677,8 @@ cpuTestCPUIDSignature(const void *arg) char *host = NULL; int ret = -1; - if (virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", - abs_srcdir, virArchToString(data->arch), data->host) < 0) - goto cleanup; + virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); if (virTestLoadFile(hostFile, &host) < 0 || !(hostData = virCPUDataParse(host))) @@ -817,24 +801,24 @@ cpuTestUpdateLive(const void *arg) virDomainCapsCPUModelsPtr models = NULL; int ret = -1; - if (virAsprintf(&cpuFile, "cpuid-%s-guest", data->host) < 0 || - !(cpu = cpuTestLoadXML(data->arch, cpuFile))) + virAsprintf(&cpuFile, "cpuid-%s-guest", data->host); + if (!(cpu = cpuTestLoadXML(data->arch, cpuFile))) goto cleanup; - if (virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", - abs_srcdir, virArchToString(data->arch), data->host) < 0 || - virTestLoadFile(enabledFile, &enabled) < 0 || + virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); + if (virTestLoadFile(enabledFile, &enabled) < 0 || !(enabledData = virCPUDataParse(enabled))) goto cleanup; - if (virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xml", - abs_srcdir, virArchToString(data->arch), data->host) < 0 || - virTestLoadFile(disabledFile, &disabled) < 0 || + virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); + if (virTestLoadFile(disabledFile, &disabled) < 0 || !(disabledData = virCPUDataParse(disabled))) goto cleanup; - if (virAsprintf(&expectedFile, "cpuid-%s-json", data->host) < 0 || - !(expected = cpuTestLoadXML(data->arch, expectedFile))) + virAsprintf(&expectedFile, "cpuid-%s-json", data->host); + if (!(expected = cpuTestLoadXML(data->arch, expectedFile))) goto cleanup; /* In case the host CPU signature does not exactly match any CPU model from @@ -906,8 +890,7 @@ cpuTestJSONCPUID(const void *arg) char *result = NULL; int ret = -1; - if (virAsprintf(&result, "cpuid-%s-json", data->host) < 0) - goto cleanup; + virAsprintf(&result, "cpuid-%s-json", data->host); if (!(qemuCaps = cpuTestMakeQEMUCaps(data))) goto cleanup; @@ -1028,11 +1011,8 @@ mymain(void) tmp = virTestLogContentAndReset(); \ VIR_FREE(tmp); \ \ - if (virAsprintf(&testLabel, "%s(%s): %s", \ - #api, virArchToString(arch), name) < 0) { \ - ret = -1; \ - break; \ - } \ + virAsprintf(&testLabel, "%s(%s): %s", \ + #api, virArchToString(arch), name); \ \ if (virTestRun(testLabel, api, &data) < 0) { \ if (virTestGetDebug()) { \ @@ -1072,12 +1052,9 @@ mymain(void) suffix = " (expanded)"; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) \ suffix = " (migratable)"; \ - if (virAsprintf(&label, "%s%s", name, suffix) < 0) { \ - ret = -1; \ - } else { \ - DO_TEST(arch, cpuTestBaseline, label, NULL, \ - "baseline-" name, NULL, flags, result); \ - } \ + virAsprintf(&label, "%s%s", name, suffix); \ + DO_TEST(arch, cpuTestBaseline, label, NULL, \ + "baseline-" name, NULL, flags, result); \ VIR_FREE(label); \ } while (0) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 61bc019671..3289eb3ef7 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -88,9 +88,8 @@ fillQemuCaps(virDomainCapsPtr domCaps, fakeHostCPU(caps, domCaps->arch) < 0) goto cleanup; - if (virAsprintf(&path, "%s/%s.%s.xml", - TEST_QEMU_CAPS_PATH, name, arch) < 0 || - !(qemuCaps = qemuTestParseCapabilities(caps, path))) + virAsprintf(&path, "%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch); + if (!(qemuCaps = qemuTestParseCapabilities(caps, path))) goto cleanup; if (machine) { @@ -217,9 +216,8 @@ test_virDomainCapsFormat(const void *opaque) char *domCapsXML = NULL; int ret = -1; - if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", abs_srcdir, + data->name); if (!(domCaps = virDomainCapsNew(data->emulator, data->machine, virArchFromString(data->arch), @@ -299,13 +297,10 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ char *name = NULL; \ - if (virAsprintf(&name, "qemu_%s%s%s.%s", \ - Name, \ - Machine ? "-" : "", Machine ? Machine : "", \ - Arch) < 0) { \ - ret = -1; \ - break; \ - } \ + virAsprintf(&name, "qemu_%s%s%s.%s", \ + Name, \ + Machine ? "-" : "", Machine ? Machine : "", \ + Arch); \ struct testData data = { \ .name = name, \ .emulator = Emulator, \ @@ -338,10 +333,7 @@ mymain(void) #define DO_TEST_BHYVE(Name, Emulator, BhyveCaps, Type) \ do { \ char *name = NULL; \ - if (virAsprintf(&name, "bhyve_%s.x86_64", Name) < 0) { \ - ret = -1; \ - break; \ - } \ + virAsprintf(&name, "bhyve_%s.x86_64", Name); \ struct testData data = { \ .name = name, \ .emulator = Emulator, \ diff --git a/tests/domainconftest.c b/tests/domainconftest.c index e7bdc99438..3de6e7740e 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -46,9 +46,8 @@ static int testGetFilesystem(const void *opaque) const struct testGetFilesystemData *data = opaque; virDomainFSDefPtr fsdef; - if (virAsprintf(&filename, "%s/domainconfdata/%s.xml", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&filename, "%s/domainconfdata/%s.xml", abs_srcdir, + data->filename); if (!(def = virDomainDefParseFile(filename, caps, xmlopt, NULL, 0))) goto cleanup; diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 4e37656576..fe4f255fe1 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -343,11 +343,7 @@ mymain(void) { int ret = 0; - if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, - "fchostdata/fc_host/") < 0) { - ret = -1; - goto cleanup; - } + virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/"); if (virTestRun("virVHBAPathExists", test1, NULL) < 0) ret = -1; @@ -377,7 +373,6 @@ mymain(void) test11_xml) < 0) ret = -1; - cleanup: VIR_FREE(fchost_prefix); return ret; } diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 98519e6266..4acc97967e 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -62,8 +62,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; - if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) - goto cleanup; + virAsprintf(&file, "%s/input.data", scratchdir); if ((fd = open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) goto cleanup; @@ -194,8 +193,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; - if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) - goto cleanup; + virAsprintf(&file, "%s/input.data", scratchdir); if (!(st = virStreamNew(conn, flags))) goto cleanup; diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 1840d6e6a8..7b59749d01 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -29,17 +29,15 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out = NULL; int ret = -1; - if (virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", + abs_srcdir, info->name); ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, 0, info->expectResult); - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 1fc61e3853..c7de2e4bd0 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -50,9 +50,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - if (virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", abs_srcdir, + (const char *)data); result = testCompareXMLToXMLFiles(xml); diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 120796b110..efd003eb58 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -151,15 +151,11 @@ testCompareXMLToDomConfigHelper(const void *data) char *xmlfile = NULL; char *jsonfile = NULL; - if (virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); + virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); ret = testCompareXMLToDomConfig(xmlfile, jsonfile); - cleanup: VIR_FREE(xmlfile); VIR_FREE(jsonfile); return ret; diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 2a277042ce..f2d884dc15 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -71,15 +71,13 @@ testCompareXMLToConfigHelperLegacy(const void *data) char *xml = NULL; char *config = NULL; - if (virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", + abs_srcdir, info->name); result = testCompareXMLToConfigFiles(xml, config, info->expectError); - cleanup: VIR_FREE(xml); VIR_FREE(config); return result; @@ -93,15 +91,13 @@ testCompareXMLToConfigHelperV3(const void *data) char *xml = NULL; char *config = NULL; - if (virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", + abs_srcdir, info->name); result = testCompareXMLToConfigFiles(xml, config, info->expectError); - cleanup: VIR_FREE(xml); VIR_FREE(config); return result; diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index e871700d1d..ded35f8d4b 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -34,18 +34,16 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out = NULL; int ret = -1; - if (virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", + abs_srcdir, info->name); + virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", + abs_srcdir, info->name); ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, info->parse_flags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 098b5eff09..9992afaf62 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -86,16 +86,11 @@ testCompareXMLToConfHelper(const void *data) char *inxml = NULL; char *outconf = NULL; - if (virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", - abs_srcdir, info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info->name); + virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", abs_srcdir, info->name); result = testCompareXMLToConfFiles(inxml, outconf, info->caps); - cleanup: VIR_FREE(inxml); VIR_FREE(outconf); diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index b8e974971a..0aaebf5bc6 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -117,15 +117,13 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml = NULL; char *args = NULL; - if (virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE) < 0) - goto cleanup; + virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); result = testCompareXMLToArgvFiles(xml, args, info->baseargs); - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; @@ -169,11 +167,7 @@ mymain(void) goto cleanup; } - if (virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", - abs_srcdir) < 0) { - ret = -1; - goto cleanup; - } + virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_srcdir); if (virTestLoadFile(basefile, &baseargs) < 0) { ret = -1; diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 3d90023445..64aada5f34 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -90,17 +90,12 @@ testCompareXMLToXMLHelper(const void *data) char *inxml = NULL; char *outxml = NULL; - if (virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", - abs_srcdir, info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", abs_srcdir, info->name); + virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", abs_srcdir, info->name); result = testCompareXMLToXMLFiles(inxml, outxml, info->flags, info->expectResult); - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index 69c19e800d..a76498c085 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -82,20 +82,17 @@ testCompareXMLToXMLHelper(const void *data) char *updatexml = NULL; char *outxml = NULL; - if (virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->netxml) < 0 || - virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", - abs_srcdir, info->updatexml) < 0 || - virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", - abs_srcdir, info->outxml) < 0) { - goto cleanup; - } + virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", + abs_srcdir, info->netxml); + virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", + abs_srcdir, info->updatexml); + virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", + abs_srcdir, info->outxml); result = testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, info->command, info->section, info->parentIndex, info->expectFailure); - cleanup: VIR_FREE(netxml); VIR_FREE(updatexml); VIR_FREE(outxml); diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 9248a60fbf..e8b869526d 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -72,9 +72,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - if (virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", abs_srcdir, + (const char *)data); result = testCompareXMLToXMLFiles(xml); diff --git a/tests/nssmock.c b/tests/nssmock.c index ea4b26ffab..be70a60790 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,12 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - if (virAsprintfQuiet(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)) < 0) { - errno = ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath = g_strdup(path); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index bef3790da2..95b6b24014 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -243,9 +243,8 @@ virNWFilterIncludeDefToRuleInst(virNWFilterIncludeDefPtr inc, int ret = -1; char *xml; - if (virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, inc->filterref) < 0) - return -1; + virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, + inc->filterref); /* create a temporary hashmap for depth-first tree traversal */ if (!(tmpvars = virNWFilterCreateVarsFrom(inc->params, @@ -429,15 +428,13 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml = NULL; char *args = NULL; - if (virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE) < 0) - goto cleanup; + virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); result = testCompareXMLToArgvFiles(xml, args); - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 5fc9d19d47..344dd68bc5 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -62,16 +62,11 @@ testCompareXMLToXMLHelper(const void *data) char *inxml = NULL; char *outxml = NULL; - if (virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", - abs_srcdir, tp->name) < 0 || - virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", - abs_srcdir, tp->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->name); + virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->name); result = testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index c15ce9a47b..9287dc3c79 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -17,7 +17,8 @@ static int testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, const char *ext G_GNUC_UNUSED) { - return virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + return 0; } struct testConfigParam { @@ -40,8 +41,7 @@ testReadConfigParam(const void *data G_GNUC_UNUSED) char *conf = NULL; char *value = NULL; - if (virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir) < 0) - return -1; + virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir); for (i = 0; i < G_N_ELEMENTS(configParams); ++i) { if (openvzReadConfigParam(conf, configParams[i].param, diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index cef9ae5fee..65fb937901 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -183,9 +183,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlopt, if (!(ret_test = qemuMonitorTestNewAgent(xmlopt))) return -1; - if (virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", abs_srcdir); if (!(ret_def = virDomainDefParseFile(domain_filename, driver.caps, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 5f89d73c72..0c7c6ed4fa 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -82,8 +82,7 @@ testBackingXMLjsonXML(const void *args) if (!(propsstr = virJSONValueToString(wrapper, false))) return -1; - if (virAsprintf(&protocolwrapper, "json:%s", propsstr) < 0) - return -1; + virAsprintf(&protocolwrapper, "json:%s", propsstr); if (virStorageSourceNewFromBackingAbsolute(protocolwrapper, &jsonsrc) < 0) { @@ -163,9 +162,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr src) srcpriv->secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; srcpriv->secinfo->s.aes.username = g_strdup(src->auth->username); - if (virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", - NULLSTR(src->nodestorage)) < 0) - return -1; + virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", + NULLSTR(src->nodestorage)); } if (src->encryption) { @@ -173,9 +171,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr src) return -1; srcpriv->encinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; - if (virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", - NULLSTR(src->nodeformat)) < 0) - return -1; + virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", + NULLSTR(src->nodeformat)); } return 0; @@ -197,9 +194,7 @@ testQemuDiskXMLToProps(const void *opaque) char *xmlstr = NULL; int ret = -1; - if (virAsprintf(&xmlpath, "%s%s.xml", - testQemuDiskXMLToJSONPath, data->name) < 0) - goto cleanup; + virAsprintf(&xmlpath, "%s%s.xml", testQemuDiskXMLToJSONPath, data->name); if (virTestLoadFile(xmlpath, &xmlstr) < 0) goto cleanup; @@ -316,9 +311,7 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque) if (data->fail) return EXIT_AM_SKIP; - if (virAsprintf(&jsonpath, "%s%s.json", - testQemuDiskXMLToJSONPath, data->name) < 0) - goto cleanup; + virAsprintf(&jsonpath, "%s%s.json", testQemuDiskXMLToJSONPath, data->name); for (i = 0; i < data->nprops; i++) { char *jsonstr; @@ -367,9 +360,7 @@ testQemuImageCreateLoadDiskXML(const char *name, g_autofree char *xmlpath = NULL; virStorageSourcePtr ret = NULL; - if (virAsprintf(&xmlpath, "%s%s.xml", - testQemuImageCreatePath, name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s%s.xml", testQemuImageCreatePath, name); if (!(doc = virXMLParseFileCtxt(xmlpath, &ctxt))) return NULL; @@ -465,9 +456,7 @@ testQemuImageCreate(const void *opaque) virBufferTrim(&actualbuf, "\n", -1); virBufferAddLit(&actualbuf, "\n"); - if (virAsprintf(&jsonpath, "%s%s.json", - testQemuImageCreatePath, data->name) < 0) - return -1; + virAsprintf(&jsonpath, "%s%s.json", testQemuImageCreatePath, data->name); if (!(actual = virBufferContentAndReset(&actualbuf))) return -1; @@ -488,9 +477,8 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) if (data->fail) return EXIT_AM_SKIP; - if (virAsprintf(&jsonpath, "%s%s-srconly.json", - testQemuDiskXMLToJSONPath, data->name) < 0) - return -1; + virAsprintf(&jsonpath, "%s%s-srconly.json", testQemuDiskXMLToJSONPath, + data->name); for (i = 0; i < data->npropssrc; i++) { g_autofree char *jsonstr = NULL; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index a9a1e75587..cf1e86c893 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -76,11 +76,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion = 0; const char *p; - if (virAsprintf(&repliesFile, "%s/%s.%s.replies", - data->dataDir, data->base, data->archName) < 0 || - virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&repliesFile, "%s/%s.%s.replies", + data->dataDir, data->base, data->archName); + virAsprintf(&capsFile, "%s/%s.%s.xml", + data->dataDir, data->base, data->archName); if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL, NULL))) @@ -145,9 +144,8 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy = NULL; char *actual = NULL; - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&capsFile, "%s/%s.%s.xml", data->dataDir, data->base, + data->archName); if (!(caps = virCapabilitiesNew(virArchFromString(data->archName), false, false))) @@ -186,10 +184,8 @@ doCapsTest(const char *base, g_autofree char *title = NULL; g_autofree char *copyTitle = NULL; - if (virAsprintf(&title, "%s (%s)", base, archName) < 0 || - virAsprintf(©Title, "copy %s (%s)", base, archName) < 0) { - return -1; - } + virAsprintf(&title, "%s (%s)", base, archName); + virAsprintf(©Title, "copy %s (%s)", base, archName); data->base = base; data->archName = archName; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f5aecaa391..f46b056c18 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -102,8 +102,7 @@ testGetCaps(char *capsData, const testQemuData *data) virArch arch = virArchFromString(data->archName); g_autofree char *binary = NULL; - if (virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName) < 0) - goto error; + virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName); if ((qemuCaps = testQemuGetCaps(capsData)) == NULL) { fprintf(stderr, "failed to parse qemu capabilities flags"); @@ -142,13 +141,10 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - if (virAsprintf(&xmlFile, "%s/caps.%s.xml", - data->outputDir, data->archName) < 0) - goto cleanup; + virAsprintf(&xmlFile, "%s/caps.%s.xml", data->outputDir, data->archName); - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->inputDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&capsFile, "%s/%s.%s.xml", data->inputDir, data->base, + data->archName); if (virTestLoadFile(capsFile, &capsData) < 0) goto cleanup; @@ -181,8 +177,7 @@ doCapsTest(const char *base, testQemuDataPtr data = (testQemuDataPtr) opaque; g_autofree char *title = NULL; - if (virAsprintf(&title, "%s (%s)", base, archName) < 0) - return -1; + virAsprintf(&title, "%s (%s)", base, archName); data->base = base; data->archName = archName; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 4540f15ddd..7f393d68a8 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -120,9 +120,8 @@ testCheckpointPostParse(virDomainMomentDefPtr def) if (def->creationTime) return -1; def->creationTime = mocktime; - if (!def->name && - virAsprintf(&def->name, "%lld", def->creationTime) < 0) - return -1; + if (!def->name) + virAsprintf(&def->name, "%lld", def->creationTime); return 0; } diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index 66cb124f09..0a3aaac6cf 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -105,9 +105,8 @@ testSnapshotPostParse(virDomainMomentDefPtr def) if (def->creationTime) return -1; def->creationTime = mocktime; - if (!def->name && - virAsprintf(&def->name, "%lld", def->creationTime) < 0) - return -1; + if (!def->name) + virAsprintf(&def->name, "%lld", def->creationTime); return 0; } diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index ad7ed7a384..01d4ebc26f 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -24,9 +24,7 @@ testParseFormatFW(const void *opaque) g_autofree char *expected = NULL; g_autofree char *actual = NULL; - if (virAsprintf(&path, "%s/qemufirmwaredata/%s", - abs_srcdir, filename) < 0) - return -1; + virAsprintf(&path, "%s/qemufirmwaredata/%s", abs_srcdir, filename); if (!(fw = qemuFirmwareParse(path))) return -1; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ff2b38c83..04dc347fd8 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -245,15 +245,14 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon = NULL; qemuDomainObjPrivatePtr priv = NULL; - if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%s.xml", - abs_srcdir, test->domain_filename) < 0 || - virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%s.xml", - abs_srcdir, test->device_filename) < 0 || - virAsprintf(&result_filename, - "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", - abs_srcdir, test->domain_filename, - test->device_filename) < 0) - goto cleanup; + virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%s.xml", + abs_srcdir, test->domain_filename); + virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%s.xml", + abs_srcdir, test->device_filename); + virAsprintf(&result_filename, + "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", + abs_srcdir, test->domain_filename, + test->device_filename); if (virTestLoadFile(domain_filename, &domain_xml) < 0 || virTestLoadFile(device_filename, &device_xml) < 0) @@ -409,19 +408,17 @@ testQemuHotplugCpuPrepare(const char *test, char *prefix = NULL; struct testQemuHotplugCpuData *data = NULL; - if (virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test) < 0) - return NULL; + virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test); if (VIR_ALLOC(data) < 0) goto error; data->modern = modern; - if (virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix) < 0 || - virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix) < 0 || - virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix) < 0 || - virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix) < 0) - goto error; + virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix); + virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix); + virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix); + virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix); if (virTestLoadFile(data->file_xml_dom, &data->xml_dom) < 0) goto error; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 490e2ef11f..8e395759e1 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -34,9 +34,8 @@ testCompareMemLock(const void *data) char *xml = NULL; int ret = -1; - if (virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", abs_srcdir, + info->name); if (!(def = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index aacb905639..ded3a8ef64 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -66,9 +66,8 @@ qemuMigParamsTestXML2XML(const void *opaque) char *actualXML = NULL; int ret = -1; - if (virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", abs_srcdir, + data->name); if (!(doc = virXMLParseFileCtxt(xmlFile, &ctxt))) goto cleanup; @@ -110,11 +109,10 @@ qemuMigParamsTestXML(const void *opaque) char *actualXML = NULL; int ret = -1; - if (virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name) < 0 || - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", + abs_srcdir, data->name); if (!(mon = qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true))) goto cleanup; @@ -161,11 +159,10 @@ qemuMigParamsTestJSON(const void *opaque) char *actualJSON = NULL; int ret = -1; - if (virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name) < 0 || - virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", + abs_srcdir, data->name); if (!(mon = qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true))) goto cleanup; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index c0eee921cf..c87f7db2e0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -796,11 +796,9 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, if (!reply) reply = ""; - if (virAsprintf(&jsonreply, "{\"return\": {%s}}", reply) < 0) - goto cleanup; + virAsprintf(&jsonreply, "{\"return\": {%s}}", reply); - if (virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", label) < 0) - goto cleanup; + virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", label); data.chr = chr; data.fail = fail; @@ -2459,13 +2457,12 @@ testQemuMonitorJSONGetCPUData(const void *opaque) if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; - if (virAsprintf(&jsonFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", - abs_srcdir, data->name) < 0 || - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&jsonFile, + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", + abs_srcdir, data->name); + virAsprintf(&dataFile, + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", + abs_srcdir, data->name); if (virTestLoadFile(jsonFile, &jsonStr) < 0) goto cleanup; @@ -2712,16 +2709,15 @@ testQemuMonitorCPUInfo(const void *opaque) if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; - if (virAsprintf(&queryCpusFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.json", - abs_srcdir, data->name) < 0 || - virAsprintf(&queryHotpluggableFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug.json", - abs_srcdir, data->name) < 0 || - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&queryCpusFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.json", + abs_srcdir, data->name); + virAsprintf(&queryHotpluggableFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug.json", + abs_srcdir, data->name); + virAsprintf(&dataFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", + abs_srcdir, data->name); if (virTestLoadFile(queryCpusFile, &queryCpusStr) < 0) goto cleanup; @@ -2816,9 +2812,8 @@ testBlockNodeNameDetect(const void *opaque) virBuffer buf = VIR_BUFFER_INITIALIZER; int ret = -1; - if (virAsprintf(&resultFile, "%s/%s%s.result", - abs_srcdir, pathprefix, testname) < 0) - goto cleanup; + virAsprintf(&resultFile, "%s/%s%s.result", abs_srcdir, pathprefix, + testname); if (!(namedNodesJson = virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) @@ -2961,13 +2956,12 @@ testQueryJobs(const void *opaque) if (!test) return -1; - if (virAsprintf(&filenameJSON, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", - data->name) < 0 || - virAsprintf(&filenameResult, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", - data->name) < 0) - goto cleanup; + virAsprintf(&filenameJSON, + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", + data->name); + virAsprintf(&filenameResult, + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", + data->name); if (virTestLoadFile(filenameJSON, &fileJSON) < 0) goto cleanup; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index fb76bf185d..b7625bb157 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -145,11 +145,8 @@ qemuMonitorTestAddErrorResponse(qemuMonitorTestPtr test, } /* format the JSON error message */ - if (virAsprintf(&jsonmsg, "{ \"error\": " - " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", - escapemsg) < 0) - return -1; + virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", escapemsg); return qemuMonitorTestAddResponse(test, jsonmsg); } @@ -161,8 +158,7 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test, { g_autofree char *msg = NULL; - if (virAsprintf(&msg, "unexpected command: '%s'", command) < 0) - return -1; + virAsprintf(&msg, "unexpected command: '%s'", command); return qemuMonitorTestAddErrorResponse(test, msg); } @@ -175,9 +171,8 @@ qemuMonitorTestAddInvalidCommandResponse(qemuMonitorTestPtr test, { g_autofree char *msg = NULL; - if (virAsprintf(&msg, "expected command '%s' got '%s'", - expectedcommand, actualcommand) < 0) - return -1; + virAsprintf(&msg, "expected command '%s' got '%s'", expectedcommand, + actualcommand); return qemuMonitorTestAddErrorResponse(test, msg); } @@ -196,11 +191,8 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) if (virVasprintf(&msg, errmsg, msgargs) < 0) goto cleanup; - if (virAsprintf(&jsonmsg, "{ \"error\": " - " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", - msg) < 0) - goto cleanup; + virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", msg); ret = qemuMonitorTestAddResponse(test, jsonmsg); @@ -530,8 +522,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test, if (STREQ(cmdname, "device_add")) return 0; - if (virAsprintf(&schemapath, "%s/arg-type", cmdname) < 0) - return -1; + virAsprintf(&schemapath, "%s/arg-type", cmdname); if (virQEMUQAPISchemaPathGet(schemapath, test->qapischema, &schemaroot) < 0 || !schemaroot) { @@ -649,8 +640,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test, ret = qemuMonitorTestAddResponse(test, data->response); } else { if (data->cmderr) { - if (virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr) < 0) - return -1; + virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr); ret = qemuMonitorTestAddErrorResponse(test, errmsg); } else { @@ -741,8 +731,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, goto cleanup; } - if (virAsprintf(&retmsg, "{\"return\":%llu}", id) < 0) - goto cleanup; + virAsprintf(&retmsg, "{\"return\":%llu}", id); ret = qemuMonitorTestAddResponse(test, retmsg); @@ -1068,8 +1057,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, tmpdir_template = NULL; - if (virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir) < 0) - goto error; + virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir); if (vm) { test->vm = virObjectRef(vm); @@ -1297,9 +1285,7 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test, char *cmderr; int ret; - if (virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", - filename, line) < 0) - return -1; + virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", filename, line); ret = qemuMonitorTestAddItemVerbatim(test, command, cmderr, response); diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 50435bbd02..63bcae0f27 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -117,10 +117,7 @@ get_key(const char *path, { char *ret; - if (virAsprintf(&ret, "%s:%s", path, name) < 0) { - fprintf(stderr, "Unable to create hash table key\n"); - abort(); - } + virAsprintf(&ret, "%s:%s", path, name); return ret; } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 1c6cefd705..e8ebbf36d8 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -45,8 +45,7 @@ prepareObjects(virQEMUDriverPtr driver, g_autofree char *domxml = NULL; g_autofree char *latestCapsFile = NULL; - if (virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname) < 0) - return -1; + virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname); if (virTestLoadFile(filename, &domxml) < 0) return -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 3e1890a88f..903e6631dc 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -24,9 +24,7 @@ testParseFormatVU(const void *opaque) g_autofree char *expected = NULL; g_autofree char *actual = NULL; - if (virAsprintf(&path, "%s/qemuvhostuserdata/%s", - abs_srcdir, filename) < 0) - return -1; + virAsprintf(&path, "%s/qemuvhostuserdata/%s", abs_srcdir, filename); if (!(vu = qemuVhostUserParse(path))) return -1; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd330df3e0..39bc3b0aef 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -106,11 +106,8 @@ fakeStoragePoolLookupByName(virConnectPtr conn, virStoragePoolPtr ret = NULL; if (STRNEQ(name, "inactive")) { - if (virAsprintf(&xmlpath, "%s/%s%s.xml", - abs_srcdir, - STORAGE_POOL_XML_PATH, - name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, + STORAGE_POOL_XML_PATH, name); if (!virFileExists(xmlpath)) { virReportError(VIR_ERR_NO_STORAGE_POOL, @@ -190,7 +187,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) { char *ret = NULL; - ignore_value(virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name)); + virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name); return ret; } @@ -208,11 +205,8 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, return NULL; } - if (virAsprintf(&xmlpath, "%s/%s%s.xml", - abs_srcdir, - STORAGE_POOL_XML_PATH, - pool->name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XML_PATH, + pool->name); if (virTestLoadFile(xmlpath, &xmlbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -594,18 +588,14 @@ testCompareXMLToArgv(const void *data) return ret; } -static int +static void testInfoSetPaths(struct testQemuInfo *info, const char *suffix) { - if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", - abs_srcdir, info->name, suffix ? suffix : "") < 0) { - return -1; - } - - return 0; + virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", + abs_srcdir, info->name, suffix ? suffix : ""); } # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" @@ -713,10 +703,7 @@ mymain(void) if (testQemuInfoSetArgs(&info, capslatest, \ __VA_ARGS__, ARG_END) < 0) \ return EXIT_FAILURE; \ - if (testInfoSetPaths(&info, _suffix) < 0) { \ - VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \ - return EXIT_FAILURE; \ - } \ + testInfoSetPaths(&info, _suffix); \ if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \ testCompareXMLToArgv, &info) < 0) \ ret = -1; \ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 89c9494e6c..679b882704 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,48 +98,31 @@ testInfoSetPaths(struct testQemuInfo *info, VIR_FREE(info->infile); VIR_FREE(info->outfile); - if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name) < 0) - goto error; + virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, + info->name); - if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s-%s%s.xml", - abs_srcdir, info->name, - when == WHEN_ACTIVE ? "active" : "inactive", - suffix) < 0) - goto error; + virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s-%s%s.xml", + abs_srcdir, info->name, + when == WHEN_ACTIVE ? "active" : "inactive", suffix); if (!virFileExists(info->outfile)) { VIR_FREE(info->outfile); - if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s%s.xml", - abs_srcdir, info->name, suffix) < 0) - goto error; + virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s%s.xml", + abs_srcdir, info->name, suffix); } return 0; - - error: - testQemuInfoClear(info); - return -1; } static const char *statusPath = abs_srcdir "/qemustatusxml2xmldata/"; -static int +static void testInfoSetStatusPaths(struct testQemuInfo *info) { - if (virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name) < 0 || - virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name) < 0) - goto error; - - return 0; - - error: - testQemuInfoClear(info); - return -1; + virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name); + virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name); } @@ -1283,11 +1266,11 @@ mymain(void) if (testQemuInfoSetArgs(&info, capslatest, \ ARG_QEMU_CAPS, QEMU_CAPS_LAST, \ ARG_END) < 0 || \ - qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0 || \ - testInfoSetStatusPaths(&info) < 0) { \ + qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0) { \ VIR_TEST_DEBUG("Failed to generate status test data for '%s'", _name); \ return -1; \ } \ + testInfoSetStatusPaths(&info); \ \ if (virTestRun("QEMU status XML-2-XML " _name, \ testCompareStatusXMLToXMLFiles, &info) < 0) \ diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 35c7d93376..f86c99df86 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,13 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *devicepath, int ret = -1; int fd = -1; - if (virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", - fakesysfsdir, devicepath) < 0 || - virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", + fakesysfsdir, devicepath); + virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", + fakesysfsdir, hostname); /* Rather than create path & file, temporarily snip off the file to * create the path @@ -208,9 +205,7 @@ testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) char *ret_host = NULL; int ret = -1; - if (virAsprintf(&path_addr, "%s/%s", abs_srcdir, - "sysfs/class/scsi_host") < 0) - goto cleanup; + virAsprintf(&path_addr, "%s/%s", abs_srcdir, "sysfs/class/scsi_host"); if (!(ret_host = virSCSIHostFindByPCI(TEST_SCSIHOST_CLASS_PATH, pci_addr1, unique_id1)) || @@ -260,21 +255,14 @@ mymain(void) goto cleanup; } - if (virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir); if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs='%s'\n", fakesysfsdir); goto cleanup; } - if (virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", - fakesysfsdir) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 595583346a..44f4615be8 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -44,18 +44,14 @@ testCompareXMLToXMLHelper(const void *data) char *outxml = NULL; const struct testInfo *info = data; - if (virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", - abs_srcdir, - info->different ? "out" : "in", - info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", abs_srcdir, info->name); + virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", + abs_srcdir, + info->different ? "out" : "in", + info->name); result = testCompareXMLToXMLFiles(inxml, outxml); - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 9156403c51..cc0de456cd 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -60,9 +60,7 @@ testUserXattrEnabled(void) ssize_t len; const char *con_value = "system_u:object_r:svirt_image_t:s0:c41,c264"; char *path = NULL; - if (virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", - abs_builddir) < 0) - goto cleanup; + virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", abs_builddir); if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0 || virFileTouch(path, 0600) < 0) @@ -90,9 +88,7 @@ testSELinuxMungePath(char **path) { char *tmp; - if (virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", - abs_builddir, *path) < 0) - return -1; + virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", abs_builddir, *path); VIR_FREE(*path); *path = tmp; @@ -112,9 +108,8 @@ testSELinuxLoadFileList(const char *testname, *files = NULL; *nfiles = 0; - if (virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", - abs_srcdir, testname) < 0) - goto cleanup; + virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", abs_srcdir, + testname); if (!(fp = fopen(path, "r"))) goto cleanup; @@ -140,9 +135,8 @@ testSELinuxLoadFileList(const char *testname, *tmp = '\0'; tmp++; - if (virAsprintf(&file, "%s/securityselinuxlabeldata%s", - abs_builddir, line) < 0) - goto cleanup; + virAsprintf(&file, "%s/securityselinuxlabeldata%s", abs_builddir, + line); if (*tmp != '\0' && *tmp != '\n') { context = g_strdup(tmp); @@ -178,9 +172,8 @@ testSELinuxLoadDef(const char *testname) virDomainDefPtr def = NULL; size_t i; - if (virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", - abs_srcdir, testname) < 0) - goto cleanup; + virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", abs_srcdir, + testname); if (!(def = virDomainDefParseFile(xmlfile, driver.caps, driver.xmlopt, NULL, 0))) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index a5403e7136..7d50b1a303 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -158,13 +158,11 @@ mymain(void) collie_test *test = node_info_tests; - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", + abs_srcdir); - if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir); #define DO_TEST_NODE(collie) \ do { \ @@ -202,7 +200,6 @@ mymain(void) ++test; } - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 6b0680291e..5f66a67da6 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -62,10 +62,8 @@ test_virStoragePoolCapsFormat(const void *opaque) if (!(poolCaps = virStoragePoolCapsNew(driverCaps))) return -1; - if (virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", - abs_srcdir, data->filename) < 0) { - return -1; - } + virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", + abs_srcdir, data->filename); if (!(poolCapsXML = virStoragePoolCapsFormat(poolCaps))) return -1; diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 2ec7cbef66..50b79b4625 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -108,14 +108,11 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *poolxml = NULL; g_autofree char *cmdline = NULL; - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0) - return -1; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, + info->pool); - if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", - abs_srcdir, info->pool, info->platformSuffix) < 0 && - !info->shouldFail) - return -1; + virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", + abs_srcdir, info->pool, info->platformSuffix); return testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline); } diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 0f7bc27293..e4c78d3fd5 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -39,11 +39,10 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; - if (virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, (const char*)data) < 0 || - virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, (const char*)data); + virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", + abs_srcdir, (const char*)data); return testCompareXMLToXMLFiles(inxml, outxml); } diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index af90aa6953..833000a636 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -109,17 +109,13 @@ testCompareXMLToArgvFiles(bool shouldFail, } else { char *createCmdline = actualCmdline; g_autofree char *cvtCmdline = NULL; - int rc; if (!(cvtCmdline = virCommandToString(cmd, false))) goto cleanup; - rc = virAsprintf(&actualCmdline, "%s\n%s", - createCmdline, cvtCmdline); + virAsprintf(&actualCmdline, "%s\n%s", createCmdline, cvtCmdline); VIR_FREE(createCmdline); - if (rc < 0) - goto cleanup; } if (convertStep == VIR_STORAGE_VOL_ENCRYPT_NONE) @@ -162,23 +158,18 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *inputvolxml = NULL; g_autofree char *cmdline = NULL; - if (info->inputvol && + if (info->inputvol) virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->inputvol) < 0) - return -1; - if (info->inputpool && + abs_srcdir, info->inputvol); + if (info->inputpool) virAsprintf(&inputpoolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->inputpool) < 0) - return -1; - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0 || - virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->vol) < 0) { - return -1; - } - if (virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", - abs_srcdir, info->cmdline) < 0 && !info->shouldFail) - return -1; + abs_srcdir, info->inputpool); + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->vol); + virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", + abs_srcdir, info->cmdline); return testCompareXMLToArgvFiles(info->shouldFail, poolxml, volxml, inputpoolxml, inputvolxml, diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 0c8cecc10d..4e92d2818c 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -50,13 +50,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0 || - virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->name); + virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", + abs_srcdir, info->name); return testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); } diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 6c84582110..4167d4baee 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -90,16 +90,14 @@ sysinfotest_run(const char *test, testdata.func = func; - if ((decoder && - virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder) < 0) || - (sysinfo && - virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo) < 0) || - (cpuinfo && - virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo) < 0) || - (expected && - virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected) < 0)) { - goto error; - } + if (decoder) + virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder); + if (sysinfo) + virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo); + if (cpuinfo) + virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo); + if (expected) + virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected); if (virTestRun(test, testSysinfo, &testdata) < 0) goto error; diff --git a/tests/testutils.c b/tests/testutils.c index a141abc91b..3ae66d3007 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -404,8 +404,7 @@ virTestRewrapFile(const char *filename) return -1; } - if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) - goto cleanup; + virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir); cmd = virCommandNewArgList(perl, script, "--in-place", filename, NULL); if (virCommandRun(cmd, NULL) < 0) @@ -664,8 +663,7 @@ virTestCompareToFile(const char *actual, if (filecontentLen > 0 && filecontent[filecontentLen - 1] == '\n' && (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) { - if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0) - goto failure; + virAsprintf(&fixedcontent, "%s\n", cmpcontent); cmpcontent = fixedcontent; } } @@ -691,11 +689,9 @@ virTestCompareToULL(unsigned long long expect, g_autofree char *expectStr = NULL; g_autofree char *actualStr = NULL; - if (virAsprintf(&expectStr, "%llu", expect) < 0) - return -1; + virAsprintf(&expectStr, "%llu", expect); - if (virAsprintf(&actualStr, "%llu", actual) < 0) - return -1; + virAsprintf(&actualStr, "%llu", actual); return virTestCompareToString(expectStr, actualStr); } @@ -812,9 +808,8 @@ virTestSetEnvPath(void) char *new_path = NULL; if (path) { - if (strstr(path, abs_builddir) != path && - virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0) - goto cleanup; + if (strstr(path, abs_builddir) != path) + virAsprintf(&new_path, "%s:%s", abs_builddir, path); } else { new_path = g_strdup(abs_builddir); } diff --git a/tests/testutils.h b/tests/testutils.h index 9099a77664..36d2d5ba04 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -137,9 +137,8 @@ int virTestMain(int argc, } \ if (!preload) { \ newenv = (char *) lib; \ - } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { \ - perror("virAsprintf"); \ - return EXIT_FAILURE; \ + } else { \ + virAsprintf(&newenv, "%s:%s", lib, preload); \ } \ setenv(PRELOAD_VAR, newenv, 1); \ FORCE_FLAT_NAMESPACE \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 0faa9cb84a..3b656cdd1e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -809,8 +809,7 @@ testQemuGetLatestCapsForArch(const char *arch, const char *maxname = NULL; char *ret = NULL; - if (virAsprintf(&fullsuffix, "%s.%s", arch, suffix) < 0) - goto cleanup; + virAsprintf(&fullsuffix, "%s.%s", arch, suffix); if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; @@ -846,7 +845,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; } - ignore_value(virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname)); + virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname); cleanup: VIR_FREE(tmp); @@ -1043,10 +1042,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (STREQ(capsver, "latest")) { capsfile = g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases = true; - } else if (virAsprintf(&capsfile, "%s/caps_%s.%s.xml", - TEST_QEMU_CAPS_PATH, capsver, capsarch) < 0) { - goto cleanup; - } + } else virAsprintf(&capsfile, "%s/caps_%s.%s.xml", + TEST_QEMU_CAPS_PATH, capsver, capsarch); if (!(qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(capsarch), capsfile))) { diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 3d6171e266..fdc2c92719 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -104,9 +104,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - if (virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, + (const char *)data); result = testCompareXMLtoXMLFiles(xml); diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 385f016174..6bbd6545ac 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -31,20 +31,19 @@ static int testBufInfiniteLoop(const void *data) * This test is a bit fragile, since it relies on virBuffer internals. */ len = buf->size - buf->use - 1; - if (virAsprintf(&addstr, "%*s", len, "a") < 0) - goto out; + virAsprintf(&addstr, "%*s", len, "a"); if (info->doEscape) virBufferEscapeString(buf, "%s", addstr); else virBufferAsprintf(buf, "%s", addstr); - ret = 0; - out: bufret = virBufferContentAndReset(buf); if (!bufret) { VIR_TEST_DEBUG("Buffer had error set"); ret = -1; + } else { + ret = 0; } VIR_FREE(addstr); diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 41e84a3b25..c0a1ef2e2b 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -45,13 +45,11 @@ test_virCapabilities(const void *opaque) char *resctrl = NULL; int ret = -1; - if (virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, + data->filename); - if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, + data->filename); virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); @@ -69,9 +67,8 @@ test_virCapabilities(const void *opaque) if (!(capsXML = virCapabilitiesFormatXML(caps))) goto cleanup; - if (virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", - abs_srcdir, archStr, data->filename) < 0) - goto cleanup; + virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir, + archStr, data->filename); if (virTestCompareToFile(capsXML, path) < 0) goto cleanup; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 7bbaa6dd0f..4c67b9ad4e 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,9 +376,8 @@ static void init_sysfs(void) VIR_FREE(fakesysfscgroupdir); - if (virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX) < 0) - abort(); + virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -459,10 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno = EACCES; return NULL; } - if (virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type) < 0) { - abort(); - } + virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc = real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index cec07580ac..224e8116dd 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -189,10 +189,7 @@ testCgroupDetectMounts(const void *args) setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); - if (virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", - abs_srcdir, data->file) < 0) { - goto cleanup; - } + virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, data->file); if (virCgroupNewSelf(&group) < 0) { if (data->fail) diff --git a/tests/virconftest.c b/tests/virconftest.c index 1ad34caec6..c6d8ff2272 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -39,11 +39,8 @@ static int testConfRoundTrip(const void *opaque) char *srcfile = NULL; char *dstfile = NULL; - if (virAsprintf(&srcfile, "%s/virconfdata/%s.conf", - abs_srcdir, name) < 0 || - virAsprintf(&dstfile, "%s/virconfdata/%s.out", - abs_srcdir, name) < 0) - goto cleanup; + virAsprintf(&srcfile, "%s/virconfdata/%s.conf", abs_srcdir, name); + virAsprintf(&dstfile, "%s/virconfdata/%s.out", abs_srcdir, name); if (VIR_ALLOC_N_QUIET(buffer, len) < 0) { fprintf(stderr, "out of memory\n"); diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 00efb820ad..e32d749d52 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; if ((p = STRSKIP(path, "/some/symlink"))) - ignore_value(virAsprintfQuiet(&ret, "/gluster%s", p)); + virAsprintfQuiet(&ret, "/gluster%s", p); else ret = g_strdup(path); diff --git a/tests/virfiletest.c b/tests/virfiletest.c index ed0daf8478..ba947129be 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -325,8 +325,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) bool actual; int ret = -1; - if (virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile) < 0) - return -1; + virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile); if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) { fprintf(stderr, "Unable to set env variable\n"); diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index b6032f88fd..765b3b31d9 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,9 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; - if (virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp) < 0) - return -1; - + virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp); break; } diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 81a126ff73..7b1b1a6d89 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -55,13 +55,12 @@ linuxTestCompareFiles(const char *cpuinfofile, } VIR_FORCE_FCLOSE(cpuinfo); - if (virAsprintf(&actualData, - "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " - "Cores: %u, Threads: %u\n", - nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), - nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads) < 0) - goto fail; + virAsprintf(&actualData, + "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " + "Cores: %u, Threads: %u\n", + nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), + nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, + nodeinfo.cores, nodeinfo.threads); if (virTestCompareToFile(actualData, outputfile) < 0) goto fail; @@ -177,20 +176,17 @@ linuxTestHostCPU(const void *opaque) struct linuxTestHostCPUData *data = (struct linuxTestHostCPUData *) opaque; const char *archStr = virArchToString(data->arch); - if (virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", - abs_srcdir, data->testName) < 0 || - virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", - abs_srcdir, archStr, data->testName) < 0 || - virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", - abs_srcdir, archStr, data->testName) < 0) { - goto cleanup; - } + virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", + abs_srcdir, data->testName); + virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", + abs_srcdir, archStr, data->testName); + virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", + abs_srcdir, archStr, data->testName); virFileWrapperAddPrefix(SYSFS_SYSTEM_PATH, sysfs_prefix); result = linuxTestCompareFiles(cpuinfo, data->arch, output); virFileWrapperRemovePrefix(SYSFS_SYSTEM_PATH); - cleanup: VIR_FREE(cpuinfo); VIR_FREE(output); VIR_FREE(sysfs_prefix); @@ -211,16 +207,14 @@ linuxTestNodeCPUStats(const void *data) char *cpustatfile = NULL; char *outfile = NULL; - if (virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat", - abs_srcdir, testData->name) < 0 || - virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", - abs_srcdir, testData->name) < 0) - goto fail; + virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat", + abs_srcdir, testData->name); + virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", + abs_srcdir, testData->name); result = linuxCPUStatsCompareFiles(cpustatfile, testData->ncpus, outfile); - fail: VIR_FREE(cpustatfile); VIR_FREE(outfile); return result; diff --git a/tests/virjsontest.c b/tests/virjsontest.c index f72e70879b..75c70a49c9 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -26,11 +26,10 @@ testJSONFromFile(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - if (virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -114,11 +113,10 @@ testJSONAddRemove(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - if (virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -350,11 +348,10 @@ testJSONDeflatten(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - if (virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 995aff1178..17880728e7 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -41,9 +41,7 @@ testMACLookup(const void *opaque) char *file = NULL; int ret = -1; - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (!(mgr = virMacMapNew(file))) goto cleanup; @@ -94,9 +92,7 @@ testMACRemove(const void *opaque) char *file = NULL; int ret = -1; - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (!(mgr = virMacMapNew(file))) goto cleanup; @@ -131,9 +127,7 @@ testMACFlush(const void *opaque) char *str = NULL; int ret = -1; - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (virMacMapDumpStr(data->mgr, &str) < 0) goto cleanup; diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index f0e91763b8..2dfa04e83f 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -295,13 +295,11 @@ static int testExecRestart(const void *opaque) goto cleanup; } - if (virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", - abs_srcdir, data->jsonfile) < 0) - goto cleanup; + virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", abs_srcdir, + data->jsonfile); - if (virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", - abs_srcdir, data->jsonfile) < 0) - goto cleanup; + virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", + abs_srcdir, data->jsonfile); if (virFileReadAll(infile, 8192, &injsonstr) < 0) goto cleanup; diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 9724a1bc1f..574a26af2d 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,12 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } - + virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } #else diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitchtest.c index 3beb4af149..7b814474b7 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -38,9 +38,8 @@ testInterfaceParseStats(const void *opaque) g_autofree char *buf = NULL; virDomainInterfaceStatsStruct actual; - if (virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", - abs_srcdir, data->filename) < 0) - return -1; + virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", abs_srcdir, + data->filename); if (virFileReadAll(filename, 1024, &buf) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 0934842252..29568eea1a 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -196,8 +196,7 @@ testSocketAccept(const void *opaque) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) - goto cleanup; + virAsprintf(&path, "%s/test.sock", tmpdir); if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) < 0) goto cleanup; @@ -321,8 +320,7 @@ static int testSocketUNIXAddrs(const void *data G_GNUC_UNUSED) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) - goto cleanup; + virAsprintf(&path, "%s/test.sock", tmpdir); if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0) goto cleanup; diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c index 973fee5747..89f9de0c17 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -66,13 +66,11 @@ testCompareXMLToXMLHelper(const void *data) int ret = -1; char *xml = NULL; - if (virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", abs_srcdir, + info->name); ret = testCompareXMLToXMLFiles(xml); - cleanup: VIR_FREE(xml); return ret; diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 3eefb7ccee..faff8bb4a2 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,8 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path = NULL; - if (virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH) < 0) - return false; + virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); numa_avail = virFileExists(sysfs_node_path); diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c index bba63e9564..d5ace8f89f 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -72,14 +72,11 @@ testCompareXMLToXMLHelper(const void *data) const test_parms *tp = data; char *xml = NULL; - if (virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", - abs_srcdir, tp->name) < 0) { - goto cleanup; - } + virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdir, + tp->name); result = testCompareXMLToXMLFiles(xml); - cleanup: VIR_FREE(xml); return result; diff --git a/tests/virpcimock.c b/tests/virpcimock.c index d7dc0b00f0..a6bdad7a75 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,8 +186,7 @@ make_file(const char *path, if (value && len == -1) len = strlen(value); - if (virAsprintfQuiet(&filepath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&filepath, "%s/%s", path, name); if ((fd = real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -204,8 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath = NULL; - if (virAsprintfQuiet(&dirpath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&dirpath, "%s/%s", path, name); if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -218,8 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath = NULL; - if (virAsprintfQuiet(&filepath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&filepath, "%s/%s", path, name); if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -235,10 +232,7 @@ pci_read_file(const char *path, int fd = -1; g_autofree char *newpath = NULL; - if (virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path) < 0) { - errno = ENOMEM; - goto cleanup; - } + virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path); if ((fd = real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -275,19 +269,13 @@ getrealpath(char **newpath, init_env(); if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - if (virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)) < 0) { - errno = ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - if (virAsprintfQuiet(newpath, "%s/%s", - fakerootdir, - path) < 0) { - errno = ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/%s", + fakerootdir, + path); } else { *newpath = g_strdup(path); } @@ -368,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; - ignore_value(virAsprintfQuiet(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function)); + virAsprintfQuiet(&ret, ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } @@ -405,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - ignore_value(virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid, file)); + virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - ignore_value(virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid)); + virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } return ret; @@ -427,9 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; - if (virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", - fakerootdir, dev->iommuGroup) < 0) - ABORT_OOM(); + virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -492,11 +479,11 @@ pci_device_new_from_stub(const struct pciDevice *data) c = strchr(c, ':'); } - if (VIR_ALLOC_QUIET(dev) < 0 || - virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", - abs_srcdir, id) < 0) + if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); + virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); + memcpy(dev, data, sizeof(*dev)); if (!(devpath = pci_device_get_path(dev, NULL, true))) @@ -557,8 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } - if (virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir) < 0) - ABORT_OOM(); + virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); make_symlink(devsympath, devid, tmp); @@ -639,12 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - if (virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup) < 0) { - errno = ENOMEM; - return -1; - } + virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if (unlink(vfiopath) < 0) return -1; @@ -668,12 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; if (pciIommuGroups[i]->nDevicesBoundToVFIO == 0) { - if (virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup) < 0) { - errno = ENOMEM; - goto cleanup; - } + virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd = real_open(vfiopath, O_CREAT)) < 0) goto cleanup; @@ -705,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix = fakerootdir; if (file) { - ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", - prefix, driver->name, file)); + virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", - prefix, driver->name)); + virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } return ret; @@ -991,9 +971,7 @@ init_env(void) if (!(fakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); - if (virAsprintfQuiet(&tmp, "%s%s", - fakerootdir, SYSFS_PCI_PREFIX) < 0) - ABORT_OOM(); + virAsprintfQuiet(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -1004,8 +982,7 @@ init_env(void) /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - if (virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir) < 0) - ABORT_OOM(); + virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index de2ffc7d41..20eb2caea9 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -349,11 +349,8 @@ mymain(void) domain, bus, slot, function, NULL \ }; \ char *label = NULL; \ - if (virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ - #fnc, domain, bus, slot, function) < 0) { \ - ret = -1; \ - break; \ - } \ + virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ + #fnc, domain, bus, slot, function); \ if (virTestRun(label, fnc, &data) < 0) \ ret = -1; \ VIR_FREE(label); \ @@ -365,12 +362,9 @@ mymain(void) domain, bus, slot, function, driver \ }; \ char *label = NULL; \ - if (virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ - domain, bus, slot, function, \ - NULLSTR(driver)) < 0) { \ - ret = -1; \ - break; \ - } \ + virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ + domain, bus, slot, function, \ + NULLSTR(driver)); \ if (virTestRun(label, testVirPCIDeviceCheckDriverTest, \ &data) < 0) \ ret = -1; \ diff --git a/tests/virrandommock.c b/tests/virrandommock.c index a74776efa3..eff72a8aa7 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -53,8 +53,9 @@ uint64_t virRandomBits(int nbits) int virRandomGenerateWWN(char **wwn, const char *virt_type G_GNUC_UNUSED) { - return virAsprintf(wwn, "5100000%09llx", - (unsigned long long)virRandomBits(36)); + virAsprintf(wwn, "5100000%09llx", + (unsigned long long)virRandomBits(36)); + return 0; } diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index 34882ac127..71870e9f3f 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -26,17 +26,14 @@ test_virResctrlGetUnused(const void *opaque) char *schemata_file; virCapsPtr caps = NULL; - if (virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, + data->filename); - if (virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename); - if (virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", abs_srcdir, + data->filename); virFileWrapperAddPrefix("/sys/devices/system", system_dir); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl_dir); diff --git a/tests/virschematest.c b/tests/virschematest.c index dabbc02163..1370068601 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -87,12 +87,9 @@ testSchemaDir(const char *schema, if (ent->d_name[0] == '.') continue; - if (virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name) < 0) - goto cleanup; + virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name); - if (virAsprintf(&test_name, "Checking %s against %s", - ent->d_name, schema) < 0) - goto cleanup; + virAsprintf(&test_name, "Checking %s against %s", ent->d_name, schema); data.xml_path = xml_path; if (virTestRun(test_name, testSchemaFile, &data) < 0) @@ -105,7 +102,6 @@ testSchemaDir(const char *schema, if (rc < 0) ret = -1; - cleanup: VIR_FREE(test_name); VIR_FREE(xml_path); VIR_DIR_CLOSE(dir); @@ -124,16 +120,12 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr validator, ...) va_start(args, validator); while ((dir = va_arg(args, char *))) { - if (virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir) < 0) { - ret = -1; - goto cleanup; - } + virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir); if (testSchemaDir(schema, validator, dir_path) < 0) ret = -1; VIR_FREE(dir_path); } - cleanup: VIR_FREE(dir_path); va_end(args); return ret; @@ -147,9 +139,8 @@ testSchemaGrammar(const void *opaque) char *schema_path; int ret = -1; - if (virAsprintf(&schema_path, "%s/docs/schemas/%s", - abs_top_srcdir, data->schema) < 0) - return -1; + virAsprintf(&schema_path, "%s/docs/schemas/%s", abs_top_srcdir, + data->schema); if (!(data->validator = virXMLValidatorInit(schema_path))) goto cleanup; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 99374cc80c..0d2ddd3b6a 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -167,11 +167,9 @@ create_symlink(const char *tmpdir, const char *src_name, const char *dst_name) char *src_path = NULL; char *dst_path = NULL; - if (virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name) < 0) - goto cleanup; + virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name); - if (virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name) < 0) - goto cleanup; + virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name); if (symlink(src_path, dst_path) < 0) { VIR_WARN("Failed to create symlink '%s' to '%s'", src_path, dst_path); @@ -194,10 +192,7 @@ mymain(void) char *tmpdir = NULL; char template[] = "/tmp/libvirt_XXXXXX"; - if (virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir) < 0) { - ret = -1; - goto cleanup; - } + virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir); tmpdir = mkdtemp(template); diff --git a/tests/virshtest.c b/tests/virshtest.c index fee6833c9b..475933a93c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -252,9 +252,8 @@ mymain(void) { int ret = 0; - if (virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", - abs_srcdir) < 0) - return EXIT_FAILURE; + virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", + abs_srcdir); if (virTestRun("virsh list (default)", testCompareListDefault, NULL) != 0) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 8f1d93fa5a..af1b4fc43f 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -138,13 +138,12 @@ testPrepImages(void) compat = true; VIR_FREE(buf); - if (virAsprintf(&absraw, "%s/raw", datadir) < 0 || - virAsprintf(&absqcow2, "%s/qcow2", datadir) < 0 || - virAsprintf(&abswrap, "%s/wrap", datadir) < 0 || - virAsprintf(&absqed, "%s/qed", datadir) < 0 || - virAsprintf(&absdir, "%s/dir", datadir) < 0 || - virAsprintf(&abslink2, "%s/sub/link2", datadir) < 0) - goto cleanup; + virAsprintf(&absraw, "%s/raw", datadir); + virAsprintf(&absqcow2, "%s/qcow2", datadir); + virAsprintf(&abswrap, "%s/wrap", datadir); + virAsprintf(&absqed, "%s/qed", datadir); + virAsprintf(&absdir, "%s/dir", datadir); + virAsprintf(&abslink2, "%s/sub/link2", datadir); if (virFileMakePath(datadir "/sub") < 0) { fprintf(stderr, "unable to create directory %s\n", datadir "/sub"); @@ -160,8 +159,8 @@ testPrepImages(void) goto cleanup; } - if (virAsprintf(&buf, "%1024d", 0) < 0 || - virFileWriteStr("raw", buf, 0600) < 0) { + virAsprintf(&buf, "%1024d", 0); + if (virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; } @@ -322,30 +321,28 @@ testStorageChain(const void *args) return -1; } - if (virAsprintf(&expect, - testStorageChainFormat, i, - NULLSTR(data->files[i]->path), - NULLSTR(data->files[i]->expBackingStoreRaw), - data->files[i]->expCapacity, - data->files[i]->expEncrypted, - NULLSTR(data->files[i]->pathRel), - data->files[i]->type, - data->files[i]->format, - virStorageNetProtocolTypeToString(data->files[i]->protocol), - NULLSTR(data->files[i]->hostname)) < 0 || - virAsprintf(&actual, - testStorageChainFormat, i, - NULLSTR(elt->path), - NULLSTR(elt->backingStoreRaw), - elt->capacity, - !!elt->encryption, - NULLSTR(elt->relPath), - elt->type, - elt->format, - virStorageNetProtocolTypeToString(elt->protocol), - NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)) < 0) { - return -1; - } + virAsprintf(&expect, + testStorageChainFormat, i, + NULLSTR(data->files[i]->path), + NULLSTR(data->files[i]->expBackingStoreRaw), + data->files[i]->expCapacity, + data->files[i]->expEncrypted, + NULLSTR(data->files[i]->pathRel), + data->files[i]->type, + data->files[i]->format, + virStorageNetProtocolTypeToString(data->files[i]->protocol), + NULLSTR(data->files[i]->hostname)); + virAsprintf(&actual, + testStorageChainFormat, i, + NULLSTR(elt->path), + NULLSTR(elt->backingStoreRaw), + elt->capacity, + !!elt->encryption, + NULLSTR(elt->relPath), + elt->type, + elt->format, + virStorageNetProtocolTypeToString(elt->protocol), + NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); if (STRNEQ(expect, actual)) { virTestDifference(stderr, expect, actual); return -1; diff --git a/tests/virtestmock.c b/tests/virtestmock.c index e0f9c6c2a1..7c10a045b3 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -109,9 +109,8 @@ checkPath(const char *path, char *relPath = NULL; char *crippledPath = NULL; - if (path[0] != '/' && - virAsprintfQuiet(&relPath, "./%s", path) < 0) - goto error; + if (path[0] != '/') + virAsprintfQuiet(&relPath, "./%s", path); /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent @@ -141,9 +140,6 @@ checkPath(const char *path, VIR_FREE(fullPath); return; - error: - fprintf(stderr, "Out of memory\n"); - abort(); } diff --git a/tests/virusbmock.c b/tests/virusbmock.c index cace140725..7b7d24ac77 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -53,17 +53,12 @@ static char *get_fake_path(const char *real_path) const char *p = NULL; char *path = NULL; - if ((p = STRSKIP(real_path, USB_SYSFS)) && - virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p) < 0) - goto error; + if ((p = STRSKIP(real_path, USB_SYSFS))) + virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); else if (!p) path = g_strdup(real_path); return path; - - error: - errno = ENOMEM; - return NULL; } DIR *opendir(const char *name) diff --git a/tests/virusbtest.c b/tests/virusbtest.c index b26173248b..94c55e1fb8 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -52,10 +52,8 @@ static int testDeviceFileActor(virUSBDevicePtr dev, char *str = NULL; int ret = 0; - if (virAsprintf(&str, USB_DEVFS "%03d/%03d", - virUSBDeviceGetBus(dev), - virUSBDeviceGetDevno(dev)) < 0) - return -1; + virAsprintf(&str, USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), + virUSBDeviceGetDevno(dev)); if (STRNEQ(path, str)) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index c19c6cc302..b482873103 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -43,9 +43,7 @@ testVerStrParse(const void *data) unsigned long version; int vmware_type; - if (virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, - info->name) < 0) - return -1; + virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, info->name); if (virTestLoadFile(path, &databuf) < 0) goto cleanup; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 706fec7bac..7e05052744 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -114,16 +114,13 @@ testCompareHelper(const void *data) char *vmx = NULL; char *xml = NULL; - if (virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input) < 0 || - virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output) < 0) { - goto cleanup; - } + virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + info->input); + virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + info->output); ret = testCompareFiles(vmx, xml); - cleanup: VIR_FREE(vmx); VIR_FREE(xml); @@ -151,9 +148,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) goto cleanup; } - if (virAsprintf(&src, "[%s] %s", datastoreName, - directoryAndFileName) < 0) - goto cleanup; + virAsprintf(&src, "[%s] %s", datastoreName, directoryAndFileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src = g_strdup(fileName); @@ -162,8 +157,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) src = NULL; } else { /* Found single file name referencing a file inside a datastore */ - if (virAsprintf(&src, "[datastore] directory/%s", fileName) < 0) - goto cleanup; + virAsprintf(&src, "[datastore] directory/%s", fileName); } cleanup: diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 8e84c84887..25988b1ae8 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -187,18 +187,14 @@ testCompareHelper(const void *data) char *xml = NULL; char *cfg = NULL; - if (virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", abs_srcdir, info->name); + virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->name); if (info->mode == 0) result = testCompareParseXML(cfg, xml, info->replaceVars); else result = testCompareFormatXML(cfg, xml, info->replaceVars); - cleanup: VIR_FREE(xml); VIR_FREE(cfg); diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index b67b14ea9d..55fcd95081 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -131,18 +131,14 @@ testCompareHelper(const void *data) char *cfg = NULL; char *cfgout = NULL; - if (virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name); + virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->name); if (info->mode == 0) result = testCompareParseXML(cfg, xml); else result = testCompareFormatXML(cfg, xml); - cleanup: VIR_FREE(xml); VIR_FREE(cfg); VIR_FREE(cfgout); diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 42ab4ed929..b39862b4bb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -115,16 +115,13 @@ testCompareHelper(const void *data) char *xml = NULL; char *vmx = NULL; - if (virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, - info->input) < 0 || - virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, - info->output) < 0) { - goto cleanup; - } + virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, + info->input); + virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, + info->output); result = testCompareFiles(xml, vmx, info->virtualHW_version); - cleanup: VIR_FREE(xml); VIR_FREE(vmx); @@ -169,9 +166,8 @@ testFormatVMXFileName(const char *src, void *opaque G_GNUC_UNUSED) directoryAndFileName += strspn(directoryAndFileName, " "); } - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, - directoryAndFileName) < 0) - goto cleanup; + virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, + directoryAndFileName); } else if (STRPREFIX(src, "/")) { /* Found absolute path */ absolutePath = g_strdup(src); -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/driver.c | 6 ++---- src/libvirt-admin.c | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/driver.c b/src/driver.c index 125cf02890..89851cb629 100644 --- a/src/driver.c +++ b/src/driver.c @@ -90,8 +90,7 @@ virDriverShouldAutostart(const char *dir, *autostart = false; - if (virAsprintf(&path, "%s/autostarted", dir) < 0) - return -1; + virAsprintf(&path, "%s/autostarted", dir); if (virFileExists(path)) { VIR_DEBUG("Autostart file %s exists, skipping autostart", path); @@ -152,8 +151,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const char *name) g_autofree char *uri = NULL; const char *uriPath = geteuid() == 0 ? "/system" : "/session"; - if (virAsprintf(&uri, "%s://%s", name, uriPath) < 0) - return NULL; + virAsprintf(&uri, "%s://%s", name, uriPath); conn = virConnectOpen(uri); VIR_DEBUG("Opened new %s connection %p", name, conn); diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 9a18ea0f8b..7ff549bca4 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -141,18 +141,16 @@ getSocketPath(virURIPtr uri) if (legacy) { sockbase = g_strdup("libvirt-admin-sock"); } else { - if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0) - goto error; + virAsprintf(&sockbase, "%s-admin-sock", uri->scheme); } if (STREQ_NULLABLE(uri->path, "/system")) { - if (virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", - sockbase) < 0) - goto error; + virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", sockbase); } else if (STREQ_NULLABLE(uri->path, "/session")) { - if (!rundir || virAsprintf(&sock_path, "%s/%s", rundir, - sockbase) < 0) + if (!rundir) goto error; + + virAsprintf(&sock_path, "%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid URI path '%s', try '/system'"), -- 2.21.0

There's no difference between virAsprintf() and virAsprintfQuiet(). Fix places where the latter is used to use the former. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/conf/domain_audit.c | 38 ++++++++--------- src/locking/lock_driver_sanlock.c | 2 +- src/security/virt-aa-helper.c | 27 ++++++------ src/util/virdevmapper.c | 6 +-- src/util/virerror.c | 2 +- src/util/viriptables.c | 4 +- src/util/virkmod.c | 2 +- src/util/virlog.c | 16 +++---- src/util/virprocess.c | 6 +-- tests/nssmock.c | 6 +-- tests/scsihosttest.c | 12 +++--- tests/vircgroupmock.c | 8 ++-- tests/virfilemock.c | 2 +- tests/virfilewrapper.c | 2 +- tests/virnetdevmock.c | 4 +- tests/virnumamock.c | 2 +- tests/virpcimock.c | 70 +++++++++++++++---------------- tests/virtestmock.c | 2 +- tests/virusbmock.c | 2 +- 19 files changed, 106 insertions(+), 107 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 98b80e5bec..2a52e7dc7f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -53,7 +53,7 @@ virDomainAuditGetRdev(const char *path) (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { int maj = major(sb.st_rdev); int min = minor(sb.st_rdev); - virAsprintfQuiet(&ret, "%02X:%02X", maj, min); + virAsprintf(&ret, "%02X:%02X", maj, min); } return ret; } @@ -101,8 +101,8 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!newsrcpath && !oldsrcpath) return; - virAsprintfQuiet(&newdev, "new-%s", type); - virAsprintfQuiet(&olddev, "old-%s", type); + virAsprintf(&newdev, "new-%s", type); + virAsprintf(&olddev, "old-%s", type); virUUIDFormat(vm->def->uuid, uuidstr); @@ -373,15 +373,15 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virAsprintfQuiet(&address, - VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function); + virAsprintf(&address, + VIR_PCI_DEVICE_ADDRESS_FMT, + pcisrc->addr.domain, + pcisrc->addr.bus, + pcisrc->addr.slot, + pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - virAsprintfQuiet(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->device); + virAsprintf(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->device); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { if (scsisrc->protocol == @@ -393,10 +393,10 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - virAsprintfQuiet(&address, "%s:%u:%u:%llu", - scsihostsrc->adapter, scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); + virAsprintf(&address, "%s:%u:%u:%llu", + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } break; } @@ -648,8 +648,8 @@ virDomainAuditCgroupMajor(virDomainObjPtr vm, virCgroupPtr cgroup, { char *extra; - virAsprintfQuiet(&extra, "major category=%s maj=%02X acl=%s", - name, maj, perms); + virAsprintf(&extra, "major category=%s maj=%02X acl=%s", + name, maj, perms); virDomainAuditCgroup(vm, cgroup, reason, extra, success); @@ -688,8 +688,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupPtr cgroup, goto cleanup; } - virAsprintfQuiet(&extra, "path %s rdev=%s acl=%s", - detail, VIR_AUDIT_STR(rdev), perms); + virAsprintf(&extra, "path %s rdev=%s acl=%s", + detail, VIR_AUDIT_STR(rdev), perms); virDomainAuditCgroup(vm, cgroup, reason, extra, rc == 0); @@ -926,7 +926,7 @@ virDomainAuditShmem(virDomainObjPtr vm, goto cleanup; } - virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name); + virAsprintf(&shmpath, "/dev/shm/%s", def->name); if (!virt) { VIR_WARN("Unexpected virt type %d while encoding audit message", diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 0aee93c195..55f0a3621d 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - virAsprintfQuiet(message, _("sanlock error %d"), err); + virAsprintf(message, _("sanlock error %d"), err); #endif return true; } else { diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3fe2da22ef..c2679cdad2 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -157,7 +157,7 @@ parserCommand(const char *profile_name, const char cmd) snprintf(flag, 3, "-%c", cmd); - virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_name); + virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_name); if (!virFileExists(profile)) { vah_error(NULL, 0, _("profile does not exist")); @@ -214,9 +214,9 @@ update_include_file(const char *include_file, const char *included_files, } if (append && virFileExists(include_file)) - virAsprintfQuiet(&pcontent, "%s%s", existing, included_files); + virAsprintf(&pcontent, "%s%s", existing, included_files); else - virAsprintfQuiet(&pcontent, "%s%s", warning, included_files); + virAsprintf(&pcontent, "%s%s", warning, included_files); plen = strlen(pcontent); if (plen > MAX_FILE_LEN) { @@ -290,8 +290,7 @@ create_profile(const char *profile, const char *profile_name, driver_name = virDomainVirtTypeToString(virtType); } - virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", - driver_name); + virAsprintf(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", driver_name); if (!virFileExists(template)) { vah_error(NULL, 0, _("template does not exist")); @@ -314,11 +313,11 @@ create_profile(const char *profile, const char *profile_name, } /* '\nprofile <profile_name>\0' */ - virAsprintfQuiet(&replace_name, "\nprofile %s", profile_name); + virAsprintf(&replace_name, "\nprofile %s", profile_name); /* '\n<profile_files>\n}\0' */ if (virtType != VIR_DOMAIN_VIRT_LXC) - virAsprintfQuiet(&replace_files, "\n%s\n}", profile_files); + virAsprintf(&replace_files, "\n%s\n}", profile_files); plen = tlen + strlen(replace_name) - strlen(template_name) + 1; @@ -769,7 +768,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi vah_error(NULL, 0, _("could not find realpath")); goto cleanup; } - virAsprintfQuiet(&tmp, "%s%s", pathreal, pathtmp); + virAsprintf(&tmp, "%s%s", pathreal, pathtmp); } perms_new = g_strdup(perms); @@ -836,13 +835,13 @@ vah_add_file_chardev(virBufferPtr buf, if (type == VIR_DOMAIN_CHR_TYPE_PIPE) { /* add the pipe input */ - virAsprintfQuiet(&pipe_in, "%s.in", path); + virAsprintf(&pipe_in, "%s.in", path); if (vah_add_file(buf, pipe_in, perms) != 0) goto clean_pipe_in; /* add the pipe output */ - virAsprintfQuiet(&pipe_out, "%s.out", path); + virAsprintf(&pipe_out, "%s.out", path); if (vah_add_file(buf, pipe_out, perms) != 0) goto clean_pipe_out; @@ -935,7 +934,7 @@ get_files(vahControl * ctl) /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); - virAsprintfQuiet(&uuid, "%s%s", AA_PREFIX, uuidstr); + virAsprintf(&uuid, "%s%s", AA_PREFIX, uuidstr); if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); @@ -1432,8 +1431,8 @@ main(int argc, char **argv) if (vahParseArgv(ctl, argc, argv) != 0) vah_error(ctl, 1, _("could not parse arguments")); - virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); - virAsprintfQuiet(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt", ctl->uuid); + virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); + virAsprintf(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt", ctl->uuid); if (ctl->cmd == 'a') { rc = parserLoad(ctl->uuid); @@ -1495,7 +1494,7 @@ main(int argc, char **argv) /* create the profile from TEMPLATE */ if (ctl->cmd == 'c') { char *tmp = NULL; - virAsprintfQuiet(&tmp, " #include <libvirt/%s.files>\n", ctl->uuid); + virAsprintf(&tmp, " #include <libvirt/%s.files>\n", ctl->uuid); if (ctl->dryrun) { vah_info(profile); diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 1c8f356387..4f29f74c77 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,9 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; for (i = 0; i < deps->count; i++) { - virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])); + virAsprintf(&devPaths[i], "/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } recursiveDevPaths = NULL; diff --git a/src/util/virerror.c b/src/util/virerror.c index c31103c3b7..ee0ec1cffc 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,7 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; - virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message); + virAsprintf(&newmsg, "%s: %s", fmtmsg, err->message); VIR_FREE(err->message); err->message = g_steal_pointer(&newmsg); diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e339368040..c8c4d98f30 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -918,10 +918,10 @@ iptablesForwardMasquerade(virFirewallPtr fw, if (addrStartStr && addrStartStr[0]) { if (addrEndStr && addrEndStr[0]) { virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, - portRangeStr ? portRangeStr : ""); + portRangeStr ? portRangeStr : ""); } else { virAsprintf(&natRangeStr, "%s%s", addrStartStr, - portRangeStr ? portRangeStr : ""); + portRangeStr ? portRangeStr : ""); } virFirewallRuleAddArgList(fw, rule, diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 962b132d31..12e6e5676c 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,7 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst = NULL; g_autofree char *outbuf = NULL; - virAsprintfQuiet(&drvblklst, "blacklist %s\n", module); + virAsprintf(&drvblklst, "blacklist %s\n", module); /* modprobe will convert all '-' into '_', so we need to as well */ for (i = 0; i < drvblklst[i]; i++) diff --git a/src/util/virlog.c b/src/util/virlog.c index bfb2430ed3..880539e5c0 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -453,13 +453,13 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname != NULL)) { - virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - funcname, linenr, str); + virAsprintf(msg, "%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + funcname, linenr, str); } else { - virAsprintfQuiet(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - str); + virAsprintf(msg, "%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + str); } } @@ -481,7 +481,7 @@ virLogHostnameString(char **rawmsg, { char *hoststr; - virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname); + virAsprintf(&hoststr, "hostname: %s", virLogHostname); virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg = hoststr; @@ -689,7 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; - virAsprintfQuiet(&msg, "%s: %s", timestamp, str); + virAsprintf(&msg, "%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 032d09e904..107a0fb9c9 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - virAsprintfQuiet(&buf, _("exit status %d"), + virAsprintf(&buf, _("exit status %d"), WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - virAsprintfQuiet(&buf, _("fatal signal %d"), + virAsprintf(&buf, _("fatal signal %d"), WTERMSIG(status)); } else { - virAsprintfQuiet(&buf, _("invalid value %d"), status); + virAsprintf(&buf, _("invalid value %d"), status); } return buf; } diff --git a/tests/nssmock.c b/tests/nssmock.c index be70a60790..8d707a64a5 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,9 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - virAsprintfQuiet(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)); + virAsprintf(newpath, "%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath = g_strdup(path); } diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index f86c99df86..947a81560a 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,10 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *devicepath, int ret = -1; int fd = -1; - virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", - fakesysfsdir, devicepath); - virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname); + virAsprintf(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", + fakesysfsdir, devicepath); + virAsprintf(&link_path, "%s/class/scsi_host/%s", + fakesysfsdir, hostname); /* Rather than create path & file, temporarily snip off the file to * create the path @@ -255,14 +255,14 @@ mymain(void) goto cleanup; } - virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir); + virAsprintf(&fakesysfsdir, "%s/sys", fakerootdir); if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs='%s'\n", fakesysfsdir); goto cleanup; } - virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); + virAsprintf(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 4c67b9ad4e..1735852f39 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,8 +376,8 @@ static void init_sysfs(void) VIR_FREE(fakesysfscgroupdir); - virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX); + virAsprintf(&fakesysfscgroupdir, "%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -458,8 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno = EACCES; return NULL; } - virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type); + virAsprintf(&filepath, "%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc = real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/virfilemock.c b/tests/virfilemock.c index e32d749d52..bb5fcc2ed8 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; if ((p = STRSKIP(path, "/some/symlink"))) - virAsprintfQuiet(&ret, "/gluster%s", p); + virAsprintf(&ret, "/gluster%s", p); else ret = g_strdup(path); diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 765b3b31d9..e3d3c225ad 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,7 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; - virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp); + virAsprintf(newpath, "%s%s", overrides[i], tmp); break; } diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 574a26af2d..8834b2ca6a 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,8 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file); + virAsprintf(pf_sysfs_device_link, "%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } #else diff --git a/tests/virnumamock.c b/tests/virnumamock.c index faff8bb4a2..4a52483a7f 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,7 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path = NULL; - virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); + virAsprintf(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); numa_avail = virFileExists(sysfs_node_path); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index a6bdad7a75..67107450e6 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,7 +186,7 @@ make_file(const char *path, if (value && len == -1) len = strlen(value); - virAsprintfQuiet(&filepath, "%s/%s", path, name); + virAsprintf(&filepath, "%s/%s", path, name); if ((fd = real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -203,7 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath = NULL; - virAsprintfQuiet(&dirpath, "%s/%s", path, name); + virAsprintf(&dirpath, "%s/%s", path, name); if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -216,7 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath = NULL; - virAsprintfQuiet(&filepath, "%s/%s", path, name); + virAsprintf(&filepath, "%s/%s", path, name); if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -232,7 +232,7 @@ pci_read_file(const char *path, int fd = -1; g_autofree char *newpath = NULL; - virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path); + virAsprintf(&newpath, "%s/%s", fakerootdir, path); if ((fd = real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -269,13 +269,13 @@ getrealpath(char **newpath, init_env(); if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)); + virAsprintf(newpath, "%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - virAsprintfQuiet(newpath, "%s/%s", - fakerootdir, - path); + virAsprintf(newpath, "%s/%s", + fakerootdir, + path); } else { *newpath = g_strdup(path); } @@ -356,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; - virAsprintfQuiet(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); + virAsprintf(&ret, ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } @@ -393,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid, file); + virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid); + virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } return ret; @@ -415,8 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; - virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", - fakerootdir, dev->iommuGroup); + virAsprintf(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -482,7 +482,7 @@ pci_device_new_from_stub(const struct pciDevice *data) if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); - virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); + virAsprintf(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); memcpy(dev, data, sizeof(*dev)); @@ -544,7 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } - virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); + virAsprintf(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); make_symlink(devsympath, devid, tmp); @@ -625,9 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + virAsprintf(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if (unlink(vfiopath) < 0) return -1; @@ -651,9 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; if (pciIommuGroups[i]->nDevicesBoundToVFIO == 0) { - virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + virAsprintf(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd = real_open(vfiopath, O_CREAT)) < 0) goto cleanup; @@ -685,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix = fakerootdir; if (file) { - virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", - prefix, driver->name, file); + virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", - prefix, driver->name); + virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } return ret; @@ -971,7 +971,7 @@ init_env(void) if (!(fakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); - virAsprintfQuiet(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); + virAsprintf(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -982,7 +982,7 @@ init_env(void) /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir); + virAsprintf(&tmp, "%s/dev/vfio", fakerootdir); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 7c10a045b3..116a6ad400 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -110,7 +110,7 @@ checkPath(const char *path, char *crippledPath = NULL; if (path[0] != '/') - virAsprintfQuiet(&relPath, "./%s", path); + virAsprintf(&relPath, "./%s", path); /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 7b7d24ac77..1b0beb81cb 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -54,7 +54,7 @@ static char *get_fake_path(const char *real_path) char *path = NULL; if ((p = STRSKIP(real_path, USB_SYSFS))) - virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); + virAsprintf(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); else if (!p) path = g_strdup(real_path); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/access/viraccessdriverpolkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index 5d6c4204ff..1d6ff81391 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -59,8 +59,8 @@ virAccessDriverPolkitFormatAction(const char *typename, char *actionid = NULL; size_t i; - virAsprintf(&actionid, "%s.%s.%s", VIR_ACCESS_DRIVER_POLKIT_ACTION_PREFIX, - typename, permname); + actionid = g_strdup_printf("%s.%s.%s", VIR_ACCESS_DRIVER_POLKIT_ACTION_PREFIX, + typename, permname); for (i = 0; actionid[i]; i++) if (actionid[i] == '_') -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/bhyve/bhyve_capabilities.c | 4 ++-- src/bhyve/bhyve_process.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 2f03bd6131..a533692517 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -159,8 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; - virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s", - firmware_dir, entry->d_name); + firmwares->values[firmwares->nvalues] = g_strdup_printf("%s/%s", + firmware_dir, entry->d_name); firmwares->nvalues++; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 17e32176d9..7e2631f6ea 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -89,7 +89,7 @@ bhyveNetCleanup(virDomainObjPtr vm) static void virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name); + *fn_out, = g_strdup_printf("%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm_name); } int @@ -112,7 +112,7 @@ virBhyveProcessStart(virConnectPtr conn, int ret = -1, rc; virCapsPtr caps = NULL; - virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name); + logfile = g_strdup_printf("%s/%s.log", BHYVE_LOG_DIR, vm->def->name); caps = bhyveDriverGetCapabilities(privconn); if (!caps) @@ -403,7 +403,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (kp == NULL || nprocs != 1) goto cleanup; - virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name); + expected_proctitle = g_strdup_printf("bhyve: %s", vm->def->name); proc_argv = kvm_getargv(data->kd, kp, 0); if (proc_argv && proc_argv[0]) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/conf/capabilities.c | 2 +- src/conf/domain_addr.c | 8 +++---- src/conf/domain_audit.c | 38 ++++++++++++++++---------------- src/conf/domain_conf.c | 30 ++++++++++++------------- src/conf/moment_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_util.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 4 ++-- src/conf/virchrdev.c | 4 ++-- src/conf/virnetworkobj.c | 6 ++--- src/conf/virnetworkportdef.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virstorageobj.c | 2 +- 14 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index b93b6ff451..0bc955230f 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1869,7 +1869,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) int rv = -1; VIR_FREE(path); - virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos); + path = g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos); VIR_DIR_CLOSE(dirp); diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 9cc098a025..34fabcded9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1388,10 +1388,10 @@ virDomainCCWAddressAsString(virDomainDeviceCCWAddressPtr addr) { char *addrstr = NULL; - virAsprintf(&addrstr, "%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno); + addrstr = g_strdup_printf("%x.%x.%04x", + addr->cssid, + addr->ssid, + addr->devno); return addrstr; } diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2a52e7dc7f..761796e956 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -53,7 +53,7 @@ virDomainAuditGetRdev(const char *path) (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { int maj = major(sb.st_rdev); int min = minor(sb.st_rdev); - virAsprintf(&ret, "%02X:%02X", maj, min); + ret = g_strdup_printf("%02X:%02X", maj, min); } return ret; } @@ -101,8 +101,8 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!newsrcpath && !oldsrcpath) return; - virAsprintf(&newdev, "new-%s", type); - virAsprintf(&olddev, "old-%s", type); + newdev = g_strdup_printf("new-%s", type); + olddev = g_strdup_printf("old-%s", type); virUUIDFormat(vm->def->uuid, uuidstr); @@ -373,15 +373,15 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virAsprintf(&address, - VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function); + address = g_strdup_printf( + VIR_PCI_DEVICE_ADDRESS_FMT, + pcisrc->addr.domain, + pcisrc->addr.bus, + pcisrc->addr.slot, + pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - virAsprintf(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->device); + address = g_strdup_printf("%.3d.%.3d", usbsrc->bus, usbsrc->device); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { if (scsisrc->protocol == @@ -393,10 +393,10 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - virAsprintf(&address, "%s:%u:%u:%llu", - scsihostsrc->adapter, scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); + address = g_strdup_printf("%s:%u:%u:%llu", + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } break; } @@ -648,8 +648,8 @@ virDomainAuditCgroupMajor(virDomainObjPtr vm, virCgroupPtr cgroup, { char *extra; - virAsprintf(&extra, "major category=%s maj=%02X acl=%s", - name, maj, perms); + extra = g_strdup_printf("major category=%s maj=%02X acl=%s", + name, maj, perms); virDomainAuditCgroup(vm, cgroup, reason, extra, success); @@ -688,8 +688,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupPtr cgroup, goto cleanup; } - virAsprintf(&extra, "path %s rdev=%s acl=%s", - detail, VIR_AUDIT_STR(rdev), perms); + extra = g_strdup_printf("path %s rdev=%s acl=%s", + detail, VIR_AUDIT_STR(rdev), perms); virDomainAuditCgroup(vm, cgroup, reason, extra, rc == 0); @@ -926,7 +926,7 @@ virDomainAuditShmem(virDomainObjPtr vm, goto cleanup; } - virAsprintf(&shmpath, "/dev/shm/%s", def->name); + shmpath = g_strdup_printf("/dev/shm/%s", def->name); if (!virt) { VIR_WARN("Unexpected virt type %d while encoding audit message", diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5674032b30..0697000d9f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4911,7 +4911,7 @@ virDomainPostParseCheckISCSIPath(char **srcpath) if (strchr(*srcpath, '/')) return 0; - virAsprintf(&path, "%s/0", *srcpath); + path = g_strdup_printf("%s/0", *srcpath); VIR_FREE(*srcpath); *srcpath = g_steal_pointer(&path); return 0; @@ -5572,7 +5572,7 @@ virDomainDefCollectBootOrder(virDomainDefPtr def G_GNUC_UNUSED, */ return 0; } - virAsprintf(&order, "%u", info->bootIndex); + order = g_strdup_printf("%u", info->bootIndex); if (virHashLookup(bootHash, order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10120,8 +10120,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (!target && !(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) { if (def->src->srcpool) { - virAsprintf(&tmp, "pool = '%s', volume = '%s'", - def->src->srcpool->pool, def->src->srcpool->volume); + tmp = g_strdup_printf("pool = '%s', volume = '%s'", + def->src->srcpool->pool, def->src->srcpool->volume); virReportError(VIR_ERR_NO_TARGET, "%s", tmp); VIR_FREE(tmp); @@ -10318,7 +10318,7 @@ virDomainParseScaledValue(const char *xpath, g_autofree char *bytes_str = NULL; *val = 0; - virAsprintf(&xpath_full, "string(%s)", xpath); + xpath_full = g_strdup_printf("string(%s)", xpath); bytes_str = virXPathString(xpath_full, ctxt); if (!bytes_str) { @@ -10339,9 +10339,9 @@ virDomainParseScaledValue(const char *xpath, } if (units_xpath) - virAsprintf(&xpath_full, "string(%s)", units_xpath); + xpath_full = g_strdup_printf("string(%s)", units_xpath); else - virAsprintf(&xpath_full, "string(%s/@unit)", xpath); + xpath_full = g_strdup_printf("string(%s/@unit)", xpath); unit = virXPathString(xpath_full, ctxt); if (virScaleInteger(&bytes, unit, scale, max) < 0) @@ -19370,7 +19370,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, if (!(tmp = virBitmapFormat(domresmon->vcpus))) goto cleanup; - virAsprintf(&id, "vcpus_%s", tmp); + id = g_strdup_printf("vcpus_%s", tmp); } virResctrlMonitorSetAlloc(domresmon->instance, resctrl->alloc); @@ -19420,7 +19420,7 @@ virDomainResctrlNew(xmlNodePtr node, * directory, so it's nice to have it named appropriately. For now it's * 'vcpus_...' but it's designed in order for it to be changeable in the * future (it's part of the status XML). */ - virAsprintf(&alloc_id, "vcpus_%s", vcpus_str); + alloc_id = g_strdup_printf("vcpus_%s", vcpus_str); } if (virResctrlAllocSetID(alloc, alloc_id) < 0) @@ -24022,7 +24022,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, virStorageNetProtocolTypeToString(src->protocol)); if (src->volume) - virAsprintf(&path, "%s/%s", src->volume, src->path); + path = g_strdup_printf("%s/%s", src->volume, src->path); virBufferEscapeString(attrBuf, " name='%s'", path ? path : src->path); @@ -29189,7 +29189,7 @@ char { char *ret; - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret = g_strdup_printf("%s/%s.xml", dir, name); return ret; } @@ -30339,7 +30339,7 @@ virDomainDefGetShortName(const virDomainDef *def) len = mbstowcs(NULL, def->name, 0); if ((len == (size_t) -1 && errno == EILSEQ) || len == strlen(def->name)) { - virAsprintf(&ret, "%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, def->name); + ret = g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, def->name); return ret; } @@ -30375,7 +30375,7 @@ virDomainDefGetShortName(const virDomainDef *def) return NULL; } - virAsprintf(&ret, "%d-%s", def->id, shortname); + ret = g_strdup_printf("%d-%s", def->id, shortname); return ret; } @@ -31181,8 +31181,8 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def, } /* iscsi pool has only one source device path */ - virAsprintf(&def->src->path, "%s/%s", pooldef->source.devices[0].path, - tokens[3]); + def->src->path = g_strdup_printf("%s/%s", pooldef->source.devices[0].path, + tokens[3]); /* Storage pool have not supported these 2 attributes yet, * use the defaults. diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index f11ba76dd4..d02fcb89e2 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -78,7 +78,7 @@ virDomainMomentDefPostParse(virDomainMomentDefPtr def) gettimeofday(&tv, NULL); if (!def->name) - virAsprintf(&def->name, "%lld", (long long)tv.tv_sec); + def->name = g_strdup_printf("%lld", (long long)tv.tv_sec); def->creationTime = tv.tv_sec; return 0; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 8d2bef439b..61778f561a 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2756,7 +2756,7 @@ virNetworkConfigFile(const char *dir, { char *ret = NULL; - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret = g_strdup_printf("%s/%s.xml", dir, name); return ret; } diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 6c7b73384f..d8f4a48225 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -182,7 +182,7 @@ virNodeDeviceDeleteVport(virConnectPtr conn, goto cleanup; } - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name = g_strdup_printf("scsi_%s", name); /* If at startup time we provided a parent, then use that to * get the parent_host value; otherwise, we have to determine diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 2c53e9d764..43a4ae0173 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -618,7 +618,7 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDefPtr def) if ((tmp = strrchr(tmppath, '.')) && !strchr(tmp, '/')) *tmp = '\0'; - virAsprintf(&disk->src->path, "%s.%s", tmppath, def->parent.name); + disk->src->path = g_strdup_printf("%s.%s", tmppath, def->parent.name); VIR_FREE(tmppath); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ec9db7edb0..e03a9460fe 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -953,9 +953,9 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) * path and permissions */ if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) { if (def->type == VIR_STORAGE_POOL_LOGICAL) { - virAsprintf(&target_path, "/dev/%s", def->source.name); + target_path = g_strdup_printf("/dev/%s", def->source.name); } else if (def->type == VIR_STORAGE_POOL_ZFS) { - virAsprintf(&target_path, "/dev/zvol/%s", def->source.name); + target_path = g_strdup_printf("/dev/zvol/%s", def->source.name); } else { target_path = virXPathString("string(./target/path)", ctxt); if (!target_path) { diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 204813c5fd..4b8f526d35 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -88,7 +88,7 @@ static char *virChrdevLockFilePath(const char *dev) ++p; } - virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename); + path = g_strdup_printf("%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename); sanitizedPath = virFileSanitizePath(path); @@ -133,7 +133,7 @@ static int virChrdevLockFileCreate(const char *dev) /* ensure correct format according to filesystem hierarchy standard */ /* http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES */ - virAsprintf(&pidStr, "%10lld\n", (long long)getpid()); + pidStr = g_strdup_printf("%10lld\n", (long long)getpid()); /* create the lock file */ if ((lockfd = open(path, O_WRONLY | O_CREAT | O_EXCL, 00644)) < 0) { diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 852c0a5e43..8fa4de8203 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1627,7 +1627,7 @@ virNetworkObjGetPortStatusDir(virNetworkObjPtr net, const char *stateDir) { char *ret; - virAsprintf(&ret, "%s/%s/ports", stateDir, net->def->name); + ret = g_strdup_printf("%s/%s/ports", stateDir, net->def->name); return ret; } @@ -1739,7 +1739,7 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; - virAsprintf(&file, "%s/%s.xml", dir, de->d_name); + file = g_strdup_printf("%s/%s.xml", dir, de->d_name); if (unlink(file) < 0 && errno != ENOENT) VIR_WARN("Unable to delete %s", file); @@ -1899,7 +1899,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; - virAsprintf(&file, "%s/%s.xml", dir, de->d_name); + file = g_strdup_printf("%s/%s.xml", dir, de->d_name); portdef = virNetworkPortDefParseFile(file); VIR_FREE(file); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 09bd25a9ef..e511bb483f 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -428,7 +428,7 @@ virNetworkPortDefConfigFile(const char *dir, { char *ret = NULL; - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret = g_strdup_printf("%s/%s.xml", dir, name); return ret; } diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 0066faadd8..646e1e5782 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -142,7 +142,7 @@ virNWFilterBindingObjConfigFile(const char *dir, { char *ret; - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret = g_strdup_printf("%s/%s.xml", dir, name); return ret; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 15c5f2624d..5cbd30f93c 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1229,7 +1229,7 @@ matchFCHostToSCSIHost(virStorageAdapterFCHostPtr fchost, */ if (!fchost->parent && (conn = virGetConnectNodeDev())) { - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name = g_strdup_printf("scsi_%s", name); if ((parent_name = virNodeDeviceGetParentName(conn, scsi_host_name))) { if (virStorageIsSameHostnum(parent_name, scsi_hostnum)) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/cpu/cpu_ppc64.c | 19 ++++++++----------- src/cpu/cpu_x86.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 990bbbd45f..3236a9616e 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -460,9 +460,8 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) - virAsprintf(message, - _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)); + *message = g_strdup_printf(_("CPU arch %s does not match host arch"), + virArchToString(cpu->arch)); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -477,10 +476,9 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - virAsprintf(message, - _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor); + *message = g_strdup_printf(_("host CPU vendor does not match required " + "CPU vendor %s"), + cpu->vendor); } ret = VIR_CPU_COMPARE_INCOMPATIBLE; @@ -532,10 +530,9 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("host CPU model does not match required CPU model %s", guest_model->name); if (message) { - virAsprintf(message, - _("host CPU model does not match required " - "CPU model %s"), - guest_model->name); + *message = g_strdup_printf(_("host CPU model does not match required " + "CPU model %s"), + guest_model->name); } ret = VIR_CPU_COMPARE_INCOMPATIBLE; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8418339d6f..82403472df 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1725,7 +1725,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) goto error; \ } \ if (message) \ - virAsprintf(message, "%s: %s", _(MSG), flagsStr); \ + *message = g_strdup_printf("%s: %s", _(MSG), flagsStr); \ VIR_DEBUG("%s: %s", MSG, flagsStr); \ VIR_FREE(flagsStr); \ ret = VIR_CPU_COMPARE_INCOMPATIBLE; \ @@ -1767,9 +1767,8 @@ x86Compute(virCPUDefPtr host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) { - virAsprintf(message, - _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)); + *message = g_strdup_printf(_("CPU arch %s does not match host arch"), + virArchToString(cpu->arch)); } return VIR_CPU_COMPARE_INCOMPATIBLE; } @@ -1783,10 +1782,9 @@ x86Compute(virCPUDefPtr host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - virAsprintf(message, - _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor); + *message = g_strdup_printf(_("host CPU vendor does not match required " + "CPU vendor %s"), + cpu->vendor); } return VIR_CPU_COMPARE_INCOMPATIBLE; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/esx/esx_driver.c | 40 +++++++++++++------------- src/esx/esx_storage_backend_vmfs.c | 46 +++++++++++++++--------------- src/esx/esx_stream.c | 8 +++--- src/esx/esx_vi.c | 23 +++++++-------- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 117ac674d4..8117c454e4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -143,8 +143,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) if (!strchr(fileName, '/') && !strchr(fileName, '\\')) { /* Plain file name, use same directory as for the .vmx file */ - virAsprintf(&result, "%s/%s", data->datastorePathWithoutFileName, - fileName); + result = g_strdup_printf("%s/%s", data->datastorePathWithoutFileName, + fileName); } else { if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || @@ -188,7 +188,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) ++tmp; } - virAsprintf(&result, "[%s] %s", datastoreName, strippedFileName); + result = g_strdup_printf("[%s] %s", datastoreName, strippedFileName); break; } @@ -222,8 +222,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) goto cleanup; } - virAsprintf(&result, "[%s] %s", datastoreName, - directoryAndFileName); + result = g_strdup_printf("[%s] %s", datastoreName, + directoryAndFileName); } /* If it's an absolute path outside of a datastore just use it as is */ @@ -635,8 +635,8 @@ esxConnectToHost(esxPrivate *priv, conn->uri->server))) goto cleanup; - virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, - conn->uri->server, conn->uri->port); + url = g_strdup_printf("%s://%s:%d/sdk", priv->parsedUri->transport, + conn->uri->server, conn->uri->port); if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, @@ -723,8 +723,8 @@ esxConnectToVCenter(esxPrivate *priv, if (!(password = virAuthGetPassword(conn, auth, "esx", username, hostname))) goto cleanup; - virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, - conn->uri->port); + url = g_strdup_printf("%s://%s:%d/sdk", priv->parsedUri->transport, hostname, + conn->uri->port); if (esxVI_Context_Alloc(&priv->vCenter) < 0 || esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, @@ -1158,7 +1158,7 @@ esxConnectGetHostname(virConnectPtr conn) if (!domainName || strlen(domainName) < 1) { complete = g_strdup(hostName); } else { - virAsprintf(&complete, "%s.%s", hostName, domainName); + complete = g_strdup_printf("%s.%s", hostName, domainName); } cleanup: @@ -2638,10 +2638,10 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) data.ctx = priv->primary; if (!directoryName) { - virAsprintf(&data.datastorePathWithoutFileName, "[%s]", datastoreName); + data.datastorePathWithoutFileName = g_strdup_printf("[%s]", datastoreName); } else { - virAsprintf(&data.datastorePathWithoutFileName, "[%s] %s", - datastoreName, directoryName); + data.datastorePathWithoutFileName = g_strdup_printf("[%s] %s", + datastoreName, directoryName); } ctx.opaque = &data; @@ -3106,11 +3106,11 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) /* Register the domain */ if (directoryName) { - virAsprintf(&datastoreRelatedPath, "[%s] %s/%s.vmx", datastoreName, - directoryName, escapedName); + datastoreRelatedPath = g_strdup_printf("[%s] %s/%s.vmx", datastoreName, + directoryName, escapedName); } else { - virAsprintf(&datastoreRelatedPath, "[%s] %s.vmx", datastoreName, - escapedName); + datastoreRelatedPath = g_strdup_printf("[%s] %s.vmx", datastoreName, + escapedName); } if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vmFolder, @@ -3722,9 +3722,9 @@ esxDomainMigratePrepare(virConnectPtr dconn, virCheckFlags(ESX_MIGRATION_FLAGS, -1); if (!uri_in) { - virAsprintf(uri_out, "vpxmigr://%s/%s/%s", priv->vCenter->ipAddress, - priv->vCenter->computeResource->resourcePool->value, - priv->vCenter->hostSystem->_reference->value); + *uri_out = g_strdup_printf("vpxmigr://%s/%s/%s", priv->vCenter->ipAddress, + priv->vCenter->computeResource->resourcePool->value, + priv->vCenter->hostSystem->_reference->value); } return 0; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 24deee7215..5f25f80072 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -606,8 +606,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, if (length < 1) { names[count] = g_strdup(fileInfo->path); } else { - virAsprintf(&names[count], "%s/%s", - directoryAndFileName, fileInfo->path); + names[count] = g_strdup_printf("%s/%s", + directoryAndFileName, fileInfo->path); } ++count; @@ -641,7 +641,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, char *datastorePath = NULL; char *key = NULL; - virAsprintf(&datastorePath, "[%s] %s", pool->name, name); + datastorePath = g_strdup_printf("[%s] %s", pool->name, name); if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, &key) < 0) { @@ -773,11 +773,11 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) if (length < 1) { volumeName = g_strdup(fileInfo->path); } else { - virAsprintf(&volumeName, "%s/%s", - directoryAndFileName, fileInfo->path); + volumeName = g_strdup_printf("%s/%s", + directoryAndFileName, fileInfo->path); } - virAsprintf(&datastorePath, "[%s] %s", datastoreName, volumeName); + datastorePath = g_strdup_printf("[%s] %s", datastoreName, volumeName); if (!esxVI_VmDiskFileInfo_DynamicCast(fileInfo)) { /* Only a VirtualDisk has a UUID */ @@ -884,7 +884,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } - virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); + unescapedDatastorePath = g_strdup_printf("[%s] %s", pool->name, def->name); if (def->target.format == VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -905,11 +905,11 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, if (!fileName) goto cleanup; - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName); + datastorePathWithoutFileName = g_strdup_printf("[%s] %s", pool->name, + directoryName); - virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName); + datastorePath = g_strdup_printf("[%s] %s/%s", pool->name, directoryName, + fileName); /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1066,8 +1066,8 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, - sourceVolume->name); + sourceDatastorePath = g_strdup_printf("[%s] %s", sourceVolume->pool, + sourceVolume->name); /* Parse config */ def = virStorageVolDefParseString(&poolDef, xmldesc, 0); @@ -1098,7 +1098,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); + unescapedDatastorePath = g_strdup_printf("[%s] %s", pool->name, def->name); if (def->target.format == VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -1119,11 +1119,11 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (!fileName) goto cleanup; - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName); + datastorePathWithoutFileName = g_strdup_printf("[%s] %s", pool->name, + directoryName); - virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryName, - fileName); + datastorePath = g_strdup_printf("[%s] %s/%s", pool->name, directoryName, + fileName); /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1218,7 +1218,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) virCheckFlags(0, -1); - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath = g_strdup_printf("[%s] %s", volume->pool, volume->name); if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_reference, @@ -1260,7 +1260,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) virCheckFlags(0, -1); - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath = g_strdup_printf("[%s] %s", volume->pool, volume->name); if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_reference, @@ -1302,7 +1302,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, memset(info, 0, sizeof(*info)); - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath = g_strdup_printf("[%s] %s", volume->pool, volume->name); if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1359,7 +1359,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, } /* Lookup file info */ - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath = g_strdup_printf("[%s] %s", volume->pool, volume->name); if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1420,7 +1420,7 @@ esxStorageVolGetPath(virStorageVolPtr volume) { char *path; - virAsprintf(&path, "[%s] %s", volume->pool, volume->name); + path = g_strdup_printf("[%s] %s", volume->pool, volume->name); return path; } diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 1a779aa095..fe3c42ae02 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -415,9 +415,9 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, const char *url, streamPriv->mode = mode; if (length > 0) { - virAsprintf(&range, "%llu-%llu", offset, offset + length - 1); + range = g_strdup_printf("%llu-%llu", offset, offset + length - 1); } else if (offset > 0) { - virAsprintf(&range, "%llu-", offset); + range = g_strdup_printf("%llu-", offset); } if (esxVI_CURL_Alloc(&streamPriv->curl) < 0 || @@ -446,8 +446,8 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, const char *url, curl_easy_setopt(streamPriv->curl->handle, CURLOPT_PASSWORD, priv->primary->password); #else - virAsprintf(&userpwd, "%s:%s", priv->primary->username, - priv->primary->password); + userpwd = g_strdup_printf("%s:%s", priv->primary->username, + priv->primary->password); curl_easy_setopt(streamPriv->curl->handle, CURLOPT_USERPWD, userpwd); #endif diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 61082c5113..3ff25e2a93 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -387,9 +387,9 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, return -1; } - virAsprintf(&range, "%llu-%llu", offset, offset + *length - 1); + range = g_strdup_printf("%llu-%llu", offset, offset + *length - 1); } else if (offset > 0) { - virAsprintf(&range, "%llu-", offset); + range = g_strdup_printf("%llu-", offset); } virMutexLock(&curl->lock); @@ -1487,9 +1487,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, goto cleanup; } else { - virAsprintf(&xpathExpression, - "/soapenv:Envelope/soapenv:Body/vim:%sResponse", - methodName); + xpathExpression = g_strdup_printf("/soapenv:Envelope/soapenv:Body/vim:%sResponse", + methodName); responseNode = virXPathNode(xpathExpression, xpathContext); @@ -3585,12 +3584,12 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, * The <path> part of the datatore path didn't contain a '/', assume * that the <path> part is actually the file name. */ - virAsprintf(&datastorePathWithoutFileName, "[%s]", datastoreName); + datastorePathWithoutFileName = g_strdup_printf("[%s]", datastoreName); fileName = g_strdup(directoryAndFileName); } else { - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", datastoreName, - directoryName); + datastorePathWithoutFileName = g_strdup_printf("[%s] %s", datastoreName, + directoryName); length = strlen(directoryName); @@ -3816,7 +3815,7 @@ esxVI_LookupDatastoreContentByDatastoreName floppyImageFileQuery = NULL; /* Search datastore for files */ - virAsprintf(&datastorePath, "[%s]", datastoreName); + datastorePath = g_strdup_printf("[%s]", datastoreName); if (esxVI_SearchDatastoreSubFolders_Task(ctx, hostDatastoreBrowser, datastorePath, searchSpec, @@ -4534,9 +4533,9 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } else if (!taskInfo->error->localizedMessage) { *errorMessage = g_strdup(taskInfo->error->fault->_actualType); } else { - virAsprintf(errorMessage, "%s - %s", - taskInfo->error->fault->_actualType, - taskInfo->error->localizedMessage); + *errorMessage = g_strdup_printf("%s - %s", + taskInfo->error->fault->_actualType, + taskInfo->error->localizedMessage); } } -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/hyperv/hyperv_driver.c | 8 ++++---- src/hyperv/hyperv_wmi.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index eb35cf6115..b1dafe7c80 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1378,9 +1378,9 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, } } - virAsprintf(&selector, "CreationClassName=Msvm_Keyboard&DeviceID=%s&" - "SystemCreationClassName=Msvm_ComputerSystem&" - "SystemName=%s", keyboard->data.common->DeviceID, uuid_string); + selector = g_strdup_printf("CreationClassName=Msvm_Keyboard&DeviceID=%s&" + "SystemCreationClassName=Msvm_ComputerSystem&" + "SystemName=%s", keyboard->data.common->DeviceID, uuid_string); /* press the keys */ for (i = 0; i < nkeycodes; i++) { @@ -1462,7 +1462,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virCheckFlags(0, -1); - virAsprintf(&memory_str, "%lu", memory_mb); + memory_str = g_strdup_printf("%lu", memory_mb); virUUIDFormat(domain->uuid, uuid_string); diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index c0c9b7f77e..2c3e8d4f5e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -439,7 +439,7 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr params, WsXmlDocH *docRoot) char *method = NULL; WsXmlNodeH xmlNodeMethod = NULL; - virAsprintf(&method, "%s_INPUT", params->method); + method = g_strdup_printf("%s_INPUT", params->method); *docRoot = ws_xml_create_doc(NULL, method); if (*docRoot == NULL) { @@ -848,9 +848,8 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, params->method, paramsDocRoot); /* check return code of invocation */ - virAsprintf(&returnValue_xpath, - "/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", - params->method); + returnValue_xpath = g_strdup_printf("/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", + params->method); returnValue = ws_xml_get_xpath_value(response, returnValue_xpath); if (!returnValue) { @@ -864,10 +863,9 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, goto cleanup; if (returnCode == CIM_RETURNCODE_TRANSITION_STARTED) { - virAsprintf(&jobcode_instance_xpath, - "/s:Envelope/s:Body/p:%s_OUTPUT/p:Job/a:ReferenceParameters/" - "w:SelectorSet/w:Selector[@Name='InstanceID']", - params->method); + jobcode_instance_xpath = g_strdup_printf("/s:Envelope/s:Body/p:%s_OUTPUT/p:Job/a:ReferenceParameters/" + "w:SelectorSet/w:Selector[@Name='InstanceID']", + params->method); instanceID = ws_xml_get_xpath_value(response, jobcode_instance_xpath); if (!instanceID) { @@ -1338,8 +1336,8 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, virUUIDFormat(domain->uuid, uuid_string); - virAsprintf(&selector, "Name=%s&CreationClassName=Msvm_ComputerSystem", uuid_string); - virAsprintf(&properties, "RequestedState=%d", requestedState); + selector = g_strdup_printf("Name=%s&CreationClassName=Msvm_ComputerSystem", uuid_string); + properties = g_strdup_printf("RequestedState=%d", requestedState); if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) resourceUri = MSVM_COMPUTERSYSTEM_V1_RESOURCE_URI; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/interface/interface_backend_netcf.c | 4 ++-- src/interface/interface_backend_udev.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 170361e761..ac50deb500 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -101,13 +101,13 @@ netcfStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/interface", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto error; - virAsprintf(&driver->stateDir, "%s/interface/run", rundir); + driver->stateDir = g_strdup_printf("%s/interface/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index a906756830..b7b06ed67a 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -856,7 +856,7 @@ udevGetIfaceDefBridge(struct udev *udev, } /* Members of the bridge */ - virAsprintf(&member_path, "%s/%s", udev_device_get_syspath(dev), "brif"); + member_path = g_strdup_printf("%s/%s", udev_device_get_syspath(dev), "brif"); /* Get each member of the bridge */ member_count = scandir(member_path, &member_list, @@ -918,7 +918,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, const char *dev_prefix = "\nDevice: "; int ret = -1; - virAsprintf(&procpath, "/proc/net/vlan/%s", name); + procpath = g_strdup_printf("/proc/net/vlan/%s", name); if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) goto cleanup; @@ -1161,13 +1161,13 @@ udevStateInitialize(bool privileged, driver->lockFD = -1; if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/interface", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - virAsprintf(&driver->stateDir, "%s/interface/run", rundir); + driver->stateDir = g_strdup_printf("%s/interface/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/libxl/libxl_conf.c | 22 +++++++++++----------- src/libxl/libxl_domain.c | 15 +++++++-------- src/libxl/libxl_driver.c | 12 ++++++------ src/libxl/libxl_logger.c | 8 ++++---- src/libxl/libxl_migration.c | 6 +++--- src/libxl/xen_common.c | 10 +++++----- src/libxl/xen_xl.c | 12 ++++++------ src/libxl/xen_xm.c | 4 ++-- 8 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a984c9c8aa..1ff2a6af07 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -212,7 +212,7 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(buf, "%s:%s", type, srcdef->data.file.path); + *buf = g_strdup_printf("%s:%s", type, srcdef->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_DEV: @@ -231,8 +231,8 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) if (bindService == NULL) bindService = "0"; - virAsprintf(buf, "udp:%s:%s@%s:%s", connectHost, - srcdef->data.udp.connectService, bindHost, bindService); + *buf = g_strdup_printf("udp:%s:%s@%s:%s", connectHost, + srcdef->data.udp.connectService, bindHost, bindService); break; } @@ -244,15 +244,15 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) else prefix = "tcp"; - virAsprintf(buf, "%s:%s:%s%s", prefix, srcdef->data.tcp.host, - srcdef->data.tcp.service, - srcdef->data.tcp.listen ? ",server,nowait" : ""); + *buf = g_strdup_printf("%s:%s:%s%s", prefix, srcdef->data.tcp.host, + srcdef->data.tcp.service, + srcdef->data.tcp.listen ? ",server,nowait" : ""); break; } case VIR_DOMAIN_CHR_TYPE_UNIX: - virAsprintf(buf, "unix:%s%s", srcdef->data.nix.path, - srcdef->data.nix.listen ? ",server,nowait" : ""); + *buf = g_strdup_printf("unix:%s%s", srcdef->data.nix.path, + srcdef->data.nix.listen ? ",server,nowait" : ""); break; default: @@ -1927,9 +1927,9 @@ libxlPrepareChannel(virDomainChrDefPtr channel, if (channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN && channel->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && !channel->source->data.nix.path) { - virAsprintf(&channel->source->data.nix.path, "%s/%s-%s", channelDir, - domainName, - channel->target.name ? channel->target.name : "unknown.sock"); + channel->source->data.nix.path = g_strdup_printf("%s/%s-%s", channelDir, + domainName, + channel->target.name ? channel->target.name : "unknown.sock"); channel->source->data.nix.listen = true; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ebb739ae54..42fca19c5b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -714,7 +714,7 @@ libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) char *ret; g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name); + ret = g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); return ret; } @@ -905,7 +905,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file = g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); @@ -944,8 +944,8 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); - virAsprintf(&dumpfile, "%s/%s-%s", cfg->autoDumpDir, vm->def->name, - timestr); + dumpfile = g_strdup_printf("%s/%s-%s", cfg->autoDumpDir, vm->def->name, + timestr); /* Unlock virDomainObj while dumping core */ virObjectUnlock(vm); @@ -1121,7 +1121,7 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) for (i = 0; i < vm->def->nserials; i++) { chr = vm->def->serials[i]; - virAsprintf(&chr->info.alias, "serial%zd", i); + chr->info.alias = g_strdup_printf("serial%zd", i); if (chr->source->type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source->data.file.path) continue; @@ -1161,9 +1161,8 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) if (net->ifname) continue; - virAsprintf(&net->ifname, - LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", - def->id, x_nic->devid, suffix); + net->ifname = g_strdup_printf(LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", + def->id, x_nic->devid, suffix); } } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 69a949ee26..b1ea55b560 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -693,7 +693,7 @@ libxlStateInitialize(bool privileged, if (!(cfg = libxlDriverConfigNew())) goto error; - virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir); + driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir); if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) goto error; @@ -5390,13 +5390,13 @@ libxlDiskSectorSize(int domid, int devno) } path = val = NULL; - virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", domid, devno); + path = g_strdup_printf("/local/domain/%d/device/vbd/%d/backend", domid, devno); if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) goto cleanup; VIR_FREE(path); - virAsprintf(&path, "%s/physical-sector-size", val); + path = g_strdup_printf("%s/physical-sector-size", val); VIR_FREE(val); if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) @@ -5434,8 +5434,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, stats->backend = g_strdup("vbd"); - virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", - vm->def->id, devno); + path = g_strdup_printf("/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", + vm->def->id, devno); if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -5444,7 +5444,7 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, } # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ - virAsprintf(&name, "%s/"FIELD, path); \ + name = g_strdup_printf("%s/"FIELD, path); \ if ((virFileReadAll(name, 256, &val) < 0) || \ (sscanf(val, "%llu", &status) != 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 4bdca54fcc..ffbc722f2c 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -158,7 +158,7 @@ libxlLoggerNew(const char *logDir, virLogPriority minLevel) if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL) return NULL; - virAsprintf(&path, "%s/libxl-driver.log", logDir); + path = g_strdup_printf("%s/libxl-driver.log", logDir); if ((logger.defaultLogFile = fopen(path, "a")) == NULL) goto error; @@ -195,8 +195,8 @@ libxlLoggerOpenFile(libxlLoggerPtr logger, char *domidstr = NULL; char ebuf[1024]; - virAsprintf(&path, "%s/%s.log", logger->logDir, name); - virAsprintf(&domidstr, "%d", id); + path = g_strdup_printf("%s/%s.log", logger->logDir, name); + domidstr = g_strdup_printf("%d", id); if (!(logFile = fopen(path, "a"))) { VIR_WARN("Failed to open log file %s: %s", @@ -220,7 +220,7 @@ void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) { char *domidstr = NULL; - virAsprintf(&domidstr, "%d", id); + domidstr = g_strdup_printf("%d", id); ignore_value(virHashRemoveEntry(logger->files, domidstr)); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 09b709e51b..6bee653e3f 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -709,12 +709,12 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto endjob; priv->migrationPort = port; - virAsprintf(uri_out, "tcp://%s:%d", hostname, port); + *uri_out = g_strdup_printf("tcp://%s:%d", hostname, port); } else { if (!(STRPREFIX(uri_in, "tcp://"))) { /* not full URI, add prefix tcp:// */ char *tmp; - virAsprintf(&tmp, "tcp://%s", uri_in); + tmp = g_strdup_printf("tcp://%s", uri_in); uri = virURIParse(tmp); VIR_FREE(tmp); } else { @@ -745,7 +745,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, port = uri->port; } - virAsprintf(uri_out, "tcp://%s:%d", hostname, port); + *uri_out = g_strdup_printf("tcp://%s:%d", hostname, port); } snprintf(portstr, sizeof(portstr), "%d", port); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 826e6699bf..b6865098ed 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1838,11 +1838,11 @@ xenFormatPCI(virConfPtr conf, virDomainDefPtr def) virConfValuePtr val, tmp; char *buf; - virAsprintf(&buf, "%04x:%02x:%02x.%x", - def->hostdevs[i]->source.subsys.u.pci.addr.domain, - def->hostdevs[i]->source.subsys.u.pci.addr.bus, - def->hostdevs[i]->source.subsys.u.pci.addr.slot, - def->hostdevs[i]->source.subsys.u.pci.addr.function); + buf = g_strdup_printf("%04x:%02x:%02x.%x", + def->hostdevs[i]->source.subsys.u.pci.addr.domain, + def->hostdevs[i]->source.subsys.u.pci.addr.bus, + def->hostdevs[i]->source.subsys.u.pci.addr.slot, + def->hostdevs[i]->source.subsys.u.pci.addr.function); if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index a7c51e3c98..67fb5366b2 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -83,9 +83,9 @@ static int xenParseCmdline(virConfPtr conf, char **r_cmdline) VIR_WARN("ignoring root= and extra= in favour of cmdline="); } else { if (root && extra) { - virAsprintf(&cmdline, "root=%s %s", root, extra); + cmdline = g_strdup_printf("root=%s %s", root, extra); } else if (root) { - virAsprintf(&cmdline, "root=%s", root); + cmdline = g_strdup_printf("root=%s", root); } else if (extra) { cmdline = g_strdup(extra); } @@ -1394,7 +1394,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr def) policy = "0"; break; } - virAsprintf(&cpuid_pairs[j++], "%s=%s", feature_name, policy); + cpuid_pairs[j++] = g_strdup_printf("%s=%s", feature_name, policy); } cpuid_pairs[j] = NULL; @@ -2068,9 +2068,9 @@ xenFormatXLUSB(virConfPtr conf, virConfValuePtr val, tmp; char *buf; - virAsprintf(&buf, "hostbus=%x,hostaddr=%x", - def->hostdevs[i]->source.subsys.u.usb.bus, - def->hostdevs[i]->source.subsys.u.usb.device); + buf = g_strdup_printf("hostbus=%x,hostaddr=%x", + def->hostdevs[i]->source.subsys.u.usb.bus, + def->hostdevs[i]->source.subsys.u.usb.device); if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index d962b13cbb..6f85b2793b 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -90,9 +90,9 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) return -1; if (root && extra) { - virAsprintf(&def->os.cmdline, "root=%s %s", root, extra); + def->os.cmdline = g_strdup_printf("root=%s %s", root, extra); } else if (root) { - virAsprintf(&def->os.cmdline, "root=%s", root); + def->os.cmdline = g_strdup_printf("root=%s", root); } else if (extra) { def->os.cmdline = g_strdup(extra); } -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/locking/lock_daemon.c | 8 ++++---- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 4 ++-- src/locking/lock_driver_sanlock.c | 8 ++++---- src/locking/lock_manager.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index dc23179009..2fa3238794 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -464,8 +464,8 @@ virLockDaemonUnixSocketPaths(bool privileged, } umask(old_umask); - virAsprintf(sockfile, "%s/virtlockd-sock", rundir); - virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir); + *sockfile = g_strdup_printf("%s/virtlockd-sock", rundir); + *adminSockfile = g_strdup_printf("%s/virtlockd-admin-sock", rundir); VIR_FREE(rundir); } @@ -841,7 +841,7 @@ virLockDaemonExecRestartStatePath(bool privileged, } umask(old_umask); - virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir); + *state_file = g_strdup_printf("%s/virtlockd-restart-exec.json", rundir); VIR_FREE(rundir); } @@ -858,7 +858,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; - virAsprintf(&ret, "%lld", (long long int)getpid()); + ret = g_strdup_printf("%lld", (long long int)getpid()); return ret; } diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index e77e2b7bf6..d7e13013d7 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -46,7 +46,7 @@ virLockDaemonConfigFilePath(bool privileged, char **configfile) if (!(configdir = virGetUserConfigDirectory())) goto error; - virAsprintf(configfile, "%s/virtlockd.conf", configdir); + *configfile = g_strdup_printf("%s/virtlockd.conf", configdir); VIR_FREE(configdir); } diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 73f699044b..e8f0329b05 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -127,7 +127,7 @@ static char *virLockManagerLockDaemonPath(bool privileged) if (!(rundir = virGetUserRuntimeDirectory())) return NULL; - virAsprintf(&path, "%s/virtlockd-sock", rundir); + path = g_strdup_printf("%s/virtlockd-sock", rundir); VIR_FREE(rundir); } @@ -574,7 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, _("Missing path or lockspace for lease resource")); goto cleanup; } - virAsprintf(&newLockspace, "%s/%s", path, lockspace); + newLockspace = g_strdup_printf("%s/%s", path, lockspace); newName = g_strdup(name); } break; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 55f0a3621d..31fbfb5d7e 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - virAsprintf(message, _("sanlock error %d"), err); + message = g_strdup_printf(_("sanlock error %d"), err); #endif return true; } else { @@ -211,8 +211,8 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) char *dir = NULL; int retries = LOCKSPACE_RETRIES; - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, - VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); + path = g_strdup_printf("%s/%s", driver->autoDiskLeasePath, + VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0) { @@ -643,7 +643,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriverPtr driver, goto cleanup; } - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, res->name); + path = g_strdup_printf("%s/%s", driver->autoDiskLeasePath, res->name); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Lease path '%s' exceeds %d characters"), diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 0986cafe6c..07318fb53f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -131,7 +131,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x", name, driverName, configDir, flags); - virAsprintf(&configFile, "%s/%s-%s.conf", configDir, driverName, name); + configFile = g_strdup_printf("%s/%s-%s.conf", configDir, driverName, name); if (STREQ(name, "nop")) { driver = &virLockDriverNop; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/logging/log_daemon.c | 8 ++++---- src/logging/log_daemon_config.c | 2 +- src/logging/log_manager.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 2304c310d1..268d3c62b9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,8 +405,8 @@ virLogDaemonUnixSocketPaths(bool privileged, } umask(old_umask); - virAsprintf(sockfile, "%s/virtlogd-sock", rundir); - virAsprintf(adminSockfile, "%s/virtlogd-admin-sock", rundir); + *sockfile = g_strdup_printf("%s/virtlogd-sock", rundir); + *adminSockfile = g_strdup_printf("%s/virtlogd-admin-sock", rundir); VIR_FREE(rundir); } @@ -632,7 +632,7 @@ virLogDaemonExecRestartStatePath(bool privileged, } umask(old_umask); - virAsprintf(state_file, "%s/virtlogd-restart-exec.json", rundir); + *state_file = g_strdup_printf("%s/virtlogd-restart-exec.json", rundir); VIR_FREE(rundir); } @@ -649,7 +649,7 @@ virLogDaemonGetExecRestartMagic(void) { char *ret; - virAsprintf(&ret, "%lld", (long long int)getpid()); + ret = g_strdup_printf("%lld", (long long int)getpid()); return ret; } diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index a0e4c4dd1b..0cf9729e7f 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -47,7 +47,7 @@ virLogDaemonConfigFilePath(bool privileged, char **configfile) if (!(configdir = virGetUserConfigDirectory())) goto error; - virAsprintf(configfile, "%s/virtlogd.conf", configdir); + *configfile = g_strdup_printf("%s/virtlogd.conf", configdir); VIR_FREE(configdir); } diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index 024fe9b592..e191093272 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -52,7 +52,7 @@ virLogManagerDaemonPath(bool privileged) if (!(rundir = virGetUserRuntimeDirectory())) return NULL; - virAsprintf(&path, "%s/virtlogd-sock", rundir); + path = g_strdup_printf("%s/virtlogd-sock", rundir); VIR_FREE(rundir); } -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/lxc/lxc_container.c | 41 +++++++++++++++++------------------ src/lxc/lxc_controller.c | 46 ++++++++++++++++++++-------------------- src/lxc/lxc_driver.c | 8 +++---- src/lxc/lxc_fuse.c | 6 +++--- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_native.c | 8 +++---- src/lxc/lxc_process.c | 20 ++++++++--------- 7 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 090a22571d..0ad872b65b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -682,7 +682,7 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, if (lxcContainerResolveSymlinks(root, false) < 0) return -1; - virAsprintf(&dst, "%s/%s.root", LXC_STATE_DIR, def->name); + dst = g_strdup_printf("%s/%s.root", LXC_STATE_DIR, def->name); tmp = root->dst; root->dst = dst; @@ -717,7 +717,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - virAsprintf(&oldroot, "%s/.oldroot", root->src->path); + oldroot = g_strdup_printf("%s/.oldroot", root->src->path); if (virFileMakePath(oldroot) < 0) { virReportSystemError(errno, @@ -736,7 +736,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } /* Create a directory called 'new' in tmpfs */ - virAsprintf(&newroot, "%s/new", oldroot); + newroot = g_strdup_printf("%s/new", oldroot); if (virFileMakePath(newroot) < 0) { virReportSystemError(errno, @@ -921,7 +921,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, char *hostdir; int ret; - virAsprintf(&hostdir, "/.oldroot%s", mnt->dst); + hostdir = g_strdup_printf("/.oldroot%s", mnt->dst); ret = virFileIsMountPoint(hostdir); VIR_FREE(hostdir); @@ -1012,10 +1012,9 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); - virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name); + meminfo_path = g_strdup_printf("/.oldroot/%s/%s.fuse/meminfo", + stateDir, + def->name); if ((ret = mount(meminfo_path, "/proc/meminfo", NULL, MS_BIND, NULL)) < 0) { @@ -1044,7 +1043,7 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); - virAsprintf(&path, "/.oldroot/%s/%s.dev", stateDir, def->name); + path = g_strdup_printf("/.oldroot/%s/%s.dev", stateDir, def->name); if (virFileMakePath("/dev") < 0) { virReportSystemError(errno, "%s", @@ -1078,7 +1077,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, VIR_DEBUG("Mount /dev/pts stateDir=%s", stateDir); - virAsprintf(&path, "/.oldroot/%s/%s.devpts", stateDir, def->name); + path = g_strdup_printf("/.oldroot/%s/%s.devpts", stateDir, def->name); if (virFileMakePath("/dev/pts") < 0) { virReportSystemError(errno, "%s", @@ -1130,7 +1129,7 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) for (i = 0; i < nttyPaths; i++) { char *tty; - virAsprintf(&tty, "/dev/tty%zu", i + 1); + tty = g_strdup_printf("/dev/tty%zu", i + 1); if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { VIR_FREE(tty); @@ -1156,7 +1155,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, VIR_DEBUG("src=%s dst=%s", fs->src->path, fs->dst); - virAsprintf(&src, "%s%s", srcprefix, fs->src->path); + src = g_strdup_printf("%s%s", srcprefix, fs->src->path); if (stat(fs->dst, &st) < 0) { if (errno != ENOENT) { @@ -1326,8 +1325,8 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, /* First time around we use /etc/filesystems */ retry: - virAsprintf(&fslist, "%s%s", srcprefix, - tryProc ? "/proc/filesystems" : "/etc/filesystems"); + fslist = g_strdup_printf("%s%s", srcprefix, + tryProc ? "/proc/filesystems" : "/etc/filesystems"); VIR_DEBUG("Open fslist %s", fslist); if (!(fp = fopen(fslist, "r"))) { @@ -1488,7 +1487,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, VIR_DEBUG("src=%s dst=%s", fs->src->path, fs->dst); - virAsprintf(&src, "%s%s", srcprefix, fs->src->path); + src = g_strdup_printf("%s%s", srcprefix, fs->src->path); ret = lxcContainerMountFSBlockHelper(fs, src, srcprefix, sec_mount_options); @@ -1507,7 +1506,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); - virAsprintf(&data, "size=%lld%s", fs->usage, sec_mount_options); + data = g_strdup_printf("size=%lld%s", fs->usage, sec_mount_options); if (virFileMakePath(fs->dst) < 0) { virReportSystemError(errno, @@ -1655,20 +1654,20 @@ static int lxcContainerUnmountForSharedRoot(const char *stateDir, /* These filesystems are created by libvirt temporarily, they * shouldn't appear in container. */ - virAsprintf(&tmp, "%s/%s.dev", stateDir, domain); + tmp = g_strdup_printf("%s/%s.dev", stateDir, domain); if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; VIR_FREE(tmp); - virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain); + tmp = g_strdup_printf("%s/%s.devpts", stateDir, domain); if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; #if WITH_FUSE VIR_FREE(tmp); - virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain); + tmp = g_strdup_printf("%s/%s.fuse", stateDir, domain); if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; @@ -2232,8 +2231,8 @@ static int lxcContainerChild(void *data) const char *tty = argv->ttyPaths[0]; if (STRPREFIX(tty, "/dev/pts/")) tty += strlen("/dev/pts/"); - virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->name, - tty); + ttyPath = g_strdup_printf("%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->name, + tty); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("At least one tty is required")); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 56e30eeaa9..17c4282be4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -568,7 +568,7 @@ static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, if (!STRPREFIX(dev, "/dev/")) goto cleanup; - virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5); + pidpath = g_strdup_printf("/sys/devices/virtual/block/%s/pid", dev + 5); /* Wait for the pid file to appear */ while (!virFileExists(pidpath)) { @@ -946,7 +946,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) virNetServerServicePtr svc = NULL; char *sockpath; - virAsprintf(&sockpath, "%s/%s.sock", LXC_STATE_DIR, ctrl->name); + sockpath = g_strdup_printf("%s/%s.sock", LXC_STATE_DIR, ctrl->name); if (!(srv = virNetServerNew("LXC", 1, 0, 0, 0, 1, @@ -1434,14 +1434,14 @@ static int virLXCControllerSetupUserns(virLXCControllerPtr ctrl) } VIR_DEBUG("Setting up userns maps"); - virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid); + uid_map = g_strdup_printf("/proc/%d/uid_map", ctrl->initpid); if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.uidmap, ctrl->def->idmap.nuidmap, uid_map) < 0) goto cleanup; - virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid); + gid_map = g_strdup_printf("/proc/%d/gid_map", ctrl->initpid); if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.gidmap, ctrl->def->idmap.ngidmap, @@ -1467,14 +1467,14 @@ static int virLXCControllerSetupDev(virLXCControllerPtr ctrl) mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager, ctrl->def); - virAsprintf(&dev, "/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); + dev = g_strdup_printf("/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); /* * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - virAsprintf(&opts, "mode=755,size=65536%s", mount_options); + opts = g_strdup_printf("mode=755,size=65536%s", mount_options); if (virFileSetupDev(dev, opts) < 0) goto cleanup; @@ -1514,8 +1514,8 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) /* Populate /dev/ with a few important bits */ for (i = 0; i < G_N_ELEMENTS(devs); i++) { - virAsprintf(&path, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, - devs[i].path); + path = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + devs[i].path); dev_t dev = makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || @@ -1553,13 +1553,13 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, mode_t mode; virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; - virAsprintf(&src, USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->device); + src = g_strdup_printf(USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->device); - virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name); + vroot = g_strdup_printf("/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name); - virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus); + dstdir = g_strdup_printf("%s/%03d/", vroot, usbsrc->bus); - virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device); + dstfile = g_strdup_printf("%s/%03d", dstdir, usbsrc->device); if (stat(src, &sb) < 0) { virReportSystemError(errno, @@ -1633,7 +1633,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, while (*(path + len) == '/') len++; - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + dst = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, strchr(path + len, '/')); if (stat(dev, &sb) < 0) { @@ -1709,8 +1709,8 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, while (*(path + len) == '/') len++; - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')); + dst = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1865,8 +1865,8 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, goto cleanup; } - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, - def->dst); + dst = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + def->dst); if (stat(def->src->path, &sb) < 0) { virReportSystemError(errno, @@ -2055,8 +2055,8 @@ lxcCreateTty(virLXCControllerPtr ctrl, int *ttymaster, * while glibc has to fstat(), fchmod(), and fchown() for older * kernels, we can skip those steps. ptyno shouldn't currently be * anything other than 0, but let's play it safe. */ - virAsprintf(ttyName, "/dev/pts/%d", ptyno); - virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, ctrl->def->name, ptyno); + *ttyName = g_strdup_printf("/dev/pts/%d", ptyno); + *ttyHostPath = g_strdup_printf("/%s/%s.devpts/%d", LXC_STATE_DIR, ctrl->def->name, ptyno); ret = 0; @@ -2112,8 +2112,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager, ctrl->def); - virAsprintf(&devpts, "%s/%s.devpts", LXC_STATE_DIR, ctrl->def->name); - virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", LXC_STATE_DIR, ctrl->def->name); + devpts = g_strdup_printf("%s/%s.devpts", LXC_STATE_DIR, ctrl->def->name); + ctrl->devptmx = g_strdup_printf("%s/%s.devpts/ptmx", LXC_STATE_DIR, ctrl->def->name); if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, @@ -2129,8 +2129,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) /* XXX should we support gid=X for X!=5 for distros which use * a different gid for tty? */ - virAsprintf(&opts, "newinstance,ptmxmode=0666,mode=0620,gid=%u%s", ptsgid, - NULLSTR_EMPTY(mount_options)); + opts = g_strdup_printf("newinstance,ptmxmode=0666,mode=0620,gid=%u%s", ptsgid, + NULLSTR_EMPTY(mount_options)); VIR_DEBUG("Mount devpts on %s type=tmpfs flags=0x%x, opts=%s", devpts, MS_NOSUID, opts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index acaeae9311..2de252ee87 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3788,7 +3788,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) goto cleanup; - virAsprintf(&file, "/dev/%s", def->dst); + file = g_strdup_printf("/dev/%s", def->dst); if (lxcDomainAttachDeviceMknod(driver, 0700 | S_IFBLK, @@ -3973,7 +3973,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver, } usbsrc = &def->source.subsys.u.usb; - virAsprintf(&src, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); + src = g_strdup_printf("/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL))) goto cleanup; @@ -4309,7 +4309,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, def = vm->def->disks[idx]; src = virDomainDiskGetSource(def); - virAsprintf(&dst, "/dev/%s", def->dst); + dst = g_strdup_printf("/dev/%s", def->dst); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -4447,7 +4447,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, } usbsrc = &def->source.subsys.u.usb; - virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); + dst = g_strdup_printf("/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->device); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 35dbad7986..3e2ad197d3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -47,7 +47,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) virDomainDefPtr def = (virDomainDefPtr)context->private_data; memset(stbuf, 0, sizeof(struct stat)); - virAsprintf(&mempath, "/proc/%s", path); + mempath = g_strdup_printf("/proc/%s", path); res = 0; @@ -250,7 +250,7 @@ static int lxcProcRead(const char *path G_GNUC_UNUSED, struct fuse_context *context = NULL; virDomainDefPtr def = NULL; - virAsprintf(&hostpath, "/proc/%s", path); + hostpath = g_strdup_printf("/proc/%s", path); context = fuse_get_context(); def = (virDomainDefPtr)context->private_data; @@ -305,7 +305,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) if (virMutexInit(&fuse->lock) < 0) goto cleanup2; - virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, def->name); + fuse->mountpoint = g_strdup_printf("%s/%s.fuse/", LXC_STATE_DIR, def->name); if (virFileMakePath(fuse->mountpoint) < 0) { virReportSystemError(errno, _("Cannot create %s"), diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 1983af135e..479125374b 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -151,7 +151,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(virLXCMonitorClass))) return NULL; - virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name); + sockpath = g_strdup_printf("%s/%s.sock", socketdir, vm->def->name); if (!(mon->client = virNetClientNewUNIX(sockpath, false, NULL))) goto error; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index c7cf2c4b0e..b9dffd6de9 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -265,7 +265,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) return -1; if (fstab->dst[0] != '/') { - virAsprintf(&dst, "/%s", fstab->dst); + dst = g_strdup_printf("/%s", fstab->dst); } else { dst = g_strdup(fstab->dst); } @@ -491,8 +491,8 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) * on the host */ if (isVlan && data->vlanid) { VIR_FREE(hostdev->source.caps.u.net.ifname); - virAsprintf(&hostdev->source.caps.u.net.ifname, "%s.%s", - data->link, data->vlanid); + hostdev->source.caps.u.net.ifname = g_strdup_printf("%s.%s", + data->link, data->vlanid); } hostdev->source.caps.u.net.ip.ips = data->ips; @@ -948,7 +948,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) goto cleanup; } - virAsprintf(&path, "/dev/block/%s", parts[0]); + path = g_strdup_printf("/dev/block/%s", parts[0]); /* Do we already have a device definition for this path? * Get that device or create a new one */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2ec5762856..b59e66c29a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -138,7 +138,7 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, char ebuf[1024]; char *file = NULL; - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file = g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -418,8 +418,8 @@ static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type, cons goto cleanup; } - virAsprintf(&path, "/proc/%lld/ns/%s", (long long int)priv->initpid, - nsInfoLocal[ns_type]); + path = g_strdup_printf("/proc/%lld/ns/%s", (long long int)priv->initpid, + nsInfoLocal[ns_type]); if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, @@ -440,7 +440,7 @@ static int virLXCProcessSetupNamespacePID(int ns_type, const char *name) int fd; char *path; - virAsprintf(&path, "/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); + path = g_strdup_printf("/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); fd = open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -464,7 +464,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, const char *name) return -1; } - virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name); + path = g_strdup_printf("%s/netns/%s", RUNSTATEDIR, name); fd = open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -625,7 +625,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, /* Make sure all net definitions will have a name in the container */ if (!net->ifname_guest) { - virAsprintf(&net->ifname_guest, "eth%zu", niface); + net->ifname_guest = g_strdup_printf("eth%zu", niface); niface++; } } @@ -749,7 +749,7 @@ virLXCProcessGetNsInode(pid_t pid, struct stat sb; int ret = -1; - virAsprintf(&path, "/proc/%lld/ns/%s", (long long)pid, nsname); + path = g_strdup_printf("/proc/%lld/ns/%s", (long long)pid, nsname); if (stat(path, &sb) < 0) { virReportSystemError(errno, @@ -974,7 +974,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, for (i = 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) { if (nsInheritFDs[i] > 0) { char *tmp = NULL; - virAsprintf(&tmp, "--share-%s", nsInfoLocal[i]); + tmp = g_strdup_printf("--share-%s", nsInfoLocal[i]); virCommandAddArg(cmd, tmp); virCommandAddArgFormat(cmd, "%d", nsInheritFDs[i]); virCommandPassFD(cmd, nsInheritFDs[i], 0); @@ -1257,7 +1257,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource = res; } - virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name); + logfile = g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); if (!(pidfile = virPidFileBuildPath(cfg->stateDir, vm->def->name))) goto cleanup; @@ -1344,7 +1344,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->consoles[i]->source->data.file.path = ttyPath; VIR_FREE(vm->def->consoles[i]->info.alias); - virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i); + vm->def->consoles[i]->info.alias = g_strdup_printf("console%zu", i); } VIR_DEBUG("Setting up Interfaces"); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/network/bridge_driver.c | 58 ++++++++++++++++++------------------- src/network/leaseshelper.c | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b82a371fe4..5d424e3681 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,7 +371,7 @@ networkDnsmasqLeaseFileNameDefault(virNetworkDriverStatePtr driver, { char *leasefile; - virAsprintf(&leasefile, "%s/%s.leases", driver->dnsmasqStateDir, netname); + leasefile = g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir, netname); return leasefile; } @@ -382,7 +382,7 @@ networkDnsmasqLeaseFileNameCustom(virNetworkDriverStatePtr driver, { char *leasefile; - virAsprintf(&leasefile, "%s/%s.status", driver->dnsmasqStateDir, bridge); + leasefile = g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir, bridge); return leasefile; } @@ -393,7 +393,7 @@ networkDnsmasqConfigFileName(virNetworkDriverStatePtr driver, { char *conffile; - virAsprintf(&conffile, "%s/%s.conf", driver->dnsmasqStateDir, netname); + conffile = g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, netname); return conffile; } @@ -404,7 +404,7 @@ networkRadvdPidfileBasename(const char *netname) /* this is simple but we want to be sure it's consistently done */ char *pidfilebase; - virAsprintf(&pidfilebase, "%s-radvd", netname); + pidfilebase = g_strdup_printf("%s-radvd", netname); return pidfilebase; } @@ -415,7 +415,7 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr driver, { char *configfile; - virAsprintf(&configfile, "%s/%s-radvd.conf", driver->radvdStateDir, netname); + configfile = g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateDir, netname); return configfile; } @@ -511,13 +511,13 @@ networkBridgeDummyNicName(const char *brname) * a possible numeric ending (eg virbr0, virbr1, etc), we grab * the first 8 and last 3 characters of the string. */ - virAsprintf(&nicname, "%.*s%s%s", - /* space for last 3 chars + "-nic" + NULL */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), - brname, brname + strlen(brname) - 3, - dummyNicSuffix); + nicname = g_strdup_printf("%.*s%s%s", + /* space for last 3 chars + "-nic" + NULL */ + (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), + brname, brname + strlen(brname) - 3, + dummyNicSuffix); } else { - virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix); + nicname = g_strdup_printf("%s%s", brname, dummyNicSuffix); } return nicname; } @@ -747,18 +747,18 @@ networkStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; - virAsprintf(&network_driver->networkConfigDir, - "%s/qemu/networks", configdir); - virAsprintf(&network_driver->networkAutostartDir, - "%s/qemu/networks/autostart", configdir); - virAsprintf(&network_driver->stateDir, - "%s/network/lib", rundir); - virAsprintf(&network_driver->pidDir, - "%s/network/run", rundir); - virAsprintf(&network_driver->dnsmasqStateDir, - "%s/dnsmasq/lib", rundir); - virAsprintf(&network_driver->radvdStateDir, - "%s/radvd/lib", rundir); + network_driver->networkConfigDir = g_strdup_printf( + "%s/qemu/networks", configdir); + network_driver->networkAutostartDir = g_strdup_printf( + "%s/qemu/networks/autostart", configdir); + network_driver->stateDir = g_strdup_printf( + "%s/network/lib", rundir); + network_driver->pidDir = g_strdup_printf( + "%s/network/run", rundir); + network_driver->dnsmasqStateDir = g_strdup_printf( + "%s/dnsmasq/lib", rundir); + network_driver->radvdStateDir = g_strdup_printf( + "%s/radvd/lib", rundir); } if (virFileMakePath(network_driver->stateDir) < 0) { @@ -2294,8 +2294,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge); + field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); if (access(field, W_OK) < 0 && errno == ENOENT) { if (!enableIPv6) @@ -2320,8 +2320,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge); + field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -2333,7 +2333,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=0. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bridge); + field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bridge); if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -3318,7 +3318,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, templ = def->bridge; do { - virAsprintf(&newname, templ, id); + newname = g_strdup_printf(templ, id); /* check if this name is used in another libvirt network or * there is an existing device with that name. ignore errors * from virNetDevExists(), just in case it isn't implemented diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 008a2d668d..3058a3c038 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -153,8 +153,8 @@ main(int argc, char **argv) server_duid = g_strdup(getenv("DNSMASQ_SERVER_DUID")); - virAsprintf(&custom_lease_file, - LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); + custom_lease_file = g_strdup_printf( + LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); pid_file = g_strdup(RUNSTATEDIR "/leaseshelper.pid"); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_udev.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 53373140be..148ae15fed 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -113,7 +113,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) VIR_FREE(def->driver); - virAsprintf(&driver_link, "%s/driver", def->sysfs_path); + driver_link = g_strdup_printf("%s/driver", def->sysfs_path); /* Some devices don't have an explicit driver, so just return without a name */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index a6042e6bfc..b40f93df46 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -614,13 +614,13 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, nodeDeviceLock(); if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto failure; - virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); + driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 92d7048ece..dc440daead 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1028,7 +1028,7 @@ udevProcessMediatedDevice(struct udev_device *dev, * it by waiting for the attributes to become available. */ - virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)); + linkpath = g_strdup_printf("%s/mdev_type", udev_device_get_syspath(dev)); if (virFileWaitForExists(linkpath, 1, 100) < 0) { virReportSystemError(errno, @@ -1810,13 +1810,13 @@ nodeStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); + driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir); } if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index b4ce8a0613..4e77ca0d2d 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -315,7 +315,7 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req) { char *key; - virAsprintf(&key, "%p-%d", req, req->ifindex); + key = g_strdup_printf("%p-%d", req, req->ifindex); virNWFilterSnoopActiveLock(); @@ -1080,7 +1080,7 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, * extend the filter with the macaddr of the VM; filter the * more unlikely parameters first, then go for the MAC */ - virAsprintf(&ext_filter, "%s and ether src %s", filter, macaddr); + ext_filter = g_strdup_printf("%s and ether src %s", filter, macaddr); } else { /* * Some DHCP servers respond via MAC broadcast; we rely on later @@ -1763,7 +1763,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *ifkey, } /* time intf ip dhcpserver */ - virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); + lbuf = g_strdup_printf("%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpstr); len = strlen(lbuf); if (safewrite(lfd, lbuf, len) != len) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/openvz/openvz_conf.c | 12 ++++++------ src/openvz/openvz_driver.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index cb64ed57f0..7676656af1 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -362,7 +362,7 @@ openvzReadFSConf(virDomainDefPtr def, if (VIR_ALLOC(fs) < 0) goto error; - virAsprintf(&veid_str, "%d", veid); + veid_str = g_strdup_printf("%d", veid); fs->type = VIR_DOMAIN_FS_TYPE_MOUNT; if (!(fs->src->path = virStringReplace(temp, "$VEID", veid_str))) @@ -533,7 +533,7 @@ int openvzLoadDomains(struct openvz_driver *driver) def->id = -1; else def->id = veid; - virAsprintf(&def->name, "%i", veid); + def->name = g_strdup_printf("%i", veid); openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); ret = virUUIDParse(uuidstr, def->uuid); @@ -624,7 +624,7 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va char *line = NULL; size_t line_size = 0; - virAsprintf(&temp_file, "%s.tmp", conf_file); + temp_file = g_strdup_printf("%s.tmp", conf_file); fp = fopen(conf_file, "r"); if (fp == NULL) @@ -820,8 +820,8 @@ openvzCopyDefaultConfig(int vpsid) if (confdir == NULL) goto cleanup; - virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, - configfile_value); + default_conf_file = g_strdup_printf("%s/ve-%s.conf-sample", confdir, + configfile_value); if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) goto cleanup; @@ -851,7 +851,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) if (confdir == NULL) return -1; - virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); + *conffile = g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); VIR_FREE(confdir); return ret; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 463751ec86..8a24c9265f 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -702,7 +702,7 @@ openvzGenerateVethName(int veid, char *dev_name_ve) if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) != 1) return NULL; - virAsprintf(&ret, "veth%d.%d.", veid, ifNo); + ret = g_strdup_printf("veth%d.%d.", veid, ifNo); return ret; } @@ -729,7 +729,7 @@ openvzGenerateContainerVethName(int veid) } /* set new name */ - virAsprintf(&name, "eth%d", max + 1); + name = g_strdup_printf("eth%d", max + 1); } VIR_FREE(temp); @@ -2207,7 +2207,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, } } - virAsprintf(uri_out, "ssh://%s", hostname); + *uri_out = g_strdup_printf("ssh://%s", hostname); ret = 0; goto done; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/phyp/phyp_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 6aa47ac511..bc4e08d198 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -504,8 +504,8 @@ phypUUIDTable_Push(virConnectPtr conn) char *remote_file = NULL; int ret = -1; - virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); + remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); if (stat(local_file, &local_fileinfo) == -1) { VIR_WARN("Unable to stat local file."); @@ -691,8 +691,8 @@ phypUUIDTable_Pull(virConnectPtr conn) char *remote_file = NULL; int ret = -1; - virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); + remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); /* Trying to stat the remote file. */ do { @@ -937,9 +937,9 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (userhome == NULL) goto err; - virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome); + pubkey = g_strdup_printf("%s/.ssh/id_rsa.pub", userhome); - virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome); + pvtkey = g_strdup_printf("%s/.ssh/id_rsa", userhome); if (conn->uri->user != NULL) { username = g_strdup(conn->uri->user); @@ -2277,7 +2277,7 @@ phypStorageVolGetPath(virStorageVolPtr vol) if (!pv) goto cleanup; - virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name); + path = g_strdup_printf("/%s/%s/%s", pv, ret, vol->name); cleanup: VIR_FREE(ret); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_agent.c | 6 +-- src/qemu/qemu_alias.c | 88 +++++++++++++++---------------- src/qemu/qemu_block.c | 30 +++++------ src/qemu/qemu_blockjob.c | 8 +-- src/qemu/qemu_capabilities.c | 8 +-- src/qemu/qemu_checkpoint.c | 8 +-- src/qemu/qemu_command.c | 72 ++++++++++++------------- src/qemu/qemu_conf.c | 90 ++++++++++++++++---------------- src/qemu/qemu_domain.c | 80 ++++++++++++++-------------- src/qemu/qemu_hotplug.c | 32 ++++++------ src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_interop_config.c | 6 +-- src/qemu/qemu_migration.c | 24 ++++----- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 30 +++++------ src/qemu/qemu_monitor_json.c | 14 ++--- src/qemu/qemu_monitor_text.c | 10 ++-- src/qemu/qemu_process.c | 32 ++++++------ src/qemu/qemu_slirp.c | 10 ++-- src/qemu/qemu_tpm.c | 10 ++-- src/qemu/qemu_vhost_user_gpu.c | 2 +- 21 files changed, 282 insertions(+), 282 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index d1b590d842..5a50f7f3be 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -916,8 +916,8 @@ qemuAgentGuestSync(qemuAgentPtr mon) if (virTimeMillisNow(&id) < 0) return -1; - virAsprintf(&sync_msg.txBuffer, "{\"execute\":\"guest-sync\", " - "\"arguments\":{\"id\":%llu}}\n", id); + sync_msg.txBuffer = g_strdup_printf("{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}\n", id); sync_msg.txLength = strlen(sync_msg.txBuffer); sync_msg.sync = true; @@ -1118,7 +1118,7 @@ qemuAgentCommand(qemuAgentPtr mon, if (!(cmdstr = virJSONValueToString(cmd, false))) goto cleanup; - virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr); + msg.txBuffer = g_strdup_printf("%s" LINE_ENDING, cmdstr); msg.txLength = strlen(msg.txBuffer); VIR_DEBUG("Send command '%s' for write, seconds = %d", cmdstr, seconds); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 60ab5735a4..22160a6fd8 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -114,7 +114,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (idx == -1 && (idx = qemuGetNextChrDevIndex(def, chr, prefix)) < 0) return -1; - virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + chr->info.alias = g_strdup_printf("%s%zd", prefix, idx); return 0; } @@ -142,14 +142,14 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ - virAsprintf(&controller->info.alias, "pcie.%d", controller->idx); + controller->info.alias = g_strdup_printf("pcie.%d", controller->idx); return 0; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ - virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + controller->info.alias = g_strdup_printf("pci.%d", controller->idx); return 0; } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the @@ -179,7 +179,7 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ - virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + controller->info.alias = g_strdup_printf("%s%d", prefix, controller->idx); return 0; } @@ -204,20 +204,20 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { - virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.unit); + disk->info.alias = g_strdup_printf("%s%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.unit); } else { - virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.target, - disk->info.addr.drive.unit); + disk->info.alias = g_strdup_printf("%s%d-%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.target, + disk->info.addr.drive.unit); } } else { int idx = virDiskNameToIndex(disk->dst); - virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx); + disk->info.alias = g_strdup_printf("%s-disk%d", prefix, idx); } } @@ -236,15 +236,15 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/virtio-backend", - disk->info.alias); + diskPriv->qomName = g_strdup_printf( + "/machine/peripheral/%s/virtio-backend", + disk->info.alias); break; case VIR_DOMAIN_DISK_BUS_USB: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/%s.0/legacy[0]", - disk->info.alias, disk->info.alias); + diskPriv->qomName = g_strdup_printf( + "/machine/peripheral/%s/%s.0/legacy[0]", + disk->info.alias, disk->info.alias); break; case VIR_DOMAIN_DISK_BUS_XEN: @@ -290,7 +290,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, } } - virAsprintf(alias, "hostdev%d", idx); + *alias = g_strdup_printf("hostdev%d", idx); return 0; } @@ -325,7 +325,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, } } - virAsprintf(&net->info.alias, "net%d", idx); + net->info.alias = g_strdup_printf("net%d", idx); return 0; } @@ -337,7 +337,7 @@ qemuAssignDeviceFSAlias(virDomainFSDefPtr fss, if (fss->info.alias) return 0; - virAsprintf(&fss->info.alias, "fs%d", idx); + fss->info.alias = g_strdup_printf("fs%d", idx); return 0; } @@ -349,7 +349,7 @@ qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound, if (sound->info.alias) return 0; - virAsprintf(&sound->info.alias, "sound%d", idx); + sound->info.alias = g_strdup_printf("sound%d", idx); return 0; } @@ -361,7 +361,7 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, if (video->info.alias) return 0; - virAsprintf(&video->info.alias, "video%d", idx); + video->info.alias = g_strdup_printf("video%d", idx); return 0; } @@ -373,7 +373,7 @@ qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, if (hub->info.alias) return 0; - virAsprintf(&hub->info.alias, "hub%d", idx); + hub->info.alias = g_strdup_printf("hub%d", idx); return 0; } @@ -385,7 +385,7 @@ qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr smartcard, if (smartcard->info.alias) return 0; - virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + smartcard->info.alias = g_strdup_printf("smartcard%d", idx); return 0; } @@ -397,7 +397,7 @@ qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefPtr memballoon, if (memballoon->info.alias) return 0; - virAsprintf(&memballoon->info.alias, "balloon%d", idx); + memballoon->info.alias = g_strdup_printf("balloon%d", idx); return 0; } @@ -409,7 +409,7 @@ qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm, if (tpm->info.alias) return 0; - virAsprintf(&tpm->info.alias, "tpm%d", idx); + tpm->info.alias = g_strdup_printf("tpm%d", idx); return 0; } @@ -434,7 +434,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, } } - virAsprintf(&redirdev->info.alias, "redir%d", idx); + redirdev->info.alias = g_strdup_printf("redir%d", idx); return 0; } @@ -455,7 +455,7 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, maxidx = idx + 1; } - virAsprintf(&rng->info.alias, "rng%d", maxidx); + rng->info.alias = g_strdup_printf("rng%d", maxidx); return 0; } @@ -500,7 +500,7 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, maxidx = mem->info.addr.dimm.slot; } - virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx); + mem->info.alias = g_strdup_printf("%s%d", prefix, maxidx); return 0; } @@ -529,7 +529,7 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, } } - virAsprintf(&shmem->info.alias, "shmem%d", idx); + shmem->info.alias = g_strdup_printf("shmem%d", idx); return 0; } @@ -565,7 +565,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, } } - virAsprintf(&input->info.alias, "input%d", idx); + input->info.alias = g_strdup_printf("input%d", idx); return 0; } @@ -705,7 +705,7 @@ qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) return NULL; } - virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); + ret = g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); return ret; } @@ -741,9 +741,9 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) return NULL; } - virAsprintf(&ret, "%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias); + ret = g_strdup_printf("%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info->type), + hostdev->info->alias); return ret; } @@ -786,9 +786,9 @@ qemuDomainGetSecretAESAlias(const char *srcalias, } if (isLuks) - virAsprintf(&alias, "%s-luks-secret0", srcalias); + alias = g_strdup_printf("%s-luks-secret0", srcalias); else - virAsprintf(&alias, "%s-secret0", srcalias); + alias = g_strdup_printf("%s-secret0", srcalias); return alias; } @@ -804,7 +804,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { char *ret; - virAsprintf(&ret, "obj%s_tls0", srcAlias); + ret = g_strdup_printf("obj%s_tls0", srcAlias); return ret; } @@ -820,7 +820,7 @@ qemuAliasChardevFromDevAlias(const char *devAlias) { char *ret; - virAsprintf(&ret, "char%s", devAlias); + ret = g_strdup_printf("char%s", devAlias); return ret; } @@ -838,7 +838,7 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias) { char *ret; - virAsprintf(&ret, "pr-helper-%s", parentalias); + ret = g_strdup_printf("pr-helper-%s", parentalias); return ret; } @@ -849,7 +849,7 @@ qemuAliasDBusVMStateFromId(const char *id) char *ret; size_t i; - virAsprintf(&ret, "dbus-vms-%s", id); + ret = g_strdup_printf("dbus-vms-%s", id); for (i = 0; ret[i]; i++) { if (ret[i] == ':') diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index f40915fe23..b8f0208742 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -423,17 +423,17 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) uri->scheme = g_strdup(virStorageNetProtocolTypeToString(src->protocol)); } else { - virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->transport)); + uri->scheme = g_strdup_printf("%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->transport)); } if (src->path) { if (src->volume) { - virAsprintf(&uri->path, "/%s/%s", src->volume, src->path); + uri->path = g_strdup_printf("/%s/%s", src->volume, src->path); } else { - virAsprintf(&uri->path, "%s%s", src->path[0] == '/' ? "" : "/", - src->path); + uri->path = g_strdup_printf("%s%s", src->path[0] == '/' ? "" : "/", + src->path); } } @@ -472,7 +472,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, else transport = "inet"; - virAsprintf(&port, "%u", host->port); + port = g_strdup_printf("%u", host->port); if (virJSONValueObjectCreate(&server, "s:type", transport, @@ -564,7 +564,7 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) return NULL; } - virAsprintf(&port, "%u", host->port); + port = g_strdup_printf("%u", host->port); ignore_value(virJSONValueObjectCreate(&ret, "s:host", host->name, @@ -760,10 +760,10 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src, /* combine host and port into portal */ if (virSocketAddrNumericFamily(src->hosts[0].name) == AF_INET6) { - virAsprintf(&portal, "[%s]:%u", src->hosts[0].name, - src->hosts[0].port); + portal = g_strdup_printf("[%s]:%u", src->hosts[0].name, + src->hosts[0].port); } else { - virAsprintf(&portal, "%s:%u", src->hosts[0].name, src->hosts[0].port); + portal = g_strdup_printf("%s:%u", src->hosts[0].name, src->hosts[0].port); } if (!onlytarget && src->auth) { @@ -1955,7 +1955,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src) if (!(backingJSON = virJSONValueToString(backingProps, false))) return NULL; - virAsprintf(&ret, "json:%s", backingJSON); + ret = g_strdup_printf("json:%s", backingJSON); return ret; } @@ -2038,9 +2038,9 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStorageSourcePtr src, if (src->encryption) { if (src->encryption->encinfo.cipher_name) { - virAsprintf(&cipheralg, "%s-%u", - src->encryption->encinfo.cipher_name, - src->encryption->encinfo.cipher_size); + cipheralg = g_strdup_printf("%s-%u", + src->encryption->encinfo.cipher_name, + src->encryption->encinfo.cipher_size); } if (virJSONValueObjectAdd(props, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e59cab3478..f8ee00711a 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,7 +227,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeformat); + jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -261,7 +261,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, jobtype = QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat); + jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -294,7 +294,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, if (storage) nodename = src->nodestorage; - virAsprintf(&jobname, "create-%s", nodename); + jobname = g_strdup_printf("create-%s", nodename); if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_CREATE, jobname))) return NULL; @@ -323,7 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, g_autofree char *jobname = NULL; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeformat); + jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat); } else { if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) return NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2ea7ec373..8c339e96ca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -734,7 +734,7 @@ virQEMUCapsFindBinary(const char *format, char *ret = NULL; char *binary = NULL; - virAsprintf(&binary, format, archstr); + binary = g_strdup_printf(format, archstr); ret = virFindFileInPath(binary); VIR_FREE(binary); @@ -2411,7 +2411,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - virAsprintf(&type, "%s-machine", canon); + type = g_strdup_printf("%s-machine", canon); if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) return -1; @@ -4847,7 +4847,7 @@ virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePrivPtr priv = NULL; struct utsname uts; - virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir); + capsCacheDir = g_strdup_printf("%s/capabilities", cacheDir); if (!(cache = virFileCacheNew(capsCacheDir, "xml", &qemuCapsCacheHandlers))) goto error; @@ -4865,7 +4865,7 @@ virQEMUCapsCacheNew(const char *libDir, priv->kvmUsable = VIR_TRISTATE_BOOL_ABSENT; if (uname(&uts) == 0) - virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version); + priv->kernelVersion = g_strdup_printf("%s %s", uts.release, uts.version); cleanup: VIR_FREE(capsCacheDir); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4c224d6f40..e693e1ab14 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -92,14 +92,14 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, if (newxml == NULL) return -1; - virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name); + chkDir = g_strdup_printf("%s/%s", checkpointDir, vm->def->name); if (virFileMakePath(chkDir) < 0) { virReportSystemError(errno, _("cannot create checkpoint directory '%s'"), chkDir); return -1; } - virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name); + chkFile = g_strdup_printf("%s/%s.xml", chkDir, def->parent.name); return virXMLSaveFile(chkFile, NULL, "checkpoint-edit", newxml); } @@ -125,8 +125,8 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, return -1; } - virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, vm->def->name, - chk->def->name); + chkFile = g_strdup_printf("%s/%s/%s.xml", cfg->checkpointDir, vm->def->name, + chk->def->name); if (!metadata_only) { qemuDomainObjPrivatePtr priv = vm->privateData; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a55a5826a7..e234be298d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -262,7 +262,7 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) return NULL; } - virAsprintf(&result, "set=%d,fd=%d", idx, fd); + result = g_strdup_printf("set=%d,fd=%d", idx, fd); return result; } @@ -289,7 +289,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) return NULL; } - virAsprintf(&result, "/dev/fdset/%d", idx); + result = g_strdup_printf("/dev/fdset/%d", idx); return result; } @@ -795,8 +795,8 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, _("found non printable characters in secret")); return -1; } - virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, - secinfo->s.plain.secret); + uri->user = g_strdup_printf("%s:%s", secinfo->s.plain.username, + secinfo->s.plain.secret); } else { uri->user = g_strdup(secinfo->s.plain.username); } @@ -946,7 +946,7 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, return NULL; if (src->hosts->socket) - virAsprintf(&uri->query, "socket=%s", src->hosts->socket); + uri->query = g_strdup_printf("socket=%s", src->hosts->socket); if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) return NULL; @@ -1035,10 +1035,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } if (src->nhosts == 0) { - virAsprintf(&ret, "sheepdog:%s", src->path); + ret = g_strdup_printf("sheepdog:%s", src->path); } else if (src->nhosts == 1) { - virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, - src->hosts->port, src->path); + ret = g_strdup_printf("sheepdog:%s:%u:%s", src->hosts->name, + src->hosts->port, src->path); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one host")); @@ -2370,7 +2370,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, driveLetter = 'A'; if (bootindex) - virAsprintf(&bootindexStr, "bootindex%c=%u", driveLetter, bootindex); + bootindexStr = g_strdup_printf("bootindex%c=%u", driveLetter, bootindex); /* with -blockdev we setup the floppy device and it's backend with -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -2378,7 +2378,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, return -1; if (backendAlias) - virAsprintf(&backendStr, "drive%c=%s", driveLetter, backendAlias); + backendStr = g_strdup_printf("drive%c=%s", driveLetter, backendAlias); } if (!explicitfdc) { @@ -3580,7 +3580,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, unsigned long long memsize = virDomainNumaGetNodeMemorySize(def->numa, cell); - virAsprintf(&alias, "ram-node%zu", cell); + alias = g_strdup_printf("ram-node%zu", cell); mem.size = memsize; mem.targetNode = cell; @@ -3613,7 +3613,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, return -1; } - virAsprintf(&alias, "mem%s", mem->info.alias); + alias = g_strdup_printf("mem%s", mem->info.alias); if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) @@ -3697,14 +3697,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel = virDomainNetGetModelString(net); - virAsprintf(&str, - "nic,macaddr=%s,netdev=host%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=" : ""), - NULLSTR_EMPTY(net->info.alias)); + str = g_strdup_printf( + "nic,macaddr=%s,netdev=host%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, + netmodel ? ",model=" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=" : ""), + NULLSTR_EMPTY(net->info.alias)); return str; } @@ -4698,7 +4698,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } - virAsprintf(&chardev, "socket,id=chr-vu-%s,fd=%d", alias, *fd); + chardev = g_strdup_printf("socket,id=chr-vu-%s,fd=%d", alias, *fd); virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd = -1; @@ -5543,7 +5543,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) return -1; - virAsprintf(&vhostfdName, "%d", vhostfd); + vhostfdName = g_strdup_printf("%d", vhostfd); virCommandPassFD(cmd, vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -5777,7 +5777,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, g_autofree char *objAlias = NULL; g_autofree char *charBackendAlias = NULL; - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias = g_strdup_printf("obj%s", rng->info.alias); switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -8566,7 +8566,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int slirpfd = qemuSlirpGetFD(slirp); virCommandPassFD(cmd, slirpfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - virAsprintf(&slirpfdName, "%d", slirpfd); + slirpfdName = g_strdup_printf("%d", slirpfd); } @@ -8574,14 +8574,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (qemuSecuritySetTapFDLabel(driver->securityManager, def, tapfd[i]) < 0) goto cleanup; - virAsprintf(&tapfdName[i], "%d", tapfd[i]); + tapfdName[i] = g_strdup_printf("%d", tapfd[i]); virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); tapfd[i] = -1; } for (i = 0; i < vhostfdSize; i++) { - virAsprintf(&vhostfdName[i], "%d", vhostfd[i]); + vhostfdName[i] = g_strdup_printf("%d", vhostfd[i]); virCommandPassFD(cmd, vhostfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); vhostfd[i] = -1; @@ -8957,9 +8957,9 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) g_autofree char *mem_path = NULL; virJSONValuePtr ret = NULL; - virAsprintf(&mem_path, "/dev/shm/%s", shmem->name); + mem_path = g_strdup_printf("/dev/shm/%s", shmem->name); - virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias); + mem_alias = g_strdup_printf("shmmem-%s", shmem->info.alias); qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9689,8 +9689,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=chrtpm"); - virAsprintf(chardev, "socket,id=chrtpm,path=%s", - tpm->data.emulator.source.data.nix.path); + *chardev = g_strdup_printf("socket,id=chrtpm,path=%s", + tpm->data.emulator.source.data.nix.path); break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9775,13 +9775,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virBufferAsprintf(&buf, ",policy=0x%x", sev->policy); if (sev->dh_cert) { - virAsprintf(&path, "%s/dh_cert.base64", priv->libDir); + path = g_strdup_printf("%s/dh_cert.base64", priv->libDir); virBufferAsprintf(&buf, ",dh-cert-file=%s", path); VIR_FREE(path); } if (sev->session) { - virAsprintf(&path, "%s/session.base64", priv->libDir); + path = g_strdup_printf("%s/session.base64", priv->libDir); virBufferAsprintf(&buf, ",session-file=%s", path); VIR_FREE(path); } @@ -10578,8 +10578,8 @@ static int qemuBuildParallelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { - virAsprintf(deviceStr, "isa-parallel,chardev=char%s,id=%s", - chr->info.alias, chr->info.alias); + *deviceStr = g_strdup_printf("isa-parallel,chardev=char%s,id=%s", + chr->info.alias, chr->info.alias); return 0; } @@ -10600,8 +10600,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; port = virSocketAddrGetPort(chr->target.addr); - virAsprintf(deviceStr, "user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s", - addr, port, chr->info.alias, chr->info.alias); + *deviceStr = g_strdup_printf("user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s", + addr, port, chr->info.alias, chr->info.alias); break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 41fd134afc..19f4b00710 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,29 +130,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->cgroupControllers = -1; /* -1 == auto-detect */ if (privileged) { - virAsprintf(&cfg->logDir, "%s/log/libvirt/qemu", LOCALSTATEDIR); + cfg->logDir = g_strdup_printf("%s/log/libvirt/qemu", LOCALSTATEDIR); - virAsprintf(&cfg->swtpmLogDir, "%s/log/swtpm/libvirt/qemu", - LOCALSTATEDIR); + cfg->swtpmLogDir = g_strdup_printf("%s/log/swtpm/libvirt/qemu", + LOCALSTATEDIR); cfg->configBaseDir = g_strdup(SYSCONFDIR "/libvirt"); - virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR); + cfg->stateDir = g_strdup_printf("%s/libvirt/qemu", RUNSTATEDIR); - virAsprintf(&cfg->swtpmStateDir, "%s/libvirt/qemu/swtpm", RUNSTATEDIR); + cfg->swtpmStateDir = g_strdup_printf("%s/libvirt/qemu/swtpm", RUNSTATEDIR); - virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR); + cfg->cacheDir = g_strdup_printf("%s/cache/libvirt/qemu", LOCALSTATEDIR); - virAsprintf(&cfg->libDir, "%s/lib/libvirt/qemu", LOCALSTATEDIR); - virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir); - virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir); - virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir); - virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir); - virAsprintf(&cfg->channelTargetDir, "%s/channel/target", cfg->libDir); - virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir); - virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir); - virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR); + cfg->libDir = g_strdup_printf("%s/lib/libvirt/qemu", LOCALSTATEDIR); + cfg->saveDir = g_strdup_printf("%s/save", cfg->libDir); + cfg->snapshotDir = g_strdup_printf("%s/snapshot", cfg->libDir); + cfg->checkpointDir = g_strdup_printf("%s/checkpoint", cfg->libDir); + cfg->autoDumpPath = g_strdup_printf("%s/dump", cfg->libDir); + cfg->channelTargetDir = g_strdup_printf("%s/channel/target", cfg->libDir); + cfg->nvramDir = g_strdup_printf("%s/nvram", cfg->libDir); + cfg->memoryBackingDir = g_strdup_printf("%s/ram", cfg->libDir); + cfg->swtpmStorageDir = g_strdup_printf("%s/lib/libvirt/swtpm", + LOCALSTATEDIR); if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) cfg->swtpm_user = 0; /* fall back to root */ @@ -167,39 +167,39 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) if (!cachedir) return NULL; - virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir); + cfg->logDir = g_strdup_printf("%s/qemu/log", cachedir); + cfg->swtpmLogDir = g_strdup_printf("%s/qemu/log", cachedir); + cfg->cacheDir = g_strdup_printf("%s/qemu/cache", cachedir); rundir = virGetUserRuntimeDirectory(); if (!rundir) return NULL; - virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir); + cfg->stateDir = g_strdup_printf("%s/qemu/run", rundir); - virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir); + cfg->swtpmStateDir = g_strdup_printf("%s/swtpm", cfg->stateDir); if (!(cfg->configBaseDir = virGetUserConfigDirectory())) return NULL; - virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir); - virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir); - virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBaseDir); - virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", - cfg->configBaseDir); - virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir); - virAsprintf(&cfg->channelTargetDir, "%s/qemu/channel/target", - cfg->configBaseDir); - virAsprintf(&cfg->nvramDir, "%s/qemu/nvram", cfg->configBaseDir); - virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBaseDir); - virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", - cfg->configBaseDir); + cfg->libDir = g_strdup_printf("%s/qemu/lib", cfg->configBaseDir); + cfg->saveDir = g_strdup_printf("%s/qemu/save", cfg->configBaseDir); + cfg->snapshotDir = g_strdup_printf("%s/qemu/snapshot", cfg->configBaseDir); + cfg->checkpointDir = g_strdup_printf("%s/qemu/checkpoint", + cfg->configBaseDir); + cfg->autoDumpPath = g_strdup_printf("%s/qemu/dump", cfg->configBaseDir); + cfg->channelTargetDir = g_strdup_printf("%s/qemu/channel/target", + cfg->configBaseDir); + cfg->nvramDir = g_strdup_printf("%s/qemu/nvram", cfg->configBaseDir); + cfg->memoryBackingDir = g_strdup_printf("%s/qemu/ram", cfg->configBaseDir); + cfg->swtpmStorageDir = g_strdup_printf("%s/qemu/swtpm", + cfg->configBaseDir); cfg->swtpm_user = (uid_t)-1; cfg->swtpm_group = (gid_t)-1; } - virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir); - virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDir); - virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir); + cfg->configDir = g_strdup_printf("%s/qemu", cfg->configBaseDir); + cfg->autostartDir = g_strdup_printf("%s/qemu/autostart", cfg->configBaseDir); + cfg->slirpStateDir = g_strdup_printf("%s/slirp", cfg->stateDir); /* Set the default directory to find TLS X.509 certificates. * This will then be used as a fallback if the service specific @@ -1354,8 +1354,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; - virAsprintf(&key, "%d:%d:%s:%s", data.arch, data.virttype, - NULLSTR(data.machine), NULLSTR(data.path)); + key = g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype, + NULLSTR(data.machine), NULLSTR(data.path)); if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; @@ -1386,7 +1386,7 @@ qemuGetSharedDeviceKey(const char *device_path) return NULL; } - virAsprintf(&key, "%d:%d", maj, min); + key = g_strdup_printf("%d:%d", maj, min); return key; } @@ -1662,7 +1662,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) scsihostsrc->unit))) return NULL; - virAsprintf(&dev_path, "/dev/%s", dev_name); + dev_path = g_strdup_printf("/dev/%s", dev_name); return dev_path; } @@ -1839,7 +1839,7 @@ qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) { char *ret; - virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir); + ret = g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); return ret; } @@ -1854,7 +1854,7 @@ qemuGetDomainHugepagePath(const virDomainDef *def, char *ret = NULL; if (base && domPath) - virAsprintf(&ret, "%s/%s", base, domPath); + ret = g_strdup_printf("%s/%s", base, domPath); return ret; } @@ -1906,7 +1906,7 @@ void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, char **path) { - virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); + *path = g_strdup_printf("%s/libvirt/qemu", cfg->memoryBackingDir); } @@ -1922,7 +1922,7 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *def, return -1; qemuGetMemoryBackingBasePath(cfg, &base); - virAsprintf(path, "%s/%s", base, shortName); + *path = g_strdup_printf("%s/%s", base, shortName); return 0; } @@ -1958,6 +1958,6 @@ qemuGetMemoryBackingPath(const virDomainDef *def, if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0) return -1; - virAsprintf(memPath, "%s/%s", domainPath, alias); + *memPath = g_strdup_printf("%s/%s", domainPath, alias); return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25d4a0eb07..fe97e13c4f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2025,11 +2025,11 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, vm->def->name); + priv->libDir = g_strdup_printf("%s/domain-%s", cfg->libDir, vm->def->name); if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name); + priv->channelTargetDir = g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, vm->def->name); virObjectUnref(cfg); } @@ -2048,11 +2048,11 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname); + priv->libDir = g_strdup_printf("%s/domain-%s", cfg->libDir, domname); if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, domname); + priv->channelTargetDir = g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, domname); ret = 0; cleanup: @@ -9316,7 +9316,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, ctxt->writefd = -1; ctxt->readfd = -1; - virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name); + ctxt->path = g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); if (cfg->stdioLogD) { ctxt->manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver)); @@ -9496,7 +9496,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, VIR_DEBUG("Append log message (vm='%s' message='%s) stdioLogD=%d", vm->def->name, message, cfg->stdioLogD); - virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name); + path = g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); if (cfg->stdioLogD) { if (!(manager = virLogManagerNew(virQEMUDriverIsPrivileged(driver)))) @@ -9589,14 +9589,14 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (newxml == NULL) return -1; - virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name); + snapDir = g_strdup_printf("%s/%s", snapshotDir, vm->def->name); if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; } - virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name); + snapFile = g_strdup_printf("%s/%s.xml", snapDir, def->parent.name); ret = virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); @@ -9729,8 +9729,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, } } - virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, - snap->def->name); + snapFile = g_strdup_printf("%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, + snap->def->name); if (snap == virDomainSnapshotGetCurrent(vm->snapshots)) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); @@ -9818,7 +9818,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); } else { - virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, vm->def->name); + snapDir = g_strdup_printf("%s/%s", cfg->snapshotDir, vm->def->name); if (rmdir(snapDir) < 0 && errno != ENOENT) VIR_WARN("unable to remove snapshot directory %s", snapDir); @@ -9828,8 +9828,8 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); } else { - virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, - vm->def->name); + chkDir = g_strdup_printf("%s/%s", cfg->checkpointDir, + vm->def->name); if (rmdir(chkDir) < 0 && errno != ENOENT) VIR_WARN("unable to remove checkpoint directory %s", chkDir); } @@ -10177,7 +10177,7 @@ qemuDomainStorageAlias(const char *device, int depth) if (!depth) alias = g_strdup(device); else - virAsprintf(&alias, "%s.%d", device, depth); + alias = g_strdup_printf("%s.%d", device, depth); return alias; } @@ -11726,8 +11726,8 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) for (i = 0; i < G_N_ELEMENTS(nvlink2Files); i++) { g_autofree char *file = NULL; - virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", - device, nvlink2Files[i]); + file = g_strdup_printf("/sys/bus/pci/devices/%s/of_node/%s", + device, nvlink2Files[i]); if (!virFileExists(file)) return false; @@ -12406,15 +12406,15 @@ qemuDomainPrepareChannel(virDomainChrDefPtr channel, return 0; if (channel->target.name) { - virAsprintf(&channel->source->data.nix.path, "%s/%s", - domainChannelTargetDir, channel->target.name); + channel->source->data.nix.path = g_strdup_printf("%s/%s", + domainChannelTargetDir, channel->target.name); } else { /* Generate a unique name */ - virAsprintf(&channel->source->data.nix.path, - "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDir, - channel->info.addr.vioserial.controller, - channel->info.addr.vioserial.bus, - channel->info.addr.vioserial.port); + channel->source->data.nix.path = g_strdup_printf( + "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDir, + channel->info.addr.vioserial.controller, + channel->info.addr.vioserial.bus, + channel->info.addr.vioserial.port); } return 0; @@ -12604,9 +12604,9 @@ qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) shmem->server.chr.data.nix.path) return; - virAsprintf(&shmem->server.chr.data.nix.path, - "/var/lib/libvirt/shmem-%s-sock", - shmem->name); + shmem->server.chr.data.nix.path = g_strdup_printf( + "/var/lib/libvirt/shmem-%s-sock", + shmem->name); } @@ -12932,7 +12932,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfigPtr cfg, if (STREQ(mountpoint, "/dev")) suffix = "dev"; - virAsprintf(&path, "%s/%s.%s", cfg->stateDir, domname, suffix); + path = g_strdup_printf("%s/%s.%s", cfg->stateDir, domname, suffix); /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller @@ -13112,8 +13112,8 @@ qemuDomainCreateDeviceRecursive(const char *device, if (i == data->ndevMountsPath) { /* Okay, @device is in /dev but not in any mount point under /dev. * Create it. */ - virAsprintf(&devicePath, "%s/%s", data->path, - device + strlen(QEMU_DEVPREFIX)); + devicePath = g_strdup_printf("%s/%s", data->path, + device + strlen(QEMU_DEVPREFIX)); if (virFileMakeParentPath(devicePath) < 0) { virReportSystemError(errno, @@ -13167,7 +13167,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if ((c = strrchr(devTmp, '/'))) *(c + 1) = '\0'; - virAsprintf(&tmp, "%s%s", devTmp, target); + tmp = g_strdup_printf("%s%s", devTmp, target); VIR_FREE(devTmp); VIR_FREE(target); target = g_steal_pointer(&tmp); @@ -13330,7 +13330,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - virAsprintf(&opts, "mode=755,size=65536%s", mount_options); + opts = g_strdup_printf("mode=755,size=65536%s", mount_options); if (virFileSetupDev(data->path, opts) < 0) goto cleanup; @@ -14139,7 +14139,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, if ((c = strrchr(fileTmp, '/'))) *(c + 1) = '\0'; - virAsprintf(&tmp, "%s%s", fileTmp, target); + tmp = g_strdup_printf("%s%s", fileTmp, target); VIR_FREE(fileTmp); VIR_FREE(target); target = g_steal_pointer(&tmp); @@ -14695,7 +14695,7 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk, char *ret = NULL; if (idx) - virAsprintf(&ret, "%s[%d]", disk->dst, idx); + ret = g_strdup_printf("%s[%d]", disk->dst, idx); else ret = g_strdup(disk->dst); @@ -15138,8 +15138,8 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDefPtr disk, { src->id = qemuDomainStorageIdNew(priv); - virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id); - virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id); + src->nodestorage = g_strdup_printf("libvirt-%u-storage", src->id); + src->nodeformat = g_strdup_printf("libvirt-%u-format", src->id); if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; @@ -15173,7 +15173,7 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDefPtr disk, if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON && !diskPriv->nodeCopyOnRead) - virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst); + diskPriv->nodeCopyOnRead = g_strdup_printf("libvirt-CoR-%s", disk->dst); for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) @@ -15326,7 +15326,7 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv) { char *ret = NULL; - virAsprintf(&ret, "%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAlias()); + ret = g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAlias()); return ret; } @@ -15418,7 +15418,7 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, char **path) { - virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); + *path = g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name); } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1bf0c63eb1..708e1041a3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,7 +154,7 @@ qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, { g_autofree char *zpciAlias = NULL; - virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid); + zpciAlias = g_strdup_printf("zpci%d", info->addr.pci.zpci.uid); if (qemuMonitorDelDevice(mon, zpciAlias) < 0) return -1; @@ -1307,7 +1307,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } slirpfd = qemuSlirpGetFD(slirp); - virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias); + slirpfdName = g_strdup_printf("slirpfd-%s", net->info.alias); } break; @@ -1356,10 +1356,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; for (i = 0; i < tapfdSize; i++) - virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i); + tapfdName[i] = g_strdup_printf("fd-%s%zu", net->info.alias, i); for (i = 0; i < vhostfdSize; i++) - virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i); + vhostfdName[i] = g_strdup_printf("vhostfd-%s%zu", net->info.alias, i); if (!(netstr = qemuBuildHostNetStr(net, tapfdName, tapfdSize, @@ -1502,7 +1502,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; virErrorPreserveLast(&originalError); - virAsprintf(&netdev_name, "host%s", net->info.alias); + netdev_name = g_strdup_printf("host%s", net->info.alias); if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver, net, true); qemuDomainObjEnterMonitor(driver, vm); @@ -2353,7 +2353,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuAssignDeviceMemoryAlias(vm->def, mem, priv->memAliasOrderMismatch) < 0) goto cleanup; - virAsprintf(&objalias, "mem%s", mem->info.alias); + objalias = g_strdup_printf("mem%s", mem->info.alias); if (!(devstr = qemuBuildMemoryDeviceStr(mem, priv))) goto cleanup; @@ -2699,7 +2699,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) goto cleanup; - virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd); + vhostfdName = g_strdup_printf("vhostfd-%d", vhostfd); if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (qemuDomainIsS390CCW(vm->def) && @@ -2970,7 +2970,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, goto cleanup; if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias = g_strdup_printf("char%s", shmem->info.alias); } else { if (!(props = qemuBuildShmemBackendMemProps(shmem))) goto cleanup; @@ -3242,7 +3242,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; - virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd); + fdname = g_strdup_printf("%s%u", fdprefix, vsockPriv->vhostfd); if (!(devstr = qemuBuildVsockDevStr(vm->def, vsock, priv->qemuCaps, fdprefix))) goto cleanup; @@ -3975,7 +3975,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, (auth->expires && auth->validTo <= now)) { expire = "now"; } else if (auth->expires) { - virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo); + validTo = g_strdup_printf("%lu", (unsigned long)auth->validTo); expire = validTo; } else { expire = "never"; @@ -4330,7 +4330,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); - virAsprintf(&backendAlias, "mem%s", mem->info.alias); + backendAlias = g_strdup_printf("mem%s", mem->info.alias); qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDelObject(priv->mon, backendAlias); @@ -4548,7 +4548,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing network interface %s from domain %p %s", net->info.alias, vm, vm->def->name); - virAsprintf(&hostnet_name, "host%s", net->info.alias); + hostnet_name = g_strdup_printf("host%s", net->info.alias); if (!(charDevAlias = qemuAliasChardevFromDevAlias(net->info.alias))) return -1; @@ -4703,7 +4703,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rng->info.alias, vm, vm->def->name); - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias = g_strdup_printf("obj%s", rng->info.alias); if (!(charAlias = qemuAliasChardevFromDevAlias(rng->info.alias))) return -1; @@ -4762,9 +4762,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, shmem->info.alias, vm, vm->def->name); if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias = g_strdup_printf("char%s", shmem->info.alias); } else { - virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias); + memAlias = g_strdup_printf("shmmem-%s", shmem->info.alias); } qemuDomainObjEnterMonitor(driver, vm); @@ -6005,7 +6005,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver, size_t i; if (newhotplug) { - virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu); + vcpupriv->alias = g_strdup_printf("vcpu%u", vcpu); if (!(vcpuprops = qemuBuildHotpluggableCPUProps(vcpuinfo))) goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 8377b4d01d..dff4b3d76d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -365,7 +365,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, virCommandAbort(cmd); if (errbuf && *errbuf) - virAsprintf(&errstr, "\nstderr=%s", errbuf); + errstr = g_strdup_printf("\nstderr=%s", errbuf); virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: failed to communicate with bridge helper: %s%s"), diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 00b86fde83..cbabde45df 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -57,7 +57,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) filename = g_strdup(ent->d_name); - virAsprintf(&path, "%s/%s", dir, filename); + path = g_strdup_printf("%s/%s", dir, filename); if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Unable to access %s"), path); @@ -121,10 +121,10 @@ qemuInteropFetchConfigs(const char *name, if (!home) return -1; - virAsprintf(&xdgConfig, "%s/.config", home); + xdgConfig = g_strdup_printf("%s/.config", home); } - virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name); + homeConfig = g_strdup_printf("%s/qemu/%s", xdgConfig, name); } if (!(files = virHashCreate(10, virHashValueFree))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index aad2f77cb7..0447aa73bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -818,8 +818,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, copysrc->tlsAlias = g_strdup(tlsAlias); - virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst); - virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst); + copysrc->nodestorage = g_strdup_printf("migration-%s-storage", disk->dst); + copysrc->nodeformat = g_strdup_printf("migration-%s-format", disk->dst); /* Migration via blockdev-mirror was supported sooner than the auto-read-only * feature was added to qemu */ @@ -864,11 +864,11 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, int mon_ret; if (strchr(host, ':')) { - virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", host, port, - diskAlias); + nbd_dest = g_strdup_printf("nbd:[%s]:%d:exportname=%s", host, port, + diskAlias); } else { - virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", host, port, - diskAlias); + nbd_dest = g_strdup_printf("nbd:%s:%d:exportname=%s", host, port, + diskAlias); } if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -1831,7 +1831,7 @@ qemuMigrationDstGetURI(const char *migrateFrom, char *uri = NULL; if (STREQ(migrateFrom, "stdio")) - virAsprintf(&uri, "fd:%d", migrateFd); + uri = g_strdup_printf("fd:%d", migrateFd); else uri = g_strdup(migrateFrom); @@ -2255,7 +2255,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, incFormat = "%s:[%s]:%d"; else incFormat = "%s:%s:%d"; - virAsprintf(&migrateFrom, incFormat, protocol, listenAddress, port); + migrateFrom = g_strdup_printf(incFormat, protocol, listenAddress, port); } inc = qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, @@ -2695,7 +2695,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellFormed) /* For compatibility reasons tcp://... URIs are sent as tcp:... * We need to transform them to a well-formed URI before parsing. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri + 4, "//")) { - virAsprintf(&tmp, "tcp://%s", uri + 4); + tmp = g_strdup_printf("tcp://%s", uri + 4); uri = tmp; } @@ -2790,7 +2790,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, else incFormat = "%s:%s:%d"; - virAsprintf(uri_out, incFormat, "tcp", hostname, port); + *uri_out = g_strdup_printf(incFormat, "tcp", hostname, port); } else { bool well_formed_uri; @@ -2828,7 +2828,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (!(*uri_out = virURIFormat(uri))) goto cleanup; } else { - virAsprintf(uri_out, "%s:%d", uri_in, port); + *uri_out = g_strdup_printf("%s:%d", uri_in, port); } } else { port = uri->port; @@ -3294,7 +3294,7 @@ qemuMigrationSrcConnect(virQEMUDriverPtr driver, int ret = -1; host = spec->dest.host.name; - virAsprintf(&port, "%d", spec->dest.host.port); + port = g_strdup_printf("%d", spec->dest.host.port); spec->destType = MIGRATION_DEST_FD; spec->dest.fd.qemu = -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 990f2b06d0..1e2babf325 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -141,7 +141,7 @@ qemuDomainExtractTLSSubject(const char *certdir) int ret; size_t subjectlen; - virAsprintf(&certfile, "%s/server-cert.pem", certdir); + certfile = g_strdup_printf("%s/server-cert.pem", certdir); if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6495447188..c533819f4d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -961,7 +961,7 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) { char *id; - virAsprintf(&id, "libvirt-%d", ++mon->nextSerial); + id = g_strdup_printf("libvirt-%d", ++mon->nextSerial); return id; } @@ -2560,8 +2560,8 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (strchr(hostname, ':')) { - virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port); - } else virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port); + uri = g_strdup_printf("%s:[%s]:%d", protocol, hostname, port); + } else uri = g_strdup_printf("%s:%s:%d", protocol, hostname, port); ret = qemuMonitorJSONMigrate(mon, flags, uri); @@ -4246,20 +4246,20 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfoPtr info) switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - virAsprintf(&ret, - "hyper-v: arg1='0x%llx', arg2='0x%llx', " - "arg3='0x%llx', arg4='0x%llx', arg5='0x%llx'", - info->data.hyperv.arg1, info->data.hyperv.arg2, - info->data.hyperv.arg3, info->data.hyperv.arg4, - info->data.hyperv.arg5); + ret = g_strdup_printf( + "hyper-v: arg1='0x%llx', arg2='0x%llx', " + "arg3='0x%llx', arg4='0x%llx', arg5='0x%llx'", + info->data.hyperv.arg1, info->data.hyperv.arg2, + info->data.hyperv.arg3, info->data.hyperv.arg4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - virAsprintf(&ret, "s390: core='%d' psw-mask='0x%016llx' " - "psw-addr='0x%016llx' reason='%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason); + ret = g_strdup_printf("s390: core='%d' psw-mask='0x%016llx' " + "psw-addr='0x%016llx' reason='%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 697b302a7c..ab49cb5f54 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7120,7 +7120,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, switch ((virStorageNetHostTransport)server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - virAsprintf(&port_str, "%u", server->port); + port_str = g_strdup_printf("%u", server->port); addr = qemuMonitorJSONBuildInetSocketAddress(server->name, port_str); break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: @@ -8051,7 +8051,7 @@ qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, char *path = NULL; qemuMonitorJSONObjectProperty prop; - virAsprintf(&path, "/objects/iothread%u", iothreadInfo->iothread_id); + path = g_strdup_printf("/objects/iothread%u", iothreadInfo->iothread_id); #define VIR_IOTHREAD_SET_PROP(propName, propVal) \ if (iothreadInfo->set_##propVal) { \ @@ -8209,11 +8209,11 @@ qemuMonitorJSONFindObjectPathByAlias(qemuMonitorPtr mon, if (npaths < 0) return -1; - virAsprintf(&child, "child<%s>", name); + child = g_strdup_printf("child<%s>", name); for (i = 0; i < npaths; i++) { if (STREQ(paths[i]->name, alias) && STREQ(paths[i]->type, child)) { - virAsprintf(path, "/machine/peripheral/%s", alias); + *path = g_strdup_printf("/machine/peripheral/%s", alias); ret = 0; goto cleanup; @@ -8265,7 +8265,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mon, if (STREQ_NULLABLE(paths[i]->type, name)) { VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->name); ret = 0; - virAsprintf(path, "%s/%s", curpath, paths[i]->name); + *path = g_strdup_printf("%s/%s", curpath, paths[i]->name); goto cleanup; } @@ -8273,7 +8273,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mon, * traversed looking for more entries */ if (paths[i]->type && STRPREFIX(paths[i]->type, "child<")) { - virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name); + nextpath = g_strdup_printf("%s/%s", curpath, paths[i]->name); ret = qemuMonitorJSONFindObjectPathByName(mon, nextpath, name, path); VIR_FREE(nextpath); @@ -8316,7 +8316,7 @@ qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon, return ret; } - virAsprintf(&linkname, "link<%s>", name); + linkname = g_strdup_printf("link<%s>", name); ret = qemuMonitorJSONFindObjectPathByName(mon, "/", linkname, path); VIR_FREE(linkname); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a5b2d2ccfd..9054682d60 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -42,7 +42,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, /* 'dummy' here is just a placeholder since there is no PCI * address required when attaching drives to a controller */ - virAsprintf(&cmd, "drive_add dummy %s", drivestr); + cmd = g_strdup_printf("drive_add dummy %s", drivestr); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -91,7 +91,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - virAsprintf(&cmd, "drive_del %s", drivestr); + cmd = g_strdup_printf("drive_del %s", drivestr); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -129,7 +129,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - virAsprintf(&cmd, "savevm \"%s\"", name); + cmd = g_strdup_printf("savevm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -163,7 +163,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) int ret = -1; char *safename; - virAsprintf(&cmd, "loadvm \"%s\"", name); + cmd = g_strdup_printf("loadvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -206,7 +206,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) char *reply = NULL; int ret = -1; - virAsprintf(&cmd, "delvm \"%s\"", name); + cmd = g_strdup_printf("delvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 925fc44a70..0917ad98d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -108,7 +108,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file = g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -2098,7 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id = g_strdup_printf("char%s", chr->info.alias); entry = virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -2187,7 +2187,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, if (chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id = g_strdup_printf("char%s", chr->info.alias); /* port state not reported */ if (!(entry = virHashLookup(info, id)) || @@ -3194,7 +3194,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig, monConfig->type = VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen = true; - virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", domainDir); + monConfig->data.nix.path = g_strdup_printf("%s/monitor.sock", domainDir); return 0; } @@ -3400,8 +3400,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) } else { newState = VIR_DOMAIN_PAUSED; newReason = reason; - virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason)); + msg = g_strdup_printf("was paused (%s)", + virDomainPausedReasonTypeToString(reason)); } } @@ -4066,7 +4066,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON) continue; - virAsprintf(&cpuFeature, "hv-%s", virDomainHypervTypeToString(i)); + cpuFeature = g_strdup_printf("hv-%s", virDomainHypervTypeToString(i)); rc = virCPUDataCheckFeature(cpu, cpuFeature); VIR_FREE(cpuFeature); @@ -4898,8 +4898,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, - type); + glisten->socket = g_strdup_printf("%s/%s.sock", priv->libDir, + type); glisten->fromConfig = true; glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET; } else if (listenAddr) { @@ -4920,8 +4920,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, - type); + glisten->socket = g_strdup_printf("%s/%s.sock", priv->libDir, + type); glisten->autoGenerated = true; } break; @@ -5998,7 +5998,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr driver, if (vcpu->hotpluggable == VIR_TRISTATE_BOOL_YES && vcpu->online && vcpupriv->vcpus != 0) { - virAsprintf(&vcpupriv->alias, "vcpu%zu", i); + vcpupriv->alias = g_strdup_printf("vcpu%zu", i); if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) goto cleanup; @@ -8480,7 +8480,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) VIR_DEBUG("proc=%p, emulator=%s", proc, proc->binary); - virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir); + template = g_strdup_printf("%s/qmp-XXXXXX", proc->libDir); if (!(proc->uniqDir = mkdtemp(template))) { virReportSystemError(errno, @@ -8493,16 +8493,16 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; - virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor"); + proc->monpath = g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor"); - virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath); + proc->monarg = g_strdup_printf("unix:%s,server,nowait", proc->monpath); /* * Normally we'd use runDir for pid files, but because we're using * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid"); + proc->pidfile = g_strdup_printf("%s/%s", proc->uniqDir, "qmp.pid"); ret = 0; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index c08a365548..5266b36eaa 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -156,7 +156,7 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, if (!(shortName = virDomainDefGetShortName(def))) return NULL; - virAsprintf(&name, "%s-%s-slirp", shortName, alias); + name = g_strdup_printf("%s-%s-slirp", shortName, alias); return virPidFileBuildPath(cfg->slirpStateDir, name); } @@ -210,7 +210,7 @@ qemuSlirpGetDBusVMStateId(virDomainNetDefPtr net) char *id = NULL; /* can't use alias, because it's not stable across restarts */ - virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)); + id = g_strdup_printf("slirp-%s", virMacAddrFormat(&net->mac, macstr)); return id; } @@ -227,8 +227,8 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, if (!(shortName = virDomainDefGetShortName(def))) return NULL; - virAsprintf(&path, "%s/%s-%s-slirp", - cfg->slirpStateDir, shortName, alias); + path = g_strdup_printf("%s/%s-%s-slirp", + cfg->slirpStateDir, shortName, alias); return path; } @@ -380,7 +380,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, return -1; } - virAsprintf(&dbus_addr, "unix:path=%s", dbus_path); + dbus_addr = g_strdup_printf("unix:path=%s", dbus_path); virCommandAddArgFormat(cmd, "--dbus-id=%s", id); diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index d6d418533c..62b9f803bd 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -78,7 +78,7 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorageDir, return NULL; } - virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, dir); + path = g_strdup_printf("%s/%s/%s", swtpmStorageDir, uuidstr, dir); return path; } @@ -206,7 +206,7 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, { char *path = NULL; - virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, shortName); + path = g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); return path; } @@ -249,7 +249,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, char *pidfile = NULL; char *devicename = NULL; - virAsprintf(&devicename, "%s-swtpm", shortName); + devicename = g_strdup_printf("%s-swtpm", shortName); pidfile = virPidFileBuildPath(swtpmStateDir, devicename); @@ -332,7 +332,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, /* create logfile name ... */ if (!tpm->data.emulator.logfile) - virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir, vmname); + tpm->data.emulator.logfile = g_strdup_printf("%s/%s-swtpm.log", logDir, vmname); if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { @@ -486,7 +486,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, goto cleanup; virUUIDFormat(vmuuid, uuid); - virAsprintf(&vmid, "%s:%s", vmname, uuid); + vmid = g_strdup_printf("%s:%s", vmname, uuid); virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 7355ae70f8..37e424eac3 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -47,7 +47,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, { g_autofree char *devicename = NULL; - virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias); + devicename = g_strdup_printf("%s-%s-vhost-user-gpu", shortName, alias); return virPidFileBuildPath(stateDir, devicename); } -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/remote/remote_daemon.c | 28 ++++++++++++++-------------- src/remote/remote_daemon_config.c | 2 +- src/remote/remote_daemon_dispatch.c | 14 +++++++------- src/remote/remote_driver.c | 12 ++++++------ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 6977cc36e0..56e1455a1a 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -225,23 +225,23 @@ daemonUnixSocketPaths(struct daemonConfig *config, char *rundir = NULL; if (config->unix_sock_dir) { - virAsprintf(sockfile, "%s/%s-sock", config->unix_sock_dir, - SOCK_PREFIX); + *sockfile = g_strdup_printf("%s/%s-sock", config->unix_sock_dir, + SOCK_PREFIX); if (privileged) { - virAsprintf(rosockfile, "%s/%s-sock-ro", - config->unix_sock_dir, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/%s-admin-sock", - config->unix_sock_dir, SOCK_PREFIX); + *rosockfile = g_strdup_printf("%s/%s-sock-ro", + config->unix_sock_dir, SOCK_PREFIX); + *admsockfile = g_strdup_printf("%s/%s-admin-sock", + config->unix_sock_dir, SOCK_PREFIX); } } else { if (privileged) { - virAsprintf(sockfile, "%s/libvirt/%s-sock", - RUNSTATEDIR, SOCK_PREFIX); - virAsprintf(rosockfile, "%s/libvirt/%s-sock-ro", - RUNSTATEDIR, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/libvirt/%s-admin-sock", - RUNSTATEDIR, SOCK_PREFIX); + *sockfile = g_strdup_printf("%s/libvirt/%s-sock", + RUNSTATEDIR, SOCK_PREFIX); + *rosockfile = g_strdup_printf("%s/libvirt/%s-sock-ro", + RUNSTATEDIR, SOCK_PREFIX); + *admsockfile = g_strdup_printf("%s/libvirt/%s-admin-sock", + RUNSTATEDIR, SOCK_PREFIX); } else { mode_t old_umask; @@ -255,8 +255,8 @@ daemonUnixSocketPaths(struct daemonConfig *config, } umask(old_umask); - virAsprintf(sockfile, "%s/%s-sock", rundir, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/%s-admin-sock", rundir, SOCK_PREFIX); + *sockfile = g_strdup_printf("%s/%s-sock", rundir, SOCK_PREFIX); + *admsockfile = g_strdup_printf("%s/%s-admin-sock", rundir, SOCK_PREFIX); } } diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index cfc0869747..ae6b491686 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -84,7 +84,7 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(configdir = virGetUserConfigDirectory())) goto error; - virAsprintf(configfile, "%s/%s.conf", configdir, DAEMON_NAME); + *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME); VIR_FREE(configdir); } diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index d12c3c1ed9..a443cb174b 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2174,7 +2174,7 @@ remoteDispatchProbeURI(bool readonly, g_autofree char *daemonname = NULL; g_autofree char *daemonpath = NULL; - virAsprintf(&daemonname, "virt%sd", drivers[i]); + daemonname = g_strdup_printf("virt%sd", drivers[i]); if (!(daemonpath = virFileFindResource(daemonname, "src", SBINDIR))) return -1; @@ -2184,7 +2184,7 @@ remoteDispatchProbeURI(bool readonly, continue; } - virAsprintf(probeduri, "%s:///session", drivers[i]); + *probeduri = g_strdup_printf("%s:///session", drivers[i]); VIR_DEBUG("Probed URI %s via daemon %s", *probeduri, daemonpath); return 0; @@ -2217,15 +2217,15 @@ remoteDispatchProbeURI(bool readonly, for (i = 0; i < (ssize_t) G_N_ELEMENTS(drivers) && !*probeduri; i++) { g_autofree char *sockname = NULL; - virAsprintf(&sockname, "%s/libvirt/virt%sd-%s", RUNSTATEDIR, - drivers[i], readonly ? "sock-ro" : "sock"); + sockname = g_strdup_printf("%s/libvirt/virt%sd-%s", RUNSTATEDIR, + drivers[i], readonly ? "sock-ro" : "sock"); if (!virFileExists(sockname)) { VIR_DEBUG("Missing sock %s for driver %s", sockname, drivers[i]); continue; } - virAsprintf(probeduri, "%s:///system", drivers[i]); + *probeduri = g_strdup_printf("%s:///system", drivers[i]); VIR_DEBUG("Probed URI %s via sock %s", *probeduri, sockname); return 0; @@ -3839,8 +3839,8 @@ remoteDispatchAuthList(virNetServerPtr server, virResetLastError(); } else if (callerUid == 0) { char *ident; - virAsprintf(&ident, "pid:%lld,uid:%d", (long long)callerPid, - (int)callerUid); + ident = g_strdup_printf("pid:%lld,uid:%d", (long long)callerPid, + (int)callerUid); VIR_INFO("Bypass polkit auth for privileged client %s", ident); virNetServerSetClientAuthenticated(server, client); auth = VIR_NET_SERVER_SERVICE_AUTH_NONE; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4fcf13161c..2872b67469 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -781,7 +781,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transport, if (!(userdir = virGetUserRuntimeDirectory())) return NULL; - virAsprintf(&sockname, "%s/%s-sock", userdir, sock_prefix); + sockname = g_strdup_printf("%s/%s-sock", userdir, sock_prefix); } else { /* Intentionally do *NOT* use RUNSTATEDIR here. We might * be connecting to a remote machine, and cannot assume @@ -789,9 +789,9 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transport, * any machine with /run will have a /var/run symlink. * The portable option is to thus use $LOCALSTATEDIR/run */ - virAsprintf(&sockname, "%s/run/libvirt/%s-%s", LOCALSTATEDIR, - sock_prefix, - flags & VIR_DRV_OPEN_REMOTE_RO ? "sock-ro" : "sock"); + sockname = g_strdup_printf("%s/run/libvirt/%s-%s", LOCALSTATEDIR, + sock_prefix, + flags & VIR_DRV_OPEN_REMOTE_RO ? "sock-ro" : "sock"); } VIR_DEBUG("Built UNIX sockname %s for transport %s prefix %s flags=0x%x", @@ -815,7 +815,7 @@ remoteGetUNIXSocket(remoteDriverTransport transport, g_autofree char *legacy_sock_name = NULL; if (driver) - virAsprintf(&direct_daemon, "virt%sd", driver); + direct_daemon = g_strdup_printf("virt%sd", driver); legacy_daemon = g_strdup("libvirtd"); @@ -998,7 +998,7 @@ doRemoteOpen(virConnectPtr conn, /* Remote server defaults to "localhost" if not specified. */ if (conn->uri && conn->uri->port != 0) { - virAsprintf(&port, "%d", conn->uri->port); + port = g_strdup_printf("%d", conn->uri->port); } else if (transport == REMOTE_DRIVER_TRANSPORT_TLS) { port = g_strdup(LIBVIRTD_TLS_PORT); } else if (transport == REMOTE_DRIVER_TRANSPORT_TCP) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/rpc/virnetclient.c | 12 ++++++------ src/rpc/virnetlibsshsession.c | 8 ++++---- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 11 ++++++----- src/rpc/virnettlscontext.c | 26 +++++++++++++------------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index a423f4db2f..47a17d30f7 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -343,7 +343,7 @@ virNetClientCheckKeyExists(const char *homedir, { char *path; - virAsprintf(&path, "%s/.ssh/%s", homedir, name); + path = g_strdup_printf("%s/.ssh/%s", homedir, name); if (!(virFileExists(path))) { VIR_FREE(path); @@ -565,7 +565,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, } else { confdir = virGetUserConfigDirectory(); if (confdir) - virAsprintf(&knownhosts, "%s/known_hosts", confdir); + knownhosts = g_strdup_printf("%s/known_hosts", confdir); } if (privkeyPath) { @@ -599,10 +599,10 @@ virNetClientPtr virNetClientNewLibssh(const char *host, if (!(nc = virBufferContentAndReset(&buf))) goto no_memory; - virAsprintf(&command, "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" "else " "ARG=;" "fi;" "'%s' $ARG -U %s'", nc, nc, - socketPath); + command = g_strdup_printf("sh -c " + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " + "ARG=-q0;" "else " "ARG=;" "fi;" "'%s' $ARG -U %s'", nc, nc, + socketPath); if (virNetSocketNewConnectLibssh(host, port, family, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 4a9f976914..2fcc606993 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -341,9 +341,9 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (!keyhashstr) return -1; - virAsprintf(&tmp, - _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + tmp = g_strdup_printf( + _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, "y", "n"); askKey.prompt = tmp; if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -524,7 +524,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSessionPtr sess, VIR_DEBUG("sess=%p", sess); - virAsprintf(&tmp, "%s.pub", priv->filename); + tmp = g_strdup_printf("%s.pub", priv->filename); /* try to open the public part of the private key */ ret = ssh_pki_import_pubkey_file(tmp, &public_key); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2b66bc609b..f2623c58ef 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -698,7 +698,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } - virAsprintf(&lockpath, "%s/%s.lock", rundir, binname); + lockpath = g_strdup_printf("%s/%s.lock", rundir, binname); if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 384bedfc34..5b87581b62 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -365,9 +365,10 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr = virBufferContentAndReset(&buff); askKey.type = VIR_CRED_ECHOPROMPT; - virAsprintf((char **)&askKey.prompt, - _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + askKey.prompt = g_strdup_printf(_("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, + sess->hostname, + sess->port, "y", "n"); if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", @@ -628,8 +629,8 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } - virAsprintf((char **)&retr_passphrase.prompt, - _("Passphrase for key '%s'"), priv->filename); + retr_passphrase.prompt = g_strdup_printf(_("Passphrase for key '%s'"), + priv->filename); if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index af6d29b376..7163775f74 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -796,13 +796,13 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, */ if (pkipath) { VIR_DEBUG("Told to use TLS credentials in %s", pkipath); - virAsprintf(cacert, "%s/%s", pkipath, "cacert.pem"); - virAsprintf(cacrl, "%s/%s", pkipath, "cacrl.pem"); - virAsprintf(key, "%s/%s", pkipath, - isServer ? "serverkey.pem" : "clientkey.pem"); + *cacert = g_strdup_printf("%s/%s", pkipath, "cacert.pem"); + *cacrl = g_strdup_printf("%s/%s", pkipath, "cacrl.pem"); + *key = g_strdup_printf("%s/%s", pkipath, + isServer ? "serverkey.pem" : "clientkey.pem"); - virAsprintf(cert, "%s/%s", pkipath, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert = g_strdup_printf("%s/%s", pkipath, + isServer ? "servercert.pem" : "clientcert.pem"); } else if (tryUserPkiPath) { /* Check to see if $HOME/.pki contains at least one of the * files and if so, use that @@ -812,19 +812,19 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, if (!userdir) goto error; - virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir); + user_pki_path = g_strdup_printf("%s/.pki/libvirt", userdir); VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_path); - virAsprintf(cacert, "%s/%s", user_pki_path, "cacert.pem"); + *cacert = g_strdup_printf("%s/%s", user_pki_path, "cacert.pem"); - virAsprintf(cacrl, "%s/%s", user_pki_path, "cacrl.pem"); + *cacrl = g_strdup_printf("%s/%s", user_pki_path, "cacrl.pem"); - virAsprintf(key, "%s/%s", user_pki_path, - isServer ? "serverkey.pem" : "clientkey.pem"); + *key = g_strdup_printf("%s/%s", user_pki_path, + isServer ? "serverkey.pem" : "clientkey.pem"); - virAsprintf(cert, "%s/%s", user_pki_path, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert = g_strdup_printf("%s/%s", user_pki_path, + isServer ? "servercert.pem" : "clientcert.pem"); /* * If some of the files can't be found, fallback -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/secret/secret_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 064a02dfdd..5a5c84412a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -469,19 +469,19 @@ secretStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - virAsprintf(&driver->configDir, "%s/libvirt/secrets", SYSCONFDIR); - virAsprintf(&driver->stateDir, "%s/libvirt/secrets", RUNSTATEDIR); + driver->configDir = g_strdup_printf("%s/libvirt/secrets", SYSCONFDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/secrets", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; g_autofree char *cfgdir = NULL; if (!(cfgdir = virGetUserConfigDirectory())) goto error; - virAsprintf(&driver->configDir, "%s/secrets/", cfgdir); + driver->configDir = g_strdup_printf("%s/secrets/", cfgdir); if (!(rundir = virGetUserRuntimeDirectory())) goto error; - virAsprintf(&driver->stateDir, "%s/secrets/run", rundir); + driver->stateDir = g_strdup_printf("%s/secrets/run", rundir); } if (virFileMakePathWithMode(driver->configDir, S_IRWXU) < 0) { -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/security/security_apparmor.c | 22 +++++++++--------- src/security/security_dac.c | 20 ++++++++-------- src/security/security_selinux.c | 40 ++++++++++++++++---------------- src/security/security_util.c | 12 +++++----- src/security/virt-aa-helper.c | 26 ++++++++++----------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 7263c2face..5fdc5fd7f5 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -76,11 +76,11 @@ profile_status(const char *str, const int check_enforcing) int rc = -2; /* create string that is '<str> \0' for accurate matching */ - virAsprintf(&tmp, "%s ", str); + tmp = g_strdup_printf("%s ", str); if (check_enforcing != 0) { /* create string that is '<str> (enforce)\0' for accurate matching */ - virAsprintf(&etmp, "%s (enforce)", str); + etmp = g_strdup_printf("%s (enforce)", str); } if (virFileReadAll(APPARMOR_PROFILES_PATH, MAX_FILE_LEN, &content) < 0) { @@ -126,7 +126,7 @@ profile_status_file(const char *str) int rc = -1; int len; - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", str); + profile = g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", str); if (!virFileExists(profile)) goto failed; @@ -138,7 +138,7 @@ profile_status_file(const char *str) } /* create string that is ' <str> flags=(complain)\0' */ - virAsprintf(&tmp, " %s flags=(complain)", str); + tmp = g_strdup_printf(" %s flags=(complain)", str); if (strstr(content, tmp) != NULL) rc = 0; @@ -221,7 +221,7 @@ get_profile_name(virDomainDefPtr def) char *name = NULL; virUUIDFormat(def->uuid, uuidstr); - virAsprintf(&name, "%s%s", AA_PREFIX, uuidstr); + name = g_strdup_printf("%s%s", AA_PREFIX, uuidstr); return name; } @@ -353,8 +353,8 @@ AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) return rc; /* see if template file exists */ - virAsprintf(&template_qemu, "%s/TEMPLATE.qemu", APPARMOR_DIR "/libvirt"); - virAsprintf(&template_lxc, "%s/TEMPLATE.lxc", APPARMOR_DIR "/libvirt"); + template_qemu = g_strdup_printf("%s/TEMPLATE.qemu", APPARMOR_DIR "/libvirt"); + template_lxc = g_strdup_printf("%s/TEMPLATE.lxc", APPARMOR_DIR "/libvirt"); if (!virFileExists(template_qemu)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1026,8 +1026,8 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in = g_strdup_printf("%s.in", dev_source->data.file.path); + out = g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in)) { if (reload_profile(mgr, def, in, true) < 0) goto done; @@ -1091,7 +1091,7 @@ AppArmorSetPathLabel(virSecurityManagerPtr mgr, char *full_path = NULL; if (allowSubtree) { - virAsprintf(&full_path, "%s/{,**}", path); + full_path = g_strdup_printf("%s/{,**}", path); rc = reload_profile(mgr, def, full_path, true); VIR_FREE(full_path); } else { @@ -1123,7 +1123,7 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, if (!secdef || !secdef->imagelabel) return 0; - virAsprintf(&proc, "/proc/self/fd/%d", fd); + proc = g_strdup_printf("/proc/self/fd/%d", fd); if (virFileResolveLink(proc, &fd_path) < 0) { /* it's a deleted file, presumably. Ignore? */ diff --git a/src/security/security_dac.c b/src/security/security_dac.c index dfa402d544..56cca6cf9c 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -302,8 +302,8 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, priv->user = user; priv->group = group; - virAsprintf(&priv->baselabel, "+%u:+%u", (unsigned int)user, - (unsigned int)group); + priv->baselabel = g_strdup_printf("+%u:+%u", (unsigned int)user, + (unsigned int)group); return 0; } @@ -437,7 +437,7 @@ virSecurityDACRememberLabel(virSecurityDACDataPtr priv G_GNUC_UNUSED, char *label = NULL; int ret = -1; - virAsprintf(&label, "+%u:+%u", (unsigned int)uid, (unsigned int)gid); + label = g_strdup_printf("+%u:+%u", (unsigned int)uid, (unsigned int)gid); ret = virSecuritySetRememberedLabel(SECURITY_DAC_NAME, path, label); VIR_FREE(label); @@ -1507,8 +1507,8 @@ virSecurityDACSetChardevLabelHelper(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in = g_strdup_printf("%s.in", dev_source->data.file.path); + out = g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACSetOwnership(mgr, NULL, in, user, group, remember) < 0 || virSecurityDACSetOwnership(mgr, NULL, out, user, group, remember) < 0) @@ -1599,8 +1599,8 @@ virSecurityDACRestoreChardevLabelHelper(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&out, "%s.out", dev_source->data.file.path); - virAsprintf(&in, "%s.in", dev_source->data.file.path); + out = g_strdup_printf("%s.out", dev_source->data.file.path); + in = g_strdup_printf("%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, out, recall) < 0 || virSecurityDACRestoreFileLabelInternal(mgr, NULL, in, recall) < 0) @@ -2281,8 +2281,8 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_SECLABEL_DYNAMIC: - virAsprintf(&seclabel->label, "+%u:+%u", (unsigned int)priv->user, - (unsigned int)priv->group); + seclabel->label = g_strdup_printf("+%u:+%u", (unsigned int)priv->user, + (unsigned int)priv->group); if (seclabel->label == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate dac user and group id " @@ -2333,7 +2333,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, VIR_DEBUG("Getting DAC user and group on process '%d'", pid); - virAsprintf(&path, "/proc/%d", (int)pid); + path = g_strdup_printf("/proc/%d", (int)pid); if (lstat(path, &sb) < 0) { virReportSystemError(errno, diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 47fc95351f..5a2cd6bbeb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -381,14 +381,14 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin); if (c1 == c2) { - virAsprintf(&mcs, "%s:c%d", sens, catMin + c1); + mcs = g_strdup_printf("%s:c%d", sens, catMin + c1); } else { if (c1 > c2) { int t = c1; c1 = c2; c2 = t; } - virAsprintf(&mcs, "%s:c%d,c%d", sens, catMin + c1, catMin + c2); + mcs = g_strdup_printf("%s:c%d,c%d", sens, catMin + c1, catMin + c2); } if (virHashLookup(data->mcs, mcs) == NULL) @@ -2202,8 +2202,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityManagerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block); + path = g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path = g_strdup(dev->source.caps.u.storage.block); } @@ -2214,8 +2214,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev); + path = g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path = g_strdup(dev->source.caps.u.misc.chardev); } @@ -2433,8 +2433,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurityManagerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block); + path = g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path = g_strdup(dev->source.caps.u.storage.block); } @@ -2445,8 +2445,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev); + path = g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path = g_strdup(dev->source.caps.u.misc.chardev); } @@ -2544,8 +2544,8 @@ virSecuritySELinuxSetChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in = g_strdup_printf("%s.in", dev_source->data.file.path); + out = g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxSetFilecon(mgr, in, imagelabel, true) < 0) || (virSecuritySELinuxSetFilecon(mgr, out, imagelabel, true) < 0)) { @@ -2618,8 +2618,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&out, "%s.out", dev_source->data.file.path); - virAsprintf(&in, "%s.in", dev_source->data.file.path); + out = g_strdup_printf("%s.out", dev_source->data.file.path); + in = g_strdup_printf("%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true) < 0) || (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) { @@ -3257,7 +3257,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, } /* Label /dev/tap.* devices only. Leave /dev/net/tun alone! */ - virAsprintf(&proc, "/proc/self/fd/%d", fd); + proc = g_strdup_printf("/proc/self/fd/%d", fd); if (virFileResolveLink(proc, &fd_path) < 0) { virReportSystemError(errno, @@ -3341,9 +3341,9 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, secdef->imagelabel = virSecuritySELinuxGenImageLabel(mgr, def); if (secdef->imagelabel) { - virAsprintf(&opts, - ",context=\"%s\"", - (const char*) secdef->imagelabel); + opts = g_strdup_printf( + ",context=\"%s\"", + (const char*) secdef->imagelabel); } } @@ -3402,7 +3402,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr mgr, return -1; while ((ret = virDirRead(dir, &ent, path)) > 0) { - virAsprintf(&filename, "%s/%s", path, ent->d_name); + filename = g_strdup_printf("%s/%s", path, ent->d_name); ret = virSecuritySELinuxSetFilecon(mgr, filename, seclabel->imagelabel, true); VIR_FREE(filename); @@ -3448,7 +3448,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManagerPtr mgr, return -1; while ((ret = virDirRead(dir, &ent, path)) > 0) { - virAsprintf(&filename, "%s/%s", path, ent->d_name); + filename = g_strdup_printf("%s/%s", path, ent->d_name); ret = virSecuritySELinuxRestoreFileLabel(mgr, filename, true); VIR_FREE(filename); if (ret < 0) diff --git a/src/security/security_util.c b/src/security/security_util.c index 5fb0a3aae5..4f661fd75e 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -63,7 +63,7 @@ virSecurityGetAttrName(const char *name G_GNUC_UNUSED) { char *ret = NULL; #ifdef XATTR_NAMESPACE - virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.%s", name); + ret = g_strdup_printf(XATTR_NAMESPACE".libvirt.security.%s", name); #else errno = ENOSYS; virReportSystemError(errno, "%s", @@ -78,7 +78,7 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UNUSED) { char *ret = NULL; #ifdef XATTR_NAMESPACE - virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.ref_%s", name); + ret = g_strdup_printf(XATTR_NAMESPACE".libvirt.security.ref_%s", name); #else errno = ENOSYS; virReportSystemError(errno, "%s", @@ -93,7 +93,7 @@ static char * virSecurityGetTimestampAttrName(const char *name) { char *ret = NULL; - virAsprintf(&ret, XATTR_NAMESPACE ".libvirt.security.timestamp_%s", name); + ret = g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s", name); return ret; } #else /* !XATTR_NAMESPACE */ @@ -120,7 +120,7 @@ virSecurityGetTimestamp(void) return NULL; } - virAsprintf(&ret, "%llu", boottime); + ret = g_strdup_printf("%llu", boottime); return ret; } @@ -312,7 +312,7 @@ virSecurityGetRememberedLabel(const char *name, refcount--; if (refcount > 0) { - virAsprintf(&value, "%u", refcount); + value = g_strdup_printf("%u", refcount); if (virFileSetXAttr(path, ref_name, value) < 0) return -1; @@ -419,7 +419,7 @@ virSecuritySetRememberedLabel(const char *name, return -1; } - virAsprintf(&value, "%u", refcount); + value = g_strdup_printf("%u", refcount); if (virFileSetXAttr(path, ref_name, value) < 0) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c2679cdad2..634a532d35 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -157,7 +157,7 @@ parserCommand(const char *profile_name, const char cmd) snprintf(flag, 3, "-%c", cmd); - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_name); + profile = g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", profile_name); if (!virFileExists(profile)) { vah_error(NULL, 0, _("profile does not exist")); @@ -214,9 +214,9 @@ update_include_file(const char *include_file, const char *included_files, } if (append && virFileExists(include_file)) - virAsprintf(&pcontent, "%s%s", existing, included_files); + pcontent = g_strdup_printf("%s%s", existing, included_files); else - virAsprintf(&pcontent, "%s%s", warning, included_files); + pcontent = g_strdup_printf("%s%s", warning, included_files); plen = strlen(pcontent); if (plen > MAX_FILE_LEN) { @@ -290,7 +290,7 @@ create_profile(const char *profile, const char *profile_name, driver_name = virDomainVirtTypeToString(virtType); } - virAsprintf(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", driver_name); + template = g_strdup_printf("%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", driver_name); if (!virFileExists(template)) { vah_error(NULL, 0, _("template does not exist")); @@ -313,11 +313,11 @@ create_profile(const char *profile, const char *profile_name, } /* '\nprofile <profile_name>\0' */ - virAsprintf(&replace_name, "\nprofile %s", profile_name); + replace_name = g_strdup_printf("\nprofile %s", profile_name); /* '\n<profile_files>\n}\0' */ if (virtType != VIR_DOMAIN_VIRT_LXC) - virAsprintf(&replace_files, "\n%s\n}", profile_files); + replace_files = g_strdup_printf("\n%s\n}", profile_files); plen = tlen + strlen(replace_name) - strlen(template_name) + 1; @@ -768,7 +768,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi vah_error(NULL, 0, _("could not find realpath")); goto cleanup; } - virAsprintf(&tmp, "%s%s", pathreal, pathtmp); + tmp = g_strdup_printf("%s%s", pathreal, pathtmp); } perms_new = g_strdup(perms); @@ -835,13 +835,13 @@ vah_add_file_chardev(virBufferPtr buf, if (type == VIR_DOMAIN_CHR_TYPE_PIPE) { /* add the pipe input */ - virAsprintf(&pipe_in, "%s.in", path); + pipe_in = g_strdup_printf("%s.in", path); if (vah_add_file(buf, pipe_in, perms) != 0) goto clean_pipe_in; /* add the pipe output */ - virAsprintf(&pipe_out, "%s.out", path); + pipe_out = g_strdup_printf("%s.out", path); if (vah_add_file(buf, pipe_out, perms) != 0) goto clean_pipe_out; @@ -934,7 +934,7 @@ get_files(vahControl * ctl) /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); - virAsprintf(&uuid, "%s%s", AA_PREFIX, uuidstr); + uuid = g_strdup_printf("%s%s", AA_PREFIX, uuidstr); if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); @@ -1431,8 +1431,8 @@ main(int argc, char **argv) if (vahParseArgv(ctl, argc, argv) != 0) vah_error(ctl, 1, _("could not parse arguments")); - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); - virAsprintf(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt", ctl->uuid); + profile = g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); + include_file = g_strdup_printf("%s/%s.files", APPARMOR_DIR "/libvirt", ctl->uuid); if (ctl->cmd == 'a') { rc = parserLoad(ctl->uuid); @@ -1494,7 +1494,7 @@ main(int argc, char **argv) /* create the profile from TEMPLATE */ if (ctl->cmd == 'c') { char *tmp = NULL; - virAsprintf(&tmp, " #include <libvirt/%s.files>\n", ctl->uuid); + tmp = g_strdup_printf(" #include <libvirt/%s.files>\n", ctl->uuid); if (ctl->dryrun) { vah_info(profile); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/storage/storage_backend_disk.c | 4 +- src/storage/storage_backend_gluster.c | 8 ++-- src/storage/storage_backend_iscsi.c | 16 +++---- src/storage/storage_backend_iscsi_direct.c | 28 ++++++------ src/storage/storage_backend_logical.c | 8 ++-- src/storage/storage_backend_mpath.c | 6 +-- src/storage/storage_backend_rbd.c | 8 ++-- src/storage/storage_backend_scsi.c | 6 +-- src/storage/storage_backend_sheepdog.c | 4 +- src/storage/storage_backend_vstorage.c | 4 +- src/storage/storage_backend_zfs.c | 8 ++-- src/storage/storage_driver.c | 12 ++--- src/storage/storage_file_gluster.c | 10 ++--- src/storage/storage_util.c | 52 +++++++++++----------- 14 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index d4bd526c14..d971530cd8 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -605,14 +605,14 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, /* XXX Only support one extended partition */ switch (virStorageBackendDiskPartTypeToCreate(pool)) { case VIR_STORAGE_VOL_DISK_TYPE_PRIMARY: - virAsprintf(partFormat, "primary %s", partedFormat); + *partFormat = g_strdup_printf("primary %s", partedFormat); break; case VIR_STORAGE_VOL_DISK_TYPE_LOGICAL: /* make sure we have an extended partition */ if (virStoragePoolObjSearchVolume(pool, virStorageVolPartFindExtended, NULL)) { - virAsprintf(partFormat, "logical %s", partedFormat); + *partFormat = g_strdup_printf("logical %s", partedFormat); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no extended partition found and no " diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 0022ed2f21..4a8ee3870d 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -101,7 +101,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) return NULL; ret->volname = g_strdup(name); - virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", trailing_slash ? "" : "/"); + ret->dir = g_strdup_printf("%s%s", dir ? dir : "/", trailing_slash ? "" : "/"); /* FIXME: Currently hard-coded to tcp transport; XML needs to be * extended to allow alternate transport */ @@ -109,7 +109,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) goto error; ret->uri->scheme = g_strdup("gluster"); ret->uri->server = g_strdup(def->source.hosts[0].name); - virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir); + ret->uri->path = g_strdup_printf("/%s%s", ret->volname, ret->dir); ret->uri->port = def->source.hosts[0].port; /* Actually connect to glfs */ @@ -193,10 +193,10 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, vol->name = g_strdup(name); } - virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name); + path = g_strdup_printf("%s%s%s", state->volname, state->dir, vol->name); tmp = state->uri->path; - virAsprintf(&state->uri->path, "/%s", path); + state->uri->path = g_strdup_printf("/%s", path); if (!(vol->target.path = virURIFormat(state->uri))) { VIR_FREE(state->uri->path); state->uri->path = tmp; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index b61abb7cbd..b85c9078f8 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -63,13 +63,13 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) source->hosts[0].port = ISCSI_DEFAULT_TARGET_PORT; if (strchr(source->hosts[0].name, ':')) { - virAsprintf(&portal, "[%s]:%d,1", - source->hosts[0].name, - source->hosts[0].port); + portal = g_strdup_printf("[%s]:%d,1", + source->hosts[0].name, + source->hosts[0].port); } else { - virAsprintf(&portal, "%s:%d,1", - source->hosts[0].name, - source->hosts[0].port); + portal = g_strdup_printf("%s:%d,1", + source->hosts[0].name, + source->hosts[0].port); } return portal; @@ -133,8 +133,8 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, uint32_t host; g_autofree char *sysfs_path = NULL; - virAsprintf(&sysfs_path, "/sys/class/iscsi_session/session%s/device", - session); + sysfs_path = g_strdup_printf("/sys/class/iscsi_session/session%s/device", + session); if (virStorageBackendISCSIGetHostNumber(sysfs_path, &host) < 0) return -1; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index f0b27451f0..2afa617cc1 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -68,17 +68,17 @@ virStorageBackendISCSIDirectPortal(virStoragePoolSourcePtr source) return NULL; } if (source->hosts[0].port == 0) { - virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - ISCSI_DEFAULT_TARGET_PORT); + portal = g_strdup_printf("%s:%d", + source->hosts[0].name, + ISCSI_DEFAULT_TARGET_PORT); } else if (strchr(source->hosts[0].name, ':')) { - virAsprintf(&portal, "[%s]:%d", - source->hosts[0].name, - source->hosts[0].port); + portal = g_strdup_printf("[%s]:%d", + source->hosts[0].name, + source->hosts[0].port); } else { - virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - source->hosts[0].port); + portal = g_strdup_printf("%s:%d", + source->hosts[0].name, + source->hosts[0].port); } return portal; } @@ -230,11 +230,11 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun); - virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun); - virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun); + vol->name = g_strdup_printf("%s%u", VOL_NAME_PREFIX, lun); + vol->key = g_strdup_printf("ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); + vol->target.path = g_strdup_printf("ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); return 0; } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4a5d61e57d..48023abd1a 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -291,7 +291,7 @@ virStorageBackendLogicalMakeVol(char **const groups, } if (vol->target.path == NULL) - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->target.path, vol->name); /* Mark the (s) sparse/snapshot lv, e.g. the lv created using * the --virtualsize/-V option. We've already ignored the (t)hin @@ -313,8 +313,8 @@ virStorageBackendLogicalMakeVol(char **const groups, if (!(vol->target.backingStore = virStorageSourceNew())) goto cleanup; - virAsprintf(&vol->target.backingStore->path, "%s/%s", - def->target.path, groups[1]); + vol->target.backingStore->path = g_strdup_printf("%s/%s", + def->target.path, groups[1]); vol->target.backingStore->format = VIR_STORAGE_POOL_LOGICAL_LVM2; vol->target.backingStore->type = VIR_STORAGE_TYPE_BLOCK; @@ -912,7 +912,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->target.path, vol->name); if (virStorageBackendLogicalLVCreate(vol, def) < 0) return -1; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 6912977657..8843dffc30 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -53,9 +53,9 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; - virAsprintf(&(vol->name), "dm-%u", devnum); + (vol->name) = g_strdup_printf("dm-%u", devnum); - virAsprintf(&vol->target.path, "/dev/%s", dev); + vol->target.path = g_strdup_printf("/dev/%s", dev); if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT, 0) < 0) { @@ -163,7 +163,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, if (is_mpath == 1) { - virAsprintf(&map_device, "mapper/%s", names->name); + map_device = g_strdup_printf("mapper/%s", names->name); if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 491b85e0e0..5cf4acf65f 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -570,10 +570,10 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, vol->target.allocation, info.obj_size, info.num_objs); VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->source.name, vol->name); VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name); ret = 0; @@ -891,10 +891,10 @@ virStorageBackendRBDCreateVol(virStoragePoolObjPtr pool, } VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->source.name, vol->name); VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name); return 0; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 80965bc349..9c0f041616 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -60,7 +60,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) VIR_DEBUG("Triggering rescan of host %d", host); - virAsprintf(&path, "%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFIX, host); + path = g_strdup_printf("%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFIX, host); VIR_DEBUG("Scan trigger path is '%s'", path); @@ -259,7 +259,7 @@ checkParent(const char *name, goto cleanup; } - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name = g_strdup_printf("scsi_%s", name); if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; @@ -373,7 +373,7 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr pool, if (virSCSIHostGetNumber(name, &host) < 0) return -1; - virAsprintf(&path, "%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, host); + path = g_strdup_printf("%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, host); *isActive = virFileExists(path); diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index ff13d2d9bd..853a53115f 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -226,7 +226,7 @@ virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name); VIR_FREE(vol->target.path); vol->target.path = g_strdup(vol->name); @@ -338,7 +338,7 @@ virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key = g_strdup_printf("%s/%s", def->source.name, vol->name); VIR_FREE(vol->target.path); vol->target.path = g_strdup(vol->name); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index 9a34d87ec3..85ab8325ce 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -61,7 +61,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) if (!(usr_name = virGetUserName(def->target.perms.uid))) return -1; - virAsprintf(&mode, "%o", def->target.perms.mode); + mode = g_strdup_printf("%o", def->target.perms.mode); cmd = virCommandNewArgList(VSTORAGE_MOUNT, "-c", def->source.name, @@ -90,7 +90,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) char buf[1024]; g_autofree char *cluster = NULL; - virAsprintf(&cluster, "vstorage://%s", def->source.name); + cluster = g_strdup_printf("vstorage://%s", def->source.name); if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) { virReportSystemError(errno, diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 793eb06f5c..b708c7fd4a 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -87,7 +87,7 @@ virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); g_autofree char *devpath = NULL; - virAsprintf(&devpath, "/dev/zvol/%s", def->source.name); + devpath = g_strdup_printf("/dev/zvol/%s", def->source.name); *isActive = virFileIsDir(devpath); return 0; @@ -137,8 +137,8 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, volume->key = g_strdup(tokens[0]); if (volume->target.path == NULL) { - virAsprintf(&volume->target.path, "%s/%s", def->target.path, - volume->name); + volume->target.path = g_strdup_printf("%s/%s", def->target.path, + volume->name); } if (virStrToLong_ull(tokens[1], NULL, 10, &volume->target.capacity) < 0) { @@ -305,7 +305,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_BLOCK; VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->target.path, vol->name); vol->key = g_strdup(vol->target.path); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index dfe3dd1354..84d76eebd0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -281,9 +281,9 @@ storageStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; - virAsprintf(&driver->configDir, "%s/storage", configdir); - virAsprintf(&driver->autostartDir, "%s/storage/autostart", configdir); - virAsprintf(&driver->stateDir, "%s/storage/run", rundir); + driver->configDir = g_strdup_printf("%s/storage", configdir); + driver->autostartDir = g_strdup_printf("%s/storage/autostart", configdir); + driver->stateDir = g_strdup_printf("%s/storage/run", rundir); } driver->privileged = privileged; @@ -2289,7 +2289,7 @@ virStorageBackendPloopRestoreDesc(char *path) g_autofree char *refresh_tool = NULL; g_autofree char *desc = NULL; - virAsprintf(&desc, "%s/DiskDescriptor.xml", path); + desc = g_strdup_printf("%s/DiskDescriptor.xml", path); if (virFileRemove(desc, 0, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2851,8 +2851,8 @@ virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); char *tmp = NULL; - virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name); + tmp = g_strdup_printf("%s/%s.%s.secret.XXXXXX", + driver->stateDir, def->name, voldef->name); return tmp; } diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_gluster.c index 1577239431..f389a94437 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -311,11 +311,11 @@ virStorageFileBackendGlusterGetUniqueIdentifier(virStorageSourcePtr src) priv))) return NULL; - virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", - src->hosts->name, - src->hosts->port, - src->volume, - filePath); + priv->canonpath = g_strdup_printf("gluster://%s:%u/%s/%s", + src->hosts->name, + src->hosts->port, + src->volume, + filePath); return priv->canonpath; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 88fb8b5223..3427c2e446 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -898,7 +898,7 @@ storageBackendCreateQemuImgSetBacking(virStoragePoolObjPtr pool, * validation. */ if (*(info->backingPath) != '/') - virAsprintf(&absolutePath, "%s/%s", def->target.path, info->backingPath); + absolutePath = g_strdup_printf("%s/%s", def->target.path, info->backingPath); accessRetCode = access(absolutePath ? absolutePath : info->backingPath, R_OK); if (accessRetCode != 0) { @@ -1140,7 +1140,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, _("path to secret data file is required")); goto error; } - virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name); + info.secretAlias = g_strdup_printf("%s_encrypt0", vol->name); if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, info.secretAlias) < 0) goto error; @@ -1153,7 +1153,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, _("path to inputvol secret data file is required")); goto error; } - virAsprintf(&inputSecretAlias, "%s_encrypt0", inputvol->name); + inputSecretAlias = g_strdup_printf("%s_encrypt0", inputvol->name); if (storageBackendCreateQemuImgSecretObject(cmd, inputSecretPath, inputSecretAlias) < 0) goto error; @@ -1678,10 +1678,10 @@ storageBackendIsPloopDir(char *path) g_autofree char *root = NULL; g_autofree char *desc = NULL; - virAsprintf(&root, "%s/root.hds", path); + root = g_strdup_printf("%s/root.hds", path); if (!virFileExists(root)) return false; - virAsprintf(&desc, "%s/DiskDescriptor.xml", path); + desc = g_strdup_printf("%s/DiskDescriptor.xml", path); if (!virFileExists(desc)) return false; @@ -1699,7 +1699,7 @@ storageBackendRedoPloopUpdate(virStorageSourcePtr target, struct stat *sb, { g_autofree char *path = NULL; - virAsprintf(&path, "%s/root.hds", target->path); + path = g_strdup_printf("%s/root.hds", target->path); VIR_FORCE_CLOSE(*fd); if ((*fd = virStorageBackendVolOpen(path, sb, flags)) < 0) return -1; @@ -1949,7 +1949,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, */ retry: while ((direrr = virDirRead(dh, &dent, NULL)) > 0) { - virAsprintf(&stablepath, "%s/%s", def->target.path, dent->d_name); + stablepath = g_strdup_printf("%s/%s", def->target.path, dent->d_name); if (virFileLinkPointsTo(stablepath, devpath)) { VIR_DIR_CLOSE(dh); @@ -2045,7 +2045,7 @@ virStorageBackendVolCreateLocal(virStoragePoolObjPtr pool, } VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->target.path, vol->name); if (virFileExists(vol->target.path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2282,7 +2282,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, storageBackendCreateQemuImgSecretPath(pool, vol))) goto cleanup; - virAsprintf(&secretAlias, "%s_encrypt0", vol->name); + secretAlias = g_strdup_printf("%s_encrypt0", vol->name); } /* Round capacity as qemu-img resize errors out on sizes which are not @@ -2419,7 +2419,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, return -1; } - virAsprintf(&path, "%s/root.hds", vol->target.path); + path = g_strdup_printf("%s/root.hds", vol->target.path); target_path = path; } @@ -2453,7 +2453,7 @@ virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, " will be lost")); return -1; } - virAsprintf(&path, "%s/root.hds", vol->target.path); + path = g_strdup_printf("%s/root.hds", vol->target.path); target_path = path; } @@ -2665,9 +2665,9 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, return -1; } - virAsprintf(&target_path, "%s/root.hds", vol->target.path); + target_path = g_strdup_printf("%s/root.hds", vol->target.path); - virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path); + disk_desc = g_strdup_printf("%s/DiskDescriptor.xml", vol->target.path); if (storageBackendVolWipeLocalFile(target_path, algorithm, vol->target.allocation, false) < 0) @@ -3525,7 +3525,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) vol->name = g_strdup(ent->d_name); vol->type = VIR_STORAGE_VOL_FILE; - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path = g_strdup_printf("%s/%s", def->target.path, vol->name); vol->key = g_strdup(vol->target.path); @@ -3666,9 +3666,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, * in the volume name. We only need uniqueness per-pool, so * just leave 'host' out */ - virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun); + (vol->name) = g_strdup_printf("unit:%u:%u:%u", bus, target, lun); - virAsprintf(&devpath, "/dev/%s", dev); + devpath = g_strdup_printf("/dev/%s", dev); VIR_DEBUG("Trying to create volume for '%s'", devpath); @@ -3728,7 +3728,7 @@ getNewStyleBlockDevice(const char *lun_path, int direrr; g_autofree char *block_path = NULL; - virAsprintf(&block_path, "%s/block", lun_path); + block_path = g_strdup_printf("%s/block", lun_path); VIR_DEBUG("Looking for block device in '%s'", block_path); @@ -3806,8 +3806,8 @@ getBlockDevice(uint32_t host, *block_device = NULL; - virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", host, bus, - target, lun); + lun_path = g_strdup_printf("/sys/bus/scsi/devices/%u:%u:%u:%u", host, bus, + target, lun); if (virDirOpen(&lun_dir, lun_path) < 0) goto cleanup; @@ -3859,8 +3859,8 @@ getDeviceType(uint32_t host, FILE *typefile; g_autofree char *type_path = NULL; - virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, - bus, target, lun); + type_path = g_strdup_printf("/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, + bus, target, lun); typefile = fopen(type_path, "r"); if (typefile == NULL) { @@ -4048,11 +4048,11 @@ virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool) if (def->type == VIR_STORAGE_POOL_NETFS) { if (def->source.format == VIR_STORAGE_POOL_NETFS_CIFS) { - virAsprintf(&src, "//%s/%s", def->source.hosts[0].name, - def->source.dir); + src = g_strdup_printf("//%s/%s", def->source.hosts[0].name, + def->source.dir); } else { - virAsprintf(&src, "%s:%s", def->source.hosts[0].name, - def->source.dir); + src = g_strdup_printf("%s:%s", def->source.hosts[0].name, + def->source.dir); } } else { src = g_strdup(def->source.devices[0].path); @@ -4168,7 +4168,7 @@ virStorageBackendFileSystemMountCmd(const char *cmdstr, g_autofree char *nfsVers = NULL; if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0) - virAsprintf(&nfsVers, "nfsvers=%u", def->source.protocolVer); + nfsVers = g_strdup_printf("nfsvers=%u", def->source.protocolVer); cmd = virCommandNew(cmdstr); if (netauto) -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/test/test_driver.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 96607c04eb..b9ed76c26c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -640,7 +640,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) virDomainNetDefPtr net = NULL; char *ifname; - virAsprintf(&ifname, "testnet%d", ifctr); + ifname = g_strdup_printf("testnet%d", ifctr); /* Generate network interface names */ if (!(net = virDomainNetFindByName(domdef, ifname))) @@ -1075,7 +1075,7 @@ testOpenVolumesForPool(const char *file, g_autoptr(virStorageVolDef) volDef = NULL; /* Find storage volumes */ - virAsprintf(&vol_xpath, "/node/pool[%d]/volume", objidx); + vol_xpath = g_strdup_printf("/node/pool[%d]/volume", objidx); num = virXPathNodeSet(vol_xpath, ctxt, &nodes); if (num < 0) @@ -1091,8 +1091,8 @@ testOpenVolumesForPool(const char *file, return -1; if (!volDef->target.path) { - virAsprintf(&volDef->target.path, "%s/%s", def->target.path, - volDef->name); + volDef->target.path = g_strdup_printf("%s/%s", def->target.path, + volDef->name); } if (!volDef->key) @@ -2043,7 +2043,7 @@ testDomainGetHostname(virDomainPtr domain, if (virDomainObjCheckActive(vm) < 0) goto cleanup; - virAsprintf(&ret, "%shost", domain->name); + ret = g_strdup_printf("%shost", domain->name); cleanup: virDomainObjEndAPI(&vm); @@ -4732,7 +4732,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[0]->mountpoint = g_strdup("/"); info_ret[0]->fstype = g_strdup("ext4"); info_ret[0]->devAlias[0] = g_strdup(name); - virAsprintf(&info_ret[0]->name, "%s1", name); + info_ret[0]->name = g_strdup_printf("%s1", name); if (VIR_ALLOC(info_ret[1]) < 0 || VIR_ALLOC(info_ret[1]->devAlias) < 0) @@ -4741,7 +4741,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[1]->mountpoint = g_strdup("/boot"); info_ret[1]->fstype = g_strdup("ext4"); info_ret[1]->devAlias[0] = g_strdup(name); - virAsprintf(&info_ret[1]->name, "%s2", name); + info_ret[1]->name = g_strdup_printf("%s2", name); info_ret[0]->ndevAlias = info_ret[1]->ndevAlias = 1; @@ -5111,7 +5111,7 @@ testDomainInterfaceAddresses(virDomainPtr dom, } else { iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; iface->addrs[0].prefix = 24; - virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i); + iface->addrs[0].addr = g_strdup_printf("192.168.0.%zu", 1 + i); } @@ -6364,7 +6364,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn G_GNUC_UNUSED, return NULL; } - virAsprintf(&ret, defaultPoolSourcesNetFSXML, source->hosts[0].name); + ret = g_strdup_printf(defaultPoolSourcesNetFSXML, source->hosts[0].name); return ret; default: @@ -7007,8 +7007,8 @@ testStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } - virAsprintf(&privvol->target.path, "%s/%s", def->target.path, - privvol->name); + privvol->target.path = g_strdup_printf("%s/%s", def->target.path, + privvol->name); privvol->key = g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) @@ -7074,8 +7074,8 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, } def->available = (def->capacity - def->allocation); - virAsprintf(&privvol->target.path, "%s/%s", def->target.path, - privvol->name); + privvol->target.path = g_strdup_printf("%s/%s", def->target.path, + privvol->name); privvol->key = g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/viraudit.c | 2 +- src/util/virauth.c | 10 ++--- src/util/virauthconfig.c | 6 +-- src/util/vircgroup.c | 22 +++++------ src/util/vircgroupv1.c | 64 ++++++++++++++++---------------- src/util/vircgroupv2.c | 64 ++++++++++++++++---------------- src/util/virconf.c | 4 +- src/util/virdevmapper.c | 6 +-- src/util/virdnsmasq.c | 30 +++++++-------- src/util/virebtables.c | 2 +- src/util/virerror.c | 2 +- src/util/virfile.c | 26 ++++++------- src/util/virhostcpu.c | 8 ++-- src/util/virhostdev.c | 2 +- src/util/virhostmem.c | 12 +++--- src/util/viriptables.c | 12 +++--- src/util/viriscsi.c | 4 +- src/util/virjson.c | 8 ++-- src/util/virkmod.c | 2 +- src/util/virlockspace.c | 2 +- src/util/virlog.c | 30 +++++++-------- src/util/virmacmap.c | 2 +- src/util/virmdev.c | 8 ++-- src/util/virnetdev.c | 26 ++++++------- src/util/virnetdevbandwidth.c | 46 +++++++++++------------ src/util/virnetdevbridge.c | 12 +++--- src/util/virnetdevip.c | 4 +- src/util/virnetdevmacvlan.c | 4 +- src/util/virnetdevopenvswitch.c | 12 +++--- src/util/virnetdevtap.c | 4 +- src/util/virnetdevveth.c | 6 +-- src/util/virnuma.c | 19 ++++------ src/util/virpci.c | 65 ++++++++++++++++----------------- src/util/virpidfile.c | 6 +-- src/util/virprocess.c | 18 ++++----- src/util/virqemu.c | 4 +- src/util/virrandom.c | 4 +- src/util/virresctrl.c | 14 +++---- src/util/virrotatingfile.c | 8 ++-- src/util/virscsi.c | 22 +++++------ src/util/virscsihost.c | 12 +++--- src/util/virscsivhost.c | 2 +- src/util/virsocketaddr.c | 12 +++--- src/util/virstoragefile.c | 10 ++--- src/util/virstring.c | 2 +- src/util/virsystemd.c | 2 +- src/util/virtpm.c | 4 +- src/util/virtypedparam.c | 12 +++--- src/util/viruri.c | 2 +- src/util/virusb.c | 10 ++--- src/util/virutil.c | 16 ++++---- src/util/virvhba.c | 36 +++++++++--------- 52 files changed, 359 insertions(+), 363 deletions(-) diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 9d423e8f53..8a0ef6f72c 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -158,7 +158,7 @@ char *virAuditEncode(const char *key, const char *value) return audit_encode_nv_string(key, value, 0); #else char *str; - virAsprintf(&str, "%s=%s", key, value); + str = g_strdup_printf("%s=%s", key, value); return str; #endif } diff --git a/src/util/virauth.c b/src/util/virauth.c index 9ff639ffa8..55208c01ef 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -69,7 +69,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (!(userdir = virGetUserConfigDirectory())) return -1; - virAsprintf(path, "%s/auth.conf", userdir); + *path = g_strdup_printf("%s/auth.conf", userdir); VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) @@ -157,10 +157,10 @@ virAuthGetUsernamePath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); if (defaultUsername != NULL) { - virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, - defaultUsername); + prompt = g_strdup_printf(_("Enter username for %s [%s]"), hostname, + defaultUsername); } else { - virAsprintf(&prompt, _("Enter username for %s"), hostname); + prompt = g_strdup_printf(_("Enter username for %s"), hostname); } for (ncred = 0; ncred < auth->ncredtype; ncred++) { @@ -237,7 +237,7 @@ virAuthGetPasswordPath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); - virAsprintf(&prompt, _("Enter %s's password for %s"), username, hostname); + prompt = g_strdup_printf(_("Enter %s's password for %s"), username, hostname); for (ncred = 0; ncred < auth->ncredtype; ncred++) { if (auth->credtype[ncred] != VIR_CRED_PASSPHRASE && diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index b7263ebccb..fd846ddd4b 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -113,11 +113,11 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!hostname) hostname = "localhost"; - virAsprintf(&authgroup, "auth-%s-%s", service, hostname); + authgroup = g_strdup_printf("auth-%s-%s", service, hostname); if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - virAsprintf(&authgroup, "auth-%s-%s", service, "default"); + authgroup = g_strdup_printf("auth-%s-%s", service, "default"); } if (!virKeyFileHasGroup(auth->keyfile, authgroup)) @@ -130,7 +130,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth, return -1; } - virAsprintf(&credgroup, "credentials-%s", authcred); + credgroup = g_strdup_printf("credentials-%s", authcred); if (!virKeyFileHasGroup(auth->keyfile, credgroup)) { virReportError(VIR_ERR_CONF_SYNTAX, diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8545cd3049..d5288ecfc5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -206,7 +206,7 @@ virCgroupPartitionEscape(char **path) if ((rc = virCgroupPartitionNeedsEscaping(*path)) <= 0) return rc; - virAsprintf(&newstr, "_%s", *path); + newstr = g_strdup_printf("_%s", *path); VIR_FREE(*path); *path = newstr; @@ -290,7 +290,7 @@ virCgroupDetectPlacement(virCgroupPtr group, if (pid == -1) { procfile = g_strdup("/proc/self/cgroup"); } else { - virAsprintf(&procfile, "/proc/%lld/cgroup", (long long)pid); + procfile = g_strdup_printf("/proc/%lld/cgroup", (long long)pid); } mapping = fopen(procfile, "r"); @@ -443,7 +443,7 @@ virCgroupGetBlockDevString(const char *path) /* Automatically append space after the string since all callers * use it anyway */ - virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); + ret = g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); return ret; } @@ -559,7 +559,7 @@ virCgroupSetValueU64(virCgroupPtr group, { g_autofree char *strval = NULL; - virAsprintf(&strval, "%llu", value); + strval = g_strdup_printf("%llu", value); return virCgroupSetValueStr(group, controller, key, strval); } @@ -573,7 +573,7 @@ virCgroupSetValueI64(virCgroupPtr group, { g_autofree char *strval = NULL; - virAsprintf(&strval, "%lld", value); + strval = g_strdup_printf("%lld", value); return virCgroupSetValueStr(group, controller, key, strval); } @@ -676,8 +676,8 @@ virCgroupNew(pid_t pid, if (path[0] == '/' || !parent) { (*group)->path = g_strdup(path); } else { - virAsprintf(&(*group)->path, "%s%s%s", parent->path, - STREQ(parent->path, "") ? "" : "/", path); + (*group)->path = g_strdup_printf("%s%s%s", parent->path, + STREQ(parent->path, "") ? "" : "/", path); } if (virCgroupDetect(*group, pid, controllers, path, parent) < 0) @@ -909,7 +909,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, { g_autofree char *grpname = NULL; - virAsprintf(&grpname, "%s.libvirt-%s", name, driver); + grpname = g_strdup_printf("%s.libvirt-%s", name, driver); if (virCgroupPartitionEscape(&grpname) < 0) return -1; @@ -960,13 +960,13 @@ virCgroupNewThread(virCgroupPtr domain, switch (nameval) { case VIR_CGROUP_THREAD_VCPU: - virAsprintf(&name, "vcpu%d", id); + name = g_strdup_printf("vcpu%d", id); break; case VIR_CGROUP_THREAD_EMULATOR: name = g_strdup("emulator"); break; case VIR_CGROUP_THREAD_IOTHREAD: - virAsprintf(&name, "iothread%d", id); + name = g_strdup_printf("iothread%d", id); break; case VIR_CGROUP_THREAD_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2343,7 +2343,7 @@ virCgroupRemoveRecursively(char *grppath) if (ent->d_type != DT_DIR) continue; - virAsprintf(&path, "%s/%s", grppath, ent->d_name); + path = g_strdup_printf("%s/%s", grppath, ent->d_name); rc = virCgroupRemoveRecursively(path); if (rc != 0) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index d04fa521fc..334e6697df 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -97,13 +97,13 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename_new = NULL; g_autofree char *partmachinename = NULL; - virAsprintf(&partname, "%s.libvirt-%s", name, drivername); + partname = g_strdup_printf("%s.libvirt-%s", name, drivername); if (virCgroupPartitionEscape(&partname) < 0) return false; - virAsprintf(&partmachinename, "%s.libvirt-%s", - machinename, drivername); + partmachinename = g_strdup_printf("%s.libvirt-%s", + machinename, drivername); if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -203,10 +203,10 @@ virCgroupV1CopyPlacement(virCgroupPtr group, * parent == "/libvirt.service" + path == "" => "/libvirt.service" * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo" */ - virAsprintf(&group->legacy[i].placement, "%s%s%s", - parent->legacy[i].placement, - (STREQ(parent->legacy[i].placement, "/") || STREQ(path, "") ? "" : "/"), - path); + group->legacy[i].placement = g_strdup_printf("%s%s%s", + parent->legacy[i].placement, + (STREQ(parent->legacy[i].placement, "/") || STREQ(path, "") ? "" : "/"), + path); } } @@ -237,7 +237,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, return 0; *dirName = '\0'; - virAsprintf(&linkSrc, "%s/%s", tmp, typeStr); + linkSrc = g_strdup_printf("%s/%s", tmp, typeStr); *dirName = '/'; if (lstat(linkSrc, &sb) < 0) { @@ -349,9 +349,9 @@ virCgroupV1DetectPlacement(virCgroupPtr group, if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) { group->legacy[i].placement = g_strdup(selfpath); } else { - virAsprintf(&group->legacy[i].placement, "%s%s%s", selfpath, - (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), - path); + group->legacy[i].placement = g_strdup_printf("%s%s%s", selfpath, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), + path); } } } @@ -516,8 +516,8 @@ virCgroupV1PathOfController(virCgroupPtr group, return -1; } - virAsprintf(path, "%s%s/%s", group->legacy[controller].mountPoint, - group->legacy[controller].placement, NULLSTR_EMPTY(key)); + *path = g_strdup_printf("%s%s/%s", group->legacy[controller].mountPoint, + group->legacy[controller].placement, NULLSTR_EMPTY(key)); return 0; } @@ -806,7 +806,7 @@ virCgroupV1BindMount(virCgroupPtr group, return -1; } - virAsprintf(&opts, "mode=755,size=65536%s", mountopts); + opts = g_strdup_printf("mode=755,size=65536%s", mountopts); if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) { virReportSystemError(errno, @@ -821,7 +821,7 @@ virCgroupV1BindMount(virCgroupPtr group, if (!virFileExists(group->legacy[i].mountPoint)) { g_autofree char *src = NULL; - virAsprintf(&src, "%s%s", oldroot, group->legacy[i].mountPoint); + src = g_strdup_printf("%s%s", oldroot, group->legacy[i].mountPoint); VIR_DEBUG("Create mount point '%s'", group->legacy[i].mountPoint); @@ -881,8 +881,8 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, if (!cgroup->legacy[i].mountPoint) continue; - virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, - cgroup->legacy[i].placement); + base = g_strdup_printf("%s%s", cgroup->legacy[i].mountPoint, + cgroup->legacy[i].placement); if (virDirOpen(&dh, base) < 0) goto cleanup; @@ -890,7 +890,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, while ((direrr = virDirRead(dh, &de, base)) > 0) { g_autofree char *entry = NULL; - virAsprintf(&entry, "%s/%s", base, de->d_name); + entry = g_strdup_printf("%s/%s", base, de->d_name); if (chown(entry, uid, gid) < 0) { virReportSystemError(errno, @@ -947,7 +947,7 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, return -1; } - virAsprintf(&value, "%u", weight); + value = g_strdup_printf("%u", weight); return virCgroupSetValueRaw(path, value); } @@ -1189,7 +1189,7 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; - virAsprintf(&str, "%s%d", blkstr, weight); + str = g_strdup_printf("%s%d", blkstr, weight); if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", &path) < 0) { @@ -1256,7 +1256,7 @@ virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - virAsprintf(&str, "%s%u", blkstr, riops); + str = g_strdup_printf("%s%u", blkstr, riops); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1307,7 +1307,7 @@ virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - virAsprintf(&str, "%s%u", blkstr, wiops); + str = g_strdup_printf("%s%u", blkstr, wiops); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1358,7 +1358,7 @@ virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - virAsprintf(&str, "%s%llu", blkstr, rbps); + str = g_strdup_printf("%s%llu", blkstr, rbps); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1409,7 +1409,7 @@ virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(path))) return -1; - virAsprintf(&str, "%s%llu", blkstr, wbps); + str = g_strdup_printf("%s%llu", blkstr, wbps); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1761,15 +1761,15 @@ virCgroupV1AllowDevice(virCgroupPtr group, if (major < 0) majorstr = g_strdup("*"); else - virAsprintf(&majorstr, "%i", major); + majorstr = g_strdup_printf("%i", major); if (minor < 0) minorstr = g_strdup("*"); else - virAsprintf(&minorstr, "%i", minor); + minorstr = g_strdup_printf("%i", minor); - virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)); + devstr = g_strdup_printf("%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, @@ -1795,15 +1795,15 @@ virCgroupV1DenyDevice(virCgroupPtr group, if (major < 0) majorstr = g_strdup("*"); else - virAsprintf(&majorstr, "%i", major); + majorstr = g_strdup_printf("%i", major); if (minor < 0) minorstr = g_strdup("*"); else - virAsprintf(&minorstr, "%i", minor); + minorstr = g_strdup_printf("%i", minor); - virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)); + devstr = g_strdup_printf("%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index f0ce4a48bc..d3374b6094 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -75,7 +75,7 @@ virCgroupV2Available(void) /* Systemd uses cgroup v2 for process tracking but no controller is * available. We should consider this configuration as cgroup v2 is * not available. */ - virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir); + contFile = g_strdup_printf("%s/cgroup.controllers", entry.mnt_dir); if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0) goto cleanup; @@ -103,7 +103,7 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename = NULL; char *tmp; - virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, drivername); + partmachinename = g_strdup_printf("%s.libvirt-%s", machinename, drivername); if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -162,10 +162,10 @@ virCgroupV2CopyPlacement(virCgroupPtr group, * parent == "/libvirt.service" + path == "" => "/libvirt.service" * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo" */ - virAsprintf(&group->unified.placement, "%s%s%s", - parent->unified.placement, - (STREQ(parent->unified.placement, "/") || STREQ(path, "") ? "" : "/"), - path); + group->unified.placement = g_strdup_printf("%s%s%s", + parent->unified.placement, + (STREQ(parent->unified.placement, "/") || STREQ(path, "") ? "" : "/"), + path); } return 0; @@ -209,8 +209,8 @@ virCgroupV2DetectPlacement(virCgroupPtr group, * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service" * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo" */ - virAsprintf(&group->unified.placement, "%s%s%s", selfpath, - (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path); + group->unified.placement = g_strdup_printf("%s%s%s", selfpath, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path); return 0; } @@ -252,13 +252,13 @@ virCgroupV2ParseControllersFile(virCgroupPtr group, char **tmp; if (parent) { - virAsprintf(&contFile, "%s%s/cgroup.subtree_control", - parent->unified.mountPoint, - NULLSTR_EMPTY(parent->unified.placement)); + contFile = g_strdup_printf("%s%s/cgroup.subtree_control", + parent->unified.mountPoint, + NULLSTR_EMPTY(parent->unified.placement)); } else { - virAsprintf(&contFile, "%s%s/cgroup.controllers", - group->unified.mountPoint, - NULLSTR_EMPTY(group->unified.placement)); + contFile = g_strdup_printf("%s%s/cgroup.controllers", + group->unified.mountPoint, + NULLSTR_EMPTY(group->unified.placement)); } rc = virFileReadAll(contFile, 1024 * 1024, &contStr); @@ -345,8 +345,8 @@ virCgroupV2PathOfController(virCgroupPtr group, return -1; } - virAsprintf(path, "%s%s/%s", group->unified.mountPoint, - group->unified.placement, NULLSTR_EMPTY(key)); + *path = g_strdup_printf("%s%s/%s", group->unified.mountPoint, + group->unified.placement, NULLSTR_EMPTY(key)); return 0; } @@ -368,7 +368,7 @@ virCgroupV2EnableController(virCgroupPtr group, g_autofree char *val = NULL; g_autofree char *path = NULL; - virAsprintf(&val, "+%s", virCgroupV2ControllerTypeToString(controller)); + val = g_strdup_printf("+%s", virCgroupV2ControllerTypeToString(controller)); if (virCgroupPathOfController(parent, controller, "cgroup.subtree_control", &path) < 0) { @@ -550,9 +550,9 @@ virCgroupV2BindMount(virCgroupPtr group, return -1; } - virAsprintf(&opts, "mode=755,size=65536%s", mountopts); + opts = g_strdup_printf("mode=755,size=65536%s", mountopts); - virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint); + src = g_strdup_printf("%s%s", oldroot, group->unified.mountPoint); if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) { virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"), @@ -572,8 +572,8 @@ virCgroupV2SetOwner(virCgroupPtr cgroup, { g_autofree char *base = NULL; - virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, - cgroup->unified.placement); + base = g_strdup_printf("%s%s", cgroup->unified.mountPoint, + cgroup->unified.placement); if (virFileChownFiles(base, uid, gid) < 0) return -1; @@ -617,7 +617,7 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, return -1; } - virAsprintf(&value, format, weight); + value = g_strdup_printf(format, weight); return virCgroupSetValueRaw(path, value); } @@ -810,7 +810,7 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr = virCgroupGetBlockDevString(devPath))) return -1; - virAsprintf(&str, "%s%d", blkstr, weight); + str = g_strdup_printf("%s%d", blkstr, weight); if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -879,9 +879,9 @@ virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group, return -1; if (riops == 0) { - virAsprintf(&str, "%sriops=max", blkstr); + str = g_strdup_printf("%sriops=max", blkstr); } else { - virAsprintf(&str, "%sriops=%u", blkstr, riops); + str = g_strdup_printf("%sriops=%u", blkstr, riops); } return virCgroupSetValueStr(group, @@ -948,9 +948,9 @@ virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group, return -1; if (wiops == 0) { - virAsprintf(&str, "%swiops=max", blkstr); + str = g_strdup_printf("%swiops=max", blkstr); } else { - virAsprintf(&str, "%swiops=%u", blkstr, wiops); + str = g_strdup_printf("%swiops=%u", blkstr, wiops); } return virCgroupSetValueStr(group, @@ -1017,9 +1017,9 @@ virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group, return -1; if (rbps == 0) { - virAsprintf(&str, "%srbps=max", blkstr); + str = g_strdup_printf("%srbps=max", blkstr); } else { - virAsprintf(&str, "%srbps=%llu", blkstr, rbps); + str = g_strdup_printf("%srbps=%llu", blkstr, rbps); } return virCgroupSetValueStr(group, @@ -1086,9 +1086,9 @@ virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group, return -1; if (wbps == 0) { - virAsprintf(&str, "%swbps=max", blkstr); + str = g_strdup_printf("%swbps=max", blkstr); } else { - virAsprintf(&str, "%swbps=%llu", blkstr, wbps); + str = g_strdup_printf("%swbps=%llu", blkstr, wbps); } return virCgroupSetValueStr(group, @@ -1488,7 +1488,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, } *tmp = '\0'; - virAsprintf(&value, "%s %llu", str, cfs_period); + value = g_strdup_printf("%s %llu", str, cfs_period); return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", value); diff --git a/src/util/virconf.c b/src/util/virconf.c index d4071d1945..6238b28dd9 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1520,13 +1520,13 @@ virConfLoadConfigPath(const char *name) { char *path; if (geteuid() == 0) { - virAsprintf(&path, "%s/libvirt/%s", SYSCONFDIR, name); + path = g_strdup_printf("%s/libvirt/%s", SYSCONFDIR, name); } else { char *userdir = virGetUserConfigDirectory(); if (!userdir) return NULL; - virAsprintf(&path, "%s/%s", userdir, name); + path = g_strdup_printf("%s/%s", userdir, name); VIR_FREE(userdir); } diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 4f29f74c77..cc6a099faa 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,9 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; for (i = 0; i < deps->count; i++) { - virAsprintf(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])); + devPaths[i] = g_strdup_printf("/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } recursiveDevPaths = NULL; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index a93c851f7d..12c51875b2 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -180,7 +180,7 @@ addnhostsWrite(const char *path, * for runtime addition. */ - virAsprintf(&tmp, "%s.new", path); + tmp = g_strdup_printf("%s.new", path); if (!(f = fopen(tmp, "w"))) { istmp = false; @@ -311,24 +311,24 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, /* the first test determines if it is a dhcpv6 host */ if (ipv6) { if (name && id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,%s,[%s]", id, name, ipstr); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf( + "id:%s,%s,[%s]", id, name, ipstr); } else if (name && !id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,[%s]", - name, ipstr); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf("%s,[%s]", + name, ipstr); } else if (!name && id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,[%s]", id, ipstr); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf( + "id:%s,[%s]", id, ipstr); } } else if (name && mac) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", - mac, ipstr, name); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf("%s,%s,%s", + mac, ipstr, name); } else if (name && !mac) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", name, - ipstr); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf("%s,%s", name, + ipstr); } else { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", mac, - ipstr); + hostsfile->hosts[hostsfile->nhosts].host = g_strdup_printf("%s,%s", mac, + ipstr); } VIR_FREE(ipstr); @@ -386,7 +386,7 @@ hostsfileWrite(const char *path, * for runtime addition. */ - virAsprintf(&tmp, "%s.new", path); + tmp = g_strdup_printf("%s.new", path); if (!(f = fopen(tmp, "w"))) { istmp = false; @@ -750,7 +750,7 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) if (virCommandRun(cmd, NULL) < 0) goto cleanup; - virAsprintf(&complete, "%s\n%s", version, help); + complete = g_strdup_printf("%s\n%s", version, help); ret = dnsmasqCapsSetFromBuffer(caps, complete); diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 9f4ba9013e..14a922834a 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -58,7 +58,7 @@ ebtablesContextNew(const char *driver) if (VIR_ALLOC(ctx) < 0) return NULL; - virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver); + ctx->chain = g_strdup_printf("libvirt_%s_FORWARD", driver); return ctx; } diff --git a/src/util/virerror.c b/src/util/virerror.c index ee0ec1cffc..76a75e27a8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,7 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; - virAsprintf(&newmsg, "%s: %s", fmtmsg, err->message); + newmsg = g_strdup_printf("%s: %s", fmtmsg, err->message); VIR_FREE(err->message); err->message = g_steal_pointer(&newmsg); diff --git a/src/util/virfile.c b/src/util/virfile.c index 0636fb8f08..042847137d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -508,7 +508,7 @@ virFileRewrite(const char *path, int fd = -1; int ret = -1; - virAsprintf(&newfile, "%s.new", path); + newfile = g_strdup_printf("%s.new", path); if ((fd = open(newfile, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) { virReportSystemError(errno, _("cannot create file '%s'"), @@ -665,7 +665,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) VIR_DEBUG("Found free loop device number %i", devnr); - virAsprintf(&looppath, "/dev/loop%i", devnr); + looppath = g_strdup_printf("/dev/loop%i", devnr); if ((*fd = open(looppath, O_RDWR)) < 0) { virReportSystemError(errno, @@ -701,7 +701,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) !c_isdigit(de->d_name[4])) continue; - virAsprintf(&looppath, "/dev/%s", de->d_name); + looppath = g_strdup_printf("/dev/%s", de->d_name); VIR_DEBUG("Checking up on device %s", looppath); if ((fd = open(looppath, O_RDWR)) < 0) { @@ -831,7 +831,7 @@ virFileNBDDeviceIsBusy(const char *dev_name) { g_autofree char *path = NULL; - virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", dev_name); + path = g_strdup_printf(SYSFS_BLOCK_DIR "/%s/pid", dev_name); if (!virFileExists(path)) { if (errno == ENOENT) @@ -863,7 +863,7 @@ virFileNBDDeviceFindUnused(void) if (rv < 0) goto cleanup; if (rv == 0) { - virAsprintf(&ret, "/dev/%s", de->d_name); + ret = g_strdup_printf("/dev/%s", de->d_name); goto cleanup; } } @@ -1008,7 +1008,7 @@ int virFileDeleteTree(const char *dir) g_autofree char *filepath = NULL; struct stat sb; - virAsprintf(&filepath, "%s/%s", dir, de->d_name); + filepath = g_strdup_printf("%s/%s", dir, de->d_name); if (lstat(filepath, &sb) < 0) { virReportSystemError(errno, _("Cannot access '%s'"), @@ -1549,7 +1549,7 @@ virFileRelLinkPointsTo(const char *directory, checkLink); return -1; } - virAsprintf(&candidate, "%s/%s", directory, checkLink); + candidate = g_strdup_printf("%s/%s", directory, checkLink); return virFileLinkPointsTo(candidate, checkDest); } @@ -1685,7 +1685,7 @@ virFindFileInPath(const char *file) */ pathiter = path; while ((pathseg = strsep(&pathiter, ":")) != NULL) { - virAsprintf(&fullpath, "%s/%s", pathseg, file); + fullpath = g_strdup_printf("%s/%s", pathseg, file); if (virFileIsExecutable(fullpath)) break; VIR_FREE(fullpath); @@ -1749,7 +1749,7 @@ virFileFindResourceFull(const char *filename, else path = installdir; - virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix); + ret = g_strdup_printf("%s/%s%s%s", path, prefix, filename, suffix); VIR_DEBUG("Resolved '%s' to '%s'", filename, ret); return ret; @@ -2976,7 +2976,7 @@ int virFileChownFiles(const char *name, while ((direrr = virDirRead(dir, &ent, name)) > 0) { g_autofree char *path = NULL; - virAsprintf(&path, "%s/%s", name, ent->d_name); + path = g_strdup_printf("%s/%s", name, ent->d_name); if (!virFileIsRegular(path)) continue; @@ -3093,9 +3093,9 @@ virFileBuildPath(const char *dir, const char *name, const char *ext) char *path; if (ext == NULL) { - virAsprintf(&path, "%s/%s", dir, name); + path = g_strdup_printf("%s/%s", dir, name); } else { - virAsprintf(&path, "%s/%s%s", dir, name, ext); + path = g_strdup_printf("%s/%s%s", dir, name, ext); } return path; @@ -3283,7 +3283,7 @@ virFileAbsPath(const char *path, char **abspath) if (buf == NULL) return -1; - virAsprintf(abspath, "%s/%s", buf, path); + *abspath = g_strdup_printf("%s/%s", buf, path); } return 0; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 26b2fdc17f..90543dcb00 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -627,7 +627,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the * core, node, socket, thread and topology information from /sys */ - virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH); + sysfs_nodedir = g_strdup_printf("%s/node", SYSFS_SYSTEM_PATH); if (virDirOpenQuiet(&nodedir, sysfs_nodedir) < 0) { /* the host isn't probably running a NUMA architecture */ @@ -670,8 +670,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, (*nodes)++; - virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, - nodedirent->d_name); + sysfs_cpudir = g_strdup_printf("%s/node/%s", SYSFS_SYSTEM_PATH, + nodedirent->d_name); if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, @@ -704,7 +704,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, fallback: VIR_FREE(sysfs_cpudir); - virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH); + sysfs_cpudir = g_strdup_printf("%s/cpu", SYSFS_SYSTEM_PATH); if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index ab40c5faaa..ee05bc248c 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -184,7 +184,7 @@ virHostdevManagerNew(void) if (!(rundir = virGetUserRuntimeDirectory())) return NULL; - virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir); + hostdevMgr->stateDir = g_strdup_printf("%s/hostdevmgr", rundir); old_umask = umask(077); diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 0d57d47529..61bca450e6 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -280,8 +280,8 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, return -1; } - virAsprintf(&meminfo_path, - SYSFS_SYSTEM_PATH "/node/node%d/meminfo", cellNum); + meminfo_path = g_strdup_printf( + SYSFS_SYSTEM_PATH "/node/node%d/meminfo", cellNum); } meminfo = fopen(meminfo_path, "r"); @@ -316,9 +316,9 @@ virHostMemSetParameterValue(virTypedParameterPtr param) char *field = strchr(param->field, '_'); sa_assert(field); field++; - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path = g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); - virAsprintf(&strval, "%u", param->value.ui); + strval = g_strdup_printf("%u", param->value.ui); if ((rc = virFileWriteStr(path, strval, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), param->field); @@ -341,7 +341,7 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params, char *field = strchr(param->field, '_'); sa_assert(field); field++; - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path = g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -405,7 +405,7 @@ virHostMemGetParameterValue(const char *field, char *tmp = NULL; int rc = -1; - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path = g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); if (!virFileExists(path)) return -2; diff --git a/src/util/viriptables.c b/src/util/viriptables.c index c8c4d98f30..b7cce40d37 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -401,7 +401,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netaddr, if (!netstr) return NULL; - virAsprintf(&ret, "%s/%d", netstr, prefix); + ret = g_strdup_printf("%s/%d", netstr, prefix); return ret; } @@ -905,7 +905,7 @@ iptablesForwardMasquerade(virFirewallPtr fw, } if (port->start < port->end && port->end < 65536) { - virAsprintf(&portRangeStr, ":%u-%u", port->start, port->end); + portRangeStr = g_strdup_printf(":%u-%u", port->start, port->end); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid port range '%u-%u'."), @@ -917,11 +917,11 @@ iptablesForwardMasquerade(virFirewallPtr fw, /* Use --jump SNAT if public addr is specified */ if (addrStartStr && addrStartStr[0]) { if (addrEndStr && addrEndStr[0]) { - virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, - portRangeStr ? portRangeStr : ""); + natRangeStr = g_strdup_printf("%s-%s%s", addrStartStr, addrEndStr, + portRangeStr ? portRangeStr : ""); } else { - virAsprintf(&natRangeStr, "%s%s", addrStartStr, - portRangeStr ? portRangeStr : ""); + natRangeStr = g_strdup_printf("%s%s", addrStartStr, + portRangeStr ? portRangeStr : ""); } virFirewallRuleAddArgList(fw, rule, diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 55a30470d6..9f4c8f4e03 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -213,8 +213,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, g_autofree char *temp_ifacename = NULL; g_autoptr(virCommand) cmd = NULL; - virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", - (unsigned long long)virRandomBits(32)); + temp_ifacename = g_strdup_printf("libvirt-iface-%08llx", + (unsigned long long)virRandomBits(32)); VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", temp_ifacename, initiatoriqn); diff --git a/src/util/virjson.c b/src/util/virjson.c index ec8d706edd..7ab8f4b52a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -497,7 +497,7 @@ virJSONValuePtr virJSONValueNewNumberInt(int data) { g_autofree char *str = NULL; - virAsprintf(&str, "%i", data); + str = g_strdup_printf("%i", data); return virJSONValueNewNumber(str); } @@ -506,7 +506,7 @@ virJSONValuePtr virJSONValueNewNumberUint(unsigned int data) { g_autofree char *str = NULL; - virAsprintf(&str, "%u", data); + str = g_strdup_printf("%u", data); return virJSONValueNewNumber(str); } @@ -515,7 +515,7 @@ virJSONValuePtr virJSONValueNewNumberLong(long long data) { g_autofree char *str = NULL; - virAsprintf(&str, "%lld", data); + str = g_strdup_printf("%lld", data); return virJSONValueNewNumber(str); } @@ -524,7 +524,7 @@ virJSONValuePtr virJSONValueNewNumberUlong(unsigned long long data) { g_autofree char *str = NULL; - virAsprintf(&str, "%llu", data); + str = g_strdup_printf("%llu", data); return virJSONValueNewNumber(str); } diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 12e6e5676c..12cb5920e8 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,7 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst = NULL; g_autofree char *outbuf = NULL; - virAsprintf(&drvblklst, "blacklist %s\n", module); + drvblklst = g_strdup_printf("blacklist %s\n", module); /* modprobe will convert all '-' into '_', so we need to as well */ for (i = 0; i < drvblklst[i]; i++) diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 30868035a9..b7e1b6cfda 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -67,7 +67,7 @@ static char *virLockSpaceGetResourcePath(virLockSpacePtr lockspace, { char *ret; if (lockspace->dir) - virAsprintf(&ret, "%s/%s", lockspace->dir, resname); + ret = g_strdup_printf("%s/%s", lockspace->dir, resname); else ret = g_strdup(resname); return ret; diff --git a/src/util/virlog.c b/src/util/virlog.c index 880539e5c0..e7d62e3948 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -152,8 +152,8 @@ virLogUnlock(void) static void virLogSetDefaultOutputToStderr(void) { - virAsprintf(&virLogDefaultOutput, "%d:stderr", - virLogDefaultPriority); + virLogDefaultOutput = g_strdup_printf("%d:stderr", + virLogDefaultPriority); } @@ -167,7 +167,7 @@ virLogSetDefaultOutputToJournald(void) if (priority == VIR_LOG_DEBUG) priority = VIR_LOG_INFO; - virAsprintf(&virLogDefaultOutput, "%d:journald", priority); + virLogDefaultOutput = g_strdup_printf("%d:journald", priority); } @@ -179,8 +179,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) mode_t old_umask; if (privileged) { - virAsprintf(&virLogDefaultOutput, "%d:file:%s/log/libvirt/%s.log", - virLogDefaultPriority, LOCALSTATEDIR, binary); + virLogDefaultOutput = g_strdup_printf("%d:file:%s/log/libvirt/%s.log", + virLogDefaultPriority, LOCALSTATEDIR, binary); } else { if (!(logdir = virGetUserCacheDirectory())) goto cleanup; @@ -192,8 +192,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) } umask(old_umask); - virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", - virLogDefaultPriority, logdir, binary); + virLogDefaultOutput = g_strdup_printf("%d:file:%s/%s.log", + virLogDefaultPriority, logdir, binary); } ret = 0; @@ -453,13 +453,13 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname != NULL)) { - virAsprintf(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - funcname, linenr, str); + *msg = g_strdup_printf("%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + funcname, linenr, str); } else { - virAsprintf(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - str); + *msg = g_strdup_printf("%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + str); } } @@ -481,7 +481,7 @@ virLogHostnameString(char **rawmsg, { char *hoststr; - virAsprintf(&hoststr, "hostname: %s", virLogHostname); + hoststr = g_strdup_printf("hostname: %s", virLogHostname); virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg = hoststr; @@ -689,7 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; - virAsprintf(&msg, "%s: %s", timestamp, str); + msg = g_strdup_printf("%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index c515e3e7b0..b38ae8ac43 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -290,7 +290,7 @@ virMacMapFileName(const char *dnsmasqStateDir, { char *filename; - virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge); + filename = g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); return filename; } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c5fd4ad42f..545069cfaa 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -80,7 +80,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev, g_autofree char *file = NULL; char *tmp = NULL; - virAsprintf(&file, "%s/mdev_type/device_api", dev->path); + file = g_strdup_printf("%s/mdev_type/device_api", dev->path); /* TODO - make this a generic method to access sysfs files for various * kinds of devices @@ -217,7 +217,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) if (!dev_path) return NULL; - virAsprintf(&iommu_path, "%s/iommu_group", dev_path); + iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path); @@ -229,7 +229,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) return NULL; } - virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path)); + vfio_path = g_strdup_printf("/dev/vfio/%s", last_component(result_path)); return vfio_path; } @@ -425,7 +425,7 @@ virMediatedDeviceGetSysfsPath(const char *uuidstr) { char *ret = NULL; - virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr); + ret = g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); return ret; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 20f7ef5428..9b2741bc28 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -511,7 +511,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pidInNs) char *phy_path = NULL; int len; - virAsprintf(&pid, "%lld", (long long) pidInNs); + pid = g_strdup_printf("%lld", (long long) pidInNs); /* The 802.11 wireless devices only move together with their PHY. */ if (virNetDevSysfsFile(&phy_path, ifname, "phy80211/name") < 0) @@ -1068,7 +1068,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file); + *pf_sysfs_device_link = g_strdup_printf(SYSFS_NET_DIR "%s/%s", ifname, file); return 0; } @@ -1076,8 +1076,8 @@ static int virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname, - file); + *pf_sysfs_device_link = g_strdup_printf(SYSFS_NET_DIR "%s/device/%s", ifname, + file); return 0; } @@ -1099,7 +1099,7 @@ virNetDevIsPCIDevice(const char *devpath) char *subsys = NULL; bool ret = false; - virAsprintf(&subsys_link, "%s/subsystem", devpath); + subsys_link = g_strdup_printf("%s/subsystem", devpath); if (!virFileExists(subsys_link)) goto cleanup; @@ -1400,7 +1400,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname) if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) goto cleanup; - virAsprintf(&virtfnName, "virtfn%d", vf); + virtfnName = g_strdup_printf("virtfn%d", vf); /* this provides the path to the VF's directory in sysfs, * e.g. "/sys/class/net/enp2s0f0/virtfn3" @@ -1888,7 +1888,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, */ if (pfDevName && saveVlan) { - virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); + filePath = g_strdup_printf("%s/%s_vf%d", stateDir, pfDevName, vf); /* get admin MAC and vlan tag */ if (virNetDevGetVfConfig(pfDevName, vf, &oldMAC, &oldVlanTag) < 0) @@ -1904,7 +1904,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, } } else { - virAsprintf(&filePath, "%s/%s", stateDir, linkdev); + filePath = g_strdup_printf("%s/%s", stateDir, linkdev); } if (linkdev) { @@ -2009,7 +2009,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, */ if (pfDevName) { - virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); + filePath = g_strdup_printf("%s/%s_vf%d", stateDir, pfDevName, vf); if (linkdev && !virFileExists(filePath)) { /* the device may have been stored in a file named for the @@ -2023,7 +2023,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } if (!pfDevName) - virAsprintf(&filePath, "%s/%s", stateDir, linkdev); + filePath = g_strdup_printf("%s/%s", stateDir, linkdev); if (!virFileExists(filePath)) { /* having no file to read is not necessarily an error, so we @@ -2903,7 +2903,7 @@ virNetDevRDMAFeature(const char *ifname, if (virDirOpen(&dirp, SYSFS_INFINIBAND_DIR) < 0) return -1; - virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname); + eth_devpath = g_strdup_printf(SYSFS_NET_DIR "%s/device/resource", ifname); /* If /sys/class/net/<ifname>/device/resource doesn't exist it is not a PCI * device and therefore it will not have RDMA. */ @@ -2916,8 +2916,8 @@ virNetDevRDMAFeature(const char *ifname, goto cleanup; while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { - virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", - dp->d_name); + ib_devpath = g_strdup_printf(SYSFS_INFINIBAND_DIR "%s/device/resource", + dp->d_name); if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0 && STREQ(eth_res_buf, ib_res_buf)) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b7e0c0c7c1..1f1872464a 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -114,7 +114,7 @@ virNetDevBandwidthManipulateFilter(const char *ifname, } /* u32 filters must have 800:: prefix. Don't ask. */ - virAsprintf(&filter_id, "800::%u", id); + filter_id = g_strdup_printf("800::%u", id); if (remove_old) { int cmd_ret = 0; @@ -131,9 +131,9 @@ virNetDevBandwidthManipulateFilter(const char *ifname, if (create_new) { virMacAddrGetRaw(ifmac_ptr, ifmac); - virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], - ifmac[3], ifmac[4], ifmac[5]); - virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]); + mac[0] = g_strdup_printf("0x%02x%02x%02x%02x", ifmac[2], + ifmac[3], ifmac[4], ifmac[5]); + mac[1] = g_strdup_printf("0x%02x%02x", ifmac[0], ifmac[1]); virCommandFree(cmd); cmd = virCommandNew(TC); @@ -230,11 +230,11 @@ virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthClear(ifname); if (tx && tx->average) { - virAsprintf(&average, "%llukbps", tx->average); + average = g_strdup_printf("%llukbps", tx->average); if (tx->peak) - virAsprintf(&peak, "%llukbps", tx->peak); + peak = g_strdup_printf("%llukbps", tx->peak); if (tx->burst) - virAsprintf(&burst, "%llukb", tx->burst); + burst = g_strdup_printf("%llukb", tx->burst); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", @@ -357,8 +357,8 @@ virNetDevBandwidthSet(const char *ifname, } if (rx) { - virAsprintf(&average, "%llukbps", rx->average); - virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->average); + average = g_strdup_printf("%llukbps", rx->average); + burst = g_strdup_printf("%llukb", rx->burst ? rx->burst : rx->average); virCommandFree(cmd); cmd = virCommandNew(TC); @@ -568,12 +568,12 @@ virNetDevBandwidthPlug(const char *brname, return -1; } - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&qdisc_id, "%x:", id); - virAsprintf(&floor, "%llukbps", bandwidth->in->floor); - virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? - net_bandwidth->in->peak : - net_bandwidth->in->average); + class_id = g_strdup_printf("1:%x", id); + qdisc_id = g_strdup_printf("%x:", id); + floor = g_strdup_printf("%llukbps", bandwidth->in->floor); + ceil = g_strdup_printf("%llukbps", net_bandwidth->in->peak ? + net_bandwidth->in->peak : + net_bandwidth->in->average); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "class", "add", "dev", brname, "parent", "1:1", @@ -632,8 +632,8 @@ virNetDevBandwidthUnplug(const char *brname, return -1; } - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&qdisc_id, "%x:", id); + class_id = g_strdup_printf("1:%x", id); + qdisc_id = g_strdup_printf("%x:", id); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", brname, @@ -691,11 +691,11 @@ virNetDevBandwidthUpdateRate(const char *ifname, char *rate = NULL; char *ceil = NULL; - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&rate, "%llukbps", new_rate); - virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? - bandwidth->in->peak : - bandwidth->in->average); + class_id = g_strdup_printf("1:%x", id); + rate = g_strdup_printf("%llukbps", new_rate); + ceil = g_strdup_printf("%llukbps", bandwidth->in->peak ? + bandwidth->in->peak : + bandwidth->in->average); cmd = virCommandNew(TC); virCommandAddArgList(cmd, "class", "change", "dev", ifname, @@ -741,7 +741,7 @@ virNetDevBandwidthUpdateFilter(const char *ifname, int ret = -1; char *class_id = NULL; - virAsprintf(&class_id, "1:%x", id); + class_id = g_strdup_printf("1:%x", id); if (virNetDevBandwidthManipulateFilter(ifname, ifmac_ptr, id, class_id, true, true) < 0) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 0a0834be69..2cef3c0a2b 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -122,7 +122,7 @@ static int virNetDevBridgeSet(const char *brname, { g_autofree char *path = NULL; - virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); + path = g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); if (virFileExists(path)) { char valuestr[INT_BUFSIZE_BOUND(value)]; @@ -164,7 +164,7 @@ static int virNetDevBridgeGet(const char *brname, g_autofree char *path = NULL; VIR_AUTOCLOSE fd = -1; - virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); + path = g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); if (virFileExists(path)) { g_autofree char *valuestr = NULL; @@ -221,8 +221,8 @@ virNetDevBridgePortSet(const char *brname, snprintf(valuestr, sizeof(valuestr), "%lu", value); - virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, - paramname); + path = g_strdup_printf(SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); if (!virFileExists(path)) errno = EINVAL; @@ -248,8 +248,8 @@ virNetDevBridgePortGet(const char *brname, g_autofree char *path = NULL; g_autofree char *valuestr = NULL; - virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, - paramname); + path = g_strdup_printf(SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) < 0) return -1; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 057e75e5e1..5696bc367e 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -487,8 +487,8 @@ virNetDevIPGetAcceptRA(const char *ifname) char *suffix; int accept_ra = -1; - virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", - ifname ? ifname : "all"); + path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/accept_ra", + ifname ? ifname : "all"); if ((virFileReadAll(path, 512, &buf) < 0) || (virStrToLong_i(buf, &suffix, 10, &accept_ra) < 0)) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 11fcb96400..cb901d7136 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -294,7 +294,7 @@ virNetDevMacVLanIsMacvtap(const char *ifname) if (virNetDevGetIndex(ifname, &ifindex) < 0) return false; - virAsprintf(&tapname, "/dev/tap%d", ifindex); + tapname = g_strdup_printf("/dev/tap%d", ifindex); return virFileExists(tapname); } @@ -392,7 +392,7 @@ virNetDevMacVLanTapOpen(const char *ifname, if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; - virAsprintf(&tapname, "/dev/tap%d", ifindex); + tapname = g_strdup_printf("/dev/tap%d", ifindex); for (i = 0; i < tapfdSize; i++) { int fd = -1; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 9862e550b7..a864b34799 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,13 +151,13 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, virUUIDFormat(ovsport->interfaceID, ifuuidstr); virUUIDFormat(vmuuid, vmuuidstr); - virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", - macaddrstr); - virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", ifuuidstr); - virAsprintf(&vmid_ex_id, "external-ids:vm-id=\"%s\"", vmuuidstr); + attachedmac_ex_id = g_strdup_printf("external-ids:attached-mac=\"%s\"", + macaddrstr); + ifaceid_ex_id = g_strdup_printf("external-ids:iface-id=\"%s\"", ifuuidstr); + vmid_ex_id = g_strdup_printf("external-ids:vm-id=\"%s\"", vmuuidstr); if (ovsport->profileID[0] != '\0') { - virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"", - ovsport->profileID); + profile_ex_id = g_strdup_printf("external-ids:port-profile=\"%s\"", + ovsport->profileID); } cmd = virCommandNew(OVSVSCTL); diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 23f2882bc3..aea4c91a6a 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -395,7 +395,7 @@ int virNetDevTapCreate(char **ifname, for (i = 0; i <= IF_MAXUNIT; i++) { g_autofree char *newname = NULL; - virAsprintf(&newname, *ifname, i); + newname = g_strdup_printf(*ifname, i); if (virNetDevExists(newname) == 0) { newifname = g_steal_pointer(&newname); @@ -415,7 +415,7 @@ int virNetDevTapCreate(char **ifname, if (tapfd) { g_autofree char *dev_path = NULL; - virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name); + dev_path = g_strdup_printf("/dev/%s", ifr.ifr_name); if ((*tapfd = open(dev_path, O_RDWR)) < 0) { virReportSystemError(errno, diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 5e5074dd68..387017f2a8 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -44,7 +44,7 @@ static int virNetDevVethExists(int devNum) int ret; g_autofree char *path = NULL; - virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum); + path = g_strdup_printf(SYSFS_NET_DIR "vnet%d/", devNum); ret = virFileExists(path) ? 1 : 0; VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret); return ret; @@ -127,7 +127,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth1num = virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; - virAsprintf(&veth1auto, "vnet%d", veth1num); + veth1auto = g_strdup_printf("vnet%d", veth1num); vethNum = veth1num + 1; } if (!*veth2) { @@ -135,7 +135,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth2num = virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; - virAsprintf(&veth2auto, "vnet%d", veth2num); + veth2auto = g_strdup_printf("vnet%d", veth2num); vethNum = veth2num + 1; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index e6213df6da..61b9687291 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -540,15 +540,13 @@ virNumaGetHugePageInfoPath(char **path, { if (node == -1) { /* We are aiming at overall system info */ - virAsprintf(path, - HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", - page_size, NULLSTR_EMPTY(suffix)); + *path = g_strdup_printf(HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", + page_size, NULLSTR_EMPTY(suffix)); } else { /* We are aiming on specific NUMA node */ - virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" - HUGEPAGES_PREFIX "%ukB/%s", - node, page_size, NULLSTR_EMPTY(suffix)); + *path = g_strdup_printf(HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" + HUGEPAGES_PREFIX "%ukB/%s", + node, page_size, NULLSTR_EMPTY(suffix)); } if (!virFileExists(*path)) { @@ -580,9 +578,8 @@ virNumaGetHugePageInfoDir(char **path, int node) *path = g_strdup(HUGEPAGES_SYSTEM_PREFIX); return 0; } else { - virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", - node); + *path = g_strdup_printf(HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", + node); return 0; } } @@ -929,7 +926,7 @@ virNumaSetPagePoolSize(int node, * all the pages we wanted. So do the second read to check. */ VIR_FREE(nr_buf); - virAsprintf(&nr_buf, "%llu", page_count); + nr_buf = g_strdup_printf("%llu", page_count); if (virFileWriteStr(nr_path, nr_buf, 0) < 0) { virReportSystemError(errno, diff --git a/src/util/virpci.c b/src/util/virpci.c index 3ae13469bd..63580f3021 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -213,7 +213,7 @@ virPCIDriverDir(const char *driver) { char *buffer; - virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver); + buffer = g_strdup_printf(PCI_SYSFS "drivers/%s", driver); return buffer; } @@ -223,7 +223,7 @@ virPCIFile(const char *device, const char *file) { char *buffer; - virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, file); + buffer = g_strdup_printf(PCI_SYSFS "devices/%s/%s", device, file); return buffer; } @@ -604,7 +604,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr dev, int cfgfd) * device is a VF, we just assume FLR works */ - virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name); + path = g_strdup_printf(PCI_SYSFS "devices/%s/physfn", dev->name); found = virFileExists(path); if (found) { @@ -1353,12 +1353,12 @@ virPCIDeviceAddressAsString(const virPCIDeviceAddress *addr) { char *str; - virAsprintf(&str, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function); + str = g_strdup_printf( + VIR_PCI_DEVICE_ADDRESS_FMT, + addr->domain, + addr->bus, + addr->slot, + addr->function); return str; } @@ -1380,10 +1380,10 @@ virPCIDeviceNew(unsigned int domain, dev->address.slot = slot; dev->address.function = function; - virAsprintf(&dev->name, VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus, slot, - function); + dev->name = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus, slot, + function); - virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", dev->name); + dev->path = g_strdup_printf(PCI_SYSFS "devices/%s/config", dev->name); if (!virFileExists(dev->path)) { virReportSystemError(errno, @@ -1728,9 +1728,9 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, struct dirent *ent; int direrr; - virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, - dev->address.domain, dev->address.bus, dev->address.slot, - dev->address.function); + pcidir = g_strdup_printf("/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, + dev->address.domain, dev->address.bus, dev->address.slot, + dev->address.function); if (virDirOpen(&dir, pcidir) < 0) goto cleanup; @@ -1747,7 +1747,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, STREQ(ent->d_name, "vendor") || STREQ(ent->d_name, "device") || STREQ(ent->d_name, "reset")) { - virAsprintf(&file, "%s/%s", pcidir, ent->d_name); + file = g_strdup_printf("%s/%s", pcidir, ent->d_name); if ((actor)(dev, file, opaque) < 0) goto cleanup; } @@ -1779,9 +1779,9 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddressPtr orig, struct dirent *ent; int direrr; - virAsprintf(&groupPath, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", - orig->domain, orig->bus, orig->slot, orig->function); + groupPath = g_strdup_printf( + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", + orig->domain, orig->bus, orig->slot, orig->function); if (virDirOpenQuiet(&groupDir, groupPath) < 0) { /* just process the original device, nothing more */ @@ -1928,8 +1928,8 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddressPtr addr) const char *groupNumStr; unsigned int groupNum; - virAsprintf(&devName, VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->bus, - addr->slot, addr->function); + devName = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->bus, + addr->slot, addr->function); if (!(devPath = virPCIFile(devName, "iommu_group"))) return -1; @@ -1979,7 +1979,7 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) dev->name, devPath); return NULL; } - virAsprintf(&groupDev, "/dev/vfio/%s", last_component(groupPath)); + groupDev = g_strdup_printf("/dev/vfio/%s", last_component(groupPath)); return groupDev; } @@ -2278,7 +2278,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, *num_virtual_functions = 0; *max_virtual_functions = 0; - virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path); + totalvfs_file = g_strdup_printf("%s/sriov_totalvfs", sysfs_path); if (virFileExists(totalvfs_file)) { char *end = NULL; /* so that terminating \n doesn't create error */ @@ -2295,8 +2295,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, do { g_autofree char *device_link = NULL; /* look for virtfn%d links until one isn't found */ - virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, - *num_virtual_functions); + device_link = g_strdup_printf("%s/virtfn%zu", sysfs_path, + *num_virtual_functions); if (!virFileExists(device_link)) break; @@ -2337,7 +2337,7 @@ virPCIIsVirtualFunction(const char *vf_sysfs_device_link) { g_autofree char *vf_sysfs_physfn_link = NULL; - virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", vf_sysfs_device_link); + vf_sysfs_physfn_link = g_strdup_printf("%s/physfn", vf_sysfs_device_link); return virFileExists(vf_sysfs_physfn_link); } @@ -2395,8 +2395,8 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link, int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) { - virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", - virPCIDeviceName); + *pci_sysfs_device_link = g_strdup_printf(PCI_SYSFS "devices/%s", + virPCIDeviceName); return 0; } @@ -2404,9 +2404,8 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, char **pci_sysfs_device_link) { - virAsprintf(pci_sysfs_device_link, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, - addr->bus, addr->slot, addr->function); + *pci_sysfs_device_link = g_strdup_printf(PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, + addr->bus, addr->slot, addr->function); return 0; } @@ -2591,7 +2590,7 @@ virPCIGetMdevTypes(const char *sysfspath, size_t ntypes = 0; size_t i; - virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath); + types_path = g_strdup_printf("%s/mdev_supported_types", sysfspath); if ((dirret = virDirOpenIfExists(&dir, types_path)) < 0) goto cleanup; @@ -2604,7 +2603,7 @@ virPCIGetMdevTypes(const char *sysfspath, while ((dirret = virDirRead(dir, &entry, types_path)) > 0) { g_autofree char *tmppath = NULL; /* append the type id to the path and read the attributes from there */ - virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name); + tmppath = g_strdup_printf("%s/%s", types_path, entry->d_name); if (virMediatedDeviceTypeReadAttrs(tmppath, &mdev_type) < 0) goto cleanup; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 2faa6215e4..59f540c7e6 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -233,7 +233,7 @@ int virPidFileReadPathIfAlive(const char *path, goto cleanup; } - virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid); + procPath = g_strdup_printf("/proc/%lld/exe", (long long)retPid); if ((ret = virFileIsLink(procPath)) < 0) return ret; @@ -494,7 +494,7 @@ virPidFileConstructPath(bool privileged, "%s", _("No runstatedir specified")); return -1; } - virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname); + *pidfile = g_strdup_printf("%s/%s.pid", runstatedir, progname); } else { if (!(rundir = virGetUserRuntimeDirectory())) return -1; @@ -506,7 +506,7 @@ virPidFileConstructPath(bool privileged, return -1; } - virAsprintf(pidfile, "%s/%s.pid", rundir, progname); + *pidfile = g_strdup_printf("%s/%s.pid", rundir, progname); } return 0; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 107a0fb9c9..11928cb4b3 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - virAsprintf(&buf, _("exit status %d"), - WEXITSTATUS(status)); + buf = g_strdup_printf(_("exit status %d"), + WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - virAsprintf(&buf, _("fatal signal %d"), - WTERMSIG(status)); + buf = g_strdup_printf(_("fatal signal %d"), + WTERMSIG(status)); } else { - virAsprintf(&buf, _("invalid value %d"), status); + buf = g_strdup_printf(_("invalid value %d"), status); } return buf; } @@ -586,7 +586,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) *npids = 0; *pids = NULL; - virAsprintf(&taskPath, "/proc/%llu/task", (long long)pid); + taskPath = g_strdup_printf("/proc/%llu/task", (long long)pid); if (virDirOpen(&dir, taskPath) < 0) goto cleanup; @@ -631,7 +631,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; g_autofree char *nsfile = NULL; - virAsprintf(&nsfile, "/proc/%llu/ns/%s", (long long)pid, ns[i]); + 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) { @@ -950,7 +950,7 @@ int virProcessGetStartTime(pid_t pid, g_autofree char *buf = NULL; VIR_AUTOSTRINGLIST tokens = NULL; - virAsprintf(&filename, "/proc/%llu/stat", (long long)pid); + filename = g_strdup_printf("/proc/%llu/stat", (long long)pid); if ((len = virFileReadAll(filename, 1024, &buf)) < 0) return -1; @@ -1049,7 +1049,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, int ret = -1; g_autofree char *path = NULL; - virAsprintf(&path, "/proc/%lld/ns/mnt", (long long)data->pid); + path = g_strdup_printf("/proc/%lld/ns/mnt", (long long)data->pid); if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 1eee238771..0220d9eda3 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -89,7 +89,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member = virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix = NULL; - virAsprintf(&prefix, "%s.%zu", key, i); + prefix = g_strdup_printf("%s.%zu", key, i); if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, virQEMUBuildCommandLineJSONArrayNumbered, @@ -112,7 +112,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, if (data->prefix) { g_autofree char *tmpkey = NULL; - virAsprintf(&tmpkey, "%s.%s", data->prefix, key); + tmpkey = g_strdup_printf("%s.%s", data->prefix, key); return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, data->arrayFunc, false); diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 12ea9bbbdc..39ac36a76e 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -194,7 +194,7 @@ virRandomGenerateWWN(char **wwn, return -1; } - virAsprintf(wwn, "5" "%s%09llx", oui, - (unsigned long long)virRandomBits(36)); + *wwn = g_strdup_printf("5" "%s%09llx", oui, + (unsigned long long)virRandomBits(36)); return 0; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 55c15d04a4..903af52786 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2319,7 +2319,7 @@ virResctrlDeterminePath(const char *parentpath, return NULL; } - virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id); + path = g_strdup_printf("%s/%s-%s", parentpath, prefix, id); return path; } @@ -2415,7 +2415,7 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, if (!alloc_str) goto cleanup; - virAsprintf(&schemata_path, "%s/schemata", alloc->path); + schemata_path = g_strdup_printf("%s/schemata", alloc->path); VIR_DEBUG("Writing resctrl schemata '%s' into '%s'", alloc_str, schemata_path); if (virFileWriteStr(schemata_path, alloc_str, 0) < 0) { @@ -2449,9 +2449,9 @@ virResctrlAddPID(const char *path, return -1; } - virAsprintf(&tasks, "%s/tasks", path); + tasks = g_strdup_printf("%s/tasks", path); - virAsprintf(&pidstr, "%lld", (long long int)pid); + pidstr = g_strdup_printf("%lld", (long long int)pid); if (virFileWriteStr(tasks, pidstr, 0) < 0) { virReportSystemError(errno, @@ -2562,7 +2562,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitorPtr monitor, return 0; } - virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path); + parentpath = g_strdup_printf("%s/mon_groups", monitor->alloc->path); monitor->path = virResctrlDeterminePath(parentpath, machinename, monitor->id); @@ -2694,7 +2694,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, return -1; } - virAsprintf(&datapath, "%s/mon_data", monitor->path); + datapath = g_strdup_printf("%s/mon_data", monitor->path); if (virDirOpen(&dirp, datapath) < 0) goto cleanup; @@ -2711,7 +2711,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, * "mon_L3_01" are two target directories for a two nodes system * with resource utilization data file for each node respectively. */ - virAsprintf(&filepath, "%s/%s", datapath, ent->d_name); + filepath = g_strdup_printf("%s/%s", datapath, ent->d_name); if (!virFileIsDir(filepath)) continue; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 826a3db2c2..b77e30dba7 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -195,7 +195,7 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr file) for (i = 0; i < file->maxbackup; i++) { char *oldpath; - virAsprintf(&oldpath, "%s.%zu", file->basepath, i); + oldpath = g_strdup_printf("%s.%zu", file->basepath, i); if (unlink(oldpath) < 0 && errno != ENOENT) { @@ -307,7 +307,7 @@ virRotatingFileReaderNew(const char *path, for (i = 0; i < maxbackup; i++) { char *tmppath; - virAsprintf(&tmppath, "%s.%zu", path, i); + tmppath = g_strdup_printf("%s.%zu", path, i); file->entries[file->nentries - (i + 2)] = virRotatingFileReaderEntryNew(tmppath); VIR_FREE(tmppath); @@ -380,13 +380,13 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) goto cleanup; } } else { - virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxbackup - 1); + nextpath = g_strdup_printf("%s.%zu", file->basepath, file->maxbackup - 1); for (i = file->maxbackup; i > 0; i--) { if (i == 1) { thispath = g_strdup(file->basepath); } else { - virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2); + thispath = g_strdup_printf("%s.%zu", file->basepath, i - 2); } VIR_DEBUG("Rollover %s -> %s", thispath, nextpath); diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 0f28c617b0..55707a8d34 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -117,8 +117,8 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; - virAsprintf(&path, "%s/%d:%u:%u:%llu/scsi_generic", prefix, adapter_id, - bus, target, unit); + path = g_strdup_printf("%s/%d:%u:%u:%llu/scsi_generic", prefix, adapter_id, + bus, target, unit); if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -154,8 +154,8 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; - virAsprintf(&path, "%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, - target, unit); + path = g_strdup_printf("%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, + target, unit); if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -203,10 +203,10 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &dev->adapter) < 0) return NULL; - virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, - dev->bus, dev->target, dev->unit); - virAsprintf(&dev->sg_path, "%s/%s", - sysfs_prefix ? sysfs_prefix : "/dev", sg); + dev->name = g_strdup_printf("%d:%u:%u:%llu", dev->adapter, + dev->bus, dev->target, dev->unit); + dev->sg_path = g_strdup_printf("%s/%s", + sysfs_prefix ? sysfs_prefix : "/dev", sg); if (!virFileExists(dev->sg_path)) { virReportSystemError(errno, @@ -215,8 +215,8 @@ virSCSIDeviceNew(const char *sysfs_prefix, return NULL; } - virAsprintf(&vendor_path, "%s/%s/vendor", prefix, dev->name); - virAsprintf(&model_path, "%s/%s/model", prefix, dev->name); + vendor_path = g_strdup_printf("%s/%s/vendor", prefix, dev->name); + model_path = g_strdup_printf("%s/%s/model", prefix, dev->name); if (virFileReadAll(vendor_path, 1024, &vendor) < 0) return NULL; @@ -227,7 +227,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, virTrimSpaces(vendor, NULL); virTrimSpaces(model, NULL); - virAsprintf(&dev->id, "%s:%s", vendor, model); + dev->id = g_strdup_printf("%s:%s", vendor, model); ret = g_steal_pointer(&dev); return ret; diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index 53da460fdf..7d8e5299b8 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -52,8 +52,8 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix, char *buf = NULL; int unique_id; - virAsprintf(&sysfs_path, "%s/host%d/unique_id", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); + sysfs_path = g_strdup_printf("%s/host%d/unique_id", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); if (virFileReadAll(sysfs_path, 1024, &buf) < 0) goto cleanup; @@ -116,7 +116,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, if (!virFileIsLink(entry->d_name)) continue; - virAsprintf(&host_link, "%s/%s", prefix, entry->d_name); + host_link = g_strdup_printf("%s/%s", prefix, entry->d_name); if (virFileResolveLink(host_link, &host_path) < 0) goto cleanup; @@ -129,7 +129,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, VIR_FREE(host_link); VIR_FREE(host_path); - virAsprintf(&unique_path, "%s/%s/unique_id", prefix, entry->d_name); + unique_path = g_strdup_printf("%s/%s/unique_id", prefix, entry->d_name); if (!virFileExists(unique_path)) { VIR_FREE(unique_path); @@ -235,8 +235,8 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, char *name = NULL; char *parentaddr = NULL; - virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", domain, bus, slot, - function); + parentaddr = g_strdup_printf("%04x:%02x:%02x.%01x", domain, bus, slot, + function); if (!(name = virSCSIHostFindByPCI(NULL, parentaddr, unique_id))) { virReportError(VIR_ERR_XML_ERROR, _("Failed to find scsi_host using PCI '%s' " diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 4687c30f97..d096dca518 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -256,7 +256,7 @@ virSCSIVHostDeviceNew(const char *name) dev->name = g_strdup(name); - virAsprintf(&dev->path, "%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); + dev->path = g_strdup_printf("%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); VIR_DEBUG("%s: initialized", dev->name); diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index ba1cde05cd..d7b0f12d96 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -477,8 +477,8 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * nicely for UNIX sockets */ if (addr->data.sa.sa_family == AF_UNIX) { if (withService) { - virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR "%s0", - separator ? separator : ":"); + addrstr = g_strdup_printf(VIR_LOOPBACK_IPV4_ADDR "%s0", + separator ? separator : ":"); } else { addrstr = g_strdup(VIR_LOOPBACK_IPV4_ADDR); } @@ -503,11 +503,11 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * IPv6 only if no separator is passed to the function */ if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET6) - virAsprintf(&ipv6_host, "[%s]", host); + ipv6_host = g_strdup_printf("[%s]", host); - virAsprintf(&addrstr, "%s%s%s", - ipv6_host ? ipv6_host : host, - separator ? separator : ":", port); + addrstr = g_strdup_printf("%s%s%s", + ipv6_host ? ipv6_host : host, + separator ? separator : ":", port); } else { addrstr = g_strdup(host); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index f3b388a7bc..64d583b0f7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1541,7 +1541,7 @@ virStorageFileGetNPIVKey(const char *path, *tmp = '\0'; if (*serial != '\0' && *port != '\0') - virAsprintf(key, "%s_PORT%s", serial, port); + *key = g_strdup_printf("%s_PORT%s", serial, port); } return 0; @@ -2620,9 +2620,9 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, } if (STRNEQ(dirname, "/")) { - virAsprintf(&def->path, "%s/%s", dirname, rel); + def->path = g_strdup_printf("%s/%s", dirname, rel); } else { - virAsprintf(&def->path, "/%s", rel); + def->path = g_strdup_printf("/%s", rel); } if (virStorageSourceGetActualType(parent) == VIR_STORAGE_TYPE_NETWORK) { @@ -3281,7 +3281,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src, *port = '\0'; } - virAsprintf(&src->path, "%s/%s", target, lun); + src->path = g_strdup_printf("%s/%s", target, lun); /* Libvirt doesn't handle inline authentication. Make the caller aware. */ if (virJSONValueObjectGetString(json, "user") || @@ -4193,7 +4193,7 @@ virStorageFileGetRelativeBackingPath(virStorageSourcePtr top, VIR_FREE(path); - virAsprintf(&path, "%s%s", tmp, next->relPath); + path = g_strdup_printf("%s%s", tmp, next->relPath); VIR_FREE(tmp); diff --git a/src/util/virstring.c b/src/util/virstring.c index 91b237f358..ac132ff924 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -713,7 +713,7 @@ virDoubleToStr(char **strp, double number) if (virLocaleSetRaw(&oldlocale) < 0) return -1; - virAsprintf(strp, "%lf", number); + *strp = g_strdup_printf("%lf", number); virLocaleRevert(&oldlocale); virLocaleFixupRadix(strp); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index bb6ee24f4e..a692bfa86d 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -301,7 +301,7 @@ int virSystemdCreateMachine(const char *name, ret = -1; - virAsprintf(&creatorname, "libvirt-%s", drivername); + creatorname = g_strdup_printf("libvirt-%s", drivername); if (partition) { if (!(slicename = virSystemdMakeSliceName(partition))) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 149a82310d..97013f6a7d 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -73,8 +73,8 @@ virTPMCreateCancelPath(const char *devpath) dev++; for (i = 0; i < G_N_ELEMENTS(prefix); i++) { - virAsprintf(&path, "/sys/class/%s%s/device/cancel", prefix[i], - dev); + path = g_strdup_printf("/sys/class/%s%s/device/cancel", prefix[i], + dev); if (virFileExists(path)) break; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index d8c296c138..4ad2ed455f 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -176,22 +176,22 @@ virTypedParameterToString(virTypedParameterPtr param) switch (param->type) { case VIR_TYPED_PARAM_INT: - virAsprintf(&value, "%d", param->value.i); + value = g_strdup_printf("%d", param->value.i); break; case VIR_TYPED_PARAM_UINT: - virAsprintf(&value, "%u", param->value.ui); + value = g_strdup_printf("%u", param->value.ui); break; case VIR_TYPED_PARAM_LLONG: - virAsprintf(&value, "%lld", param->value.l); + value = g_strdup_printf("%lld", param->value.l); break; case VIR_TYPED_PARAM_ULLONG: - virAsprintf(&value, "%llu", param->value.ul); + value = g_strdup_printf("%llu", param->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - virAsprintf(&value, "%g", param->value.d); + value = g_strdup_printf("%g", param->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: - virAsprintf(&value, "%d", param->value.b); + value = g_strdup_printf("%d", param->value.b); break; case VIR_TYPED_PARAM_STRING: value = g_strdup(param->value.s); diff --git a/src/util/viruri.c b/src/util/viruri.c index 241e4ea102..4717feb05e 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -234,7 +234,7 @@ virURIFormat(virURIPtr uri) if (xmluri.server != NULL && strchr(xmluri.server, ':') != NULL) { - virAsprintf(&tmpserver, "[%s]", xmluri.server); + tmpserver = g_strdup_printf("[%s]", xmluri.server); xmluri.server = tmpserver; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 3e97480b1a..7ce582085f 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -89,7 +89,7 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, g_autofree char *filename = NULL; char *ignore = NULL; - virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); + filename = g_strdup_printf(USB_SYSFS "/devices/%s/%s", d_name, f_name); if (virFileReadAll(filename, 1024, &buf) < 0) return -1; @@ -329,11 +329,11 @@ virUSBDeviceNew(unsigned int bus, } if (vroot) { - virAsprintf(&dev->path, "%s/%03d/%03d", - vroot, dev->bus, dev->dev); + dev->path = g_strdup_printf("%s/%03d/%03d", + vroot, dev->bus, dev->dev); } else { - virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", - dev->bus, dev->dev); + dev->path = g_strdup_printf(USB_DEVFS "%03d/%03d", + dev->bus, dev->dev); } /* XXX fixme. this should be product/vendor */ diff --git a/src/util/virutil.c b/src/util/virutil.c index 705fb6bd74..51f8796b40 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -744,11 +744,11 @@ static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir) char *home = NULL; if (path && path[0]) { - virAsprintf(&ret, "%s/libvirt", path); + ret = g_strdup_printf("%s/libvirt", path); } else { home = virGetUserDirectory(); if (home) - virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir); + ret = g_strdup_printf("%s/%s/libvirt", home, xdgdefdir); } VIR_FREE(home); @@ -774,7 +774,7 @@ char *virGetUserRuntimeDirectory(void) } else { char *ret; - virAsprintf(&ret, "%s/libvirt", path); + ret = g_strdup_printf("%s/libvirt", path); return ret; } } @@ -1587,9 +1587,9 @@ virGetUnprivSGIOSysfsPath(const char *path, return NULL; } - virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min); + sysfs_path = g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, + maj, min); return sysfs_path; } @@ -1612,7 +1612,7 @@ virSetDeviceUnprivSGIO(const char *path, goto cleanup; } - virAsprintf(&val, "%d", unpriv_sgio); + val = g_strdup_printf("%d", unpriv_sgio); if ((rc = virFileWriteStr(sysfs_path, val, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), sysfs_path); @@ -1877,7 +1877,7 @@ virHostGetDRMRenderNode(void) goto cleanup; } - virAsprintf(&ret, "%s/%s", driPath, ent->d_name); + ret = g_strdup_printf("%s/%s", driPath, ent->d_name); cleanup: VIR_DIR_CLOSE(driDir); diff --git a/src/util/virvhba.c b/src/util/virvhba.c index c78d5e2cd9..df0691a658 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -52,8 +52,8 @@ virVHBAPathExists(const char *sysfs_prefix, char *sysfs_path = NULL; bool ret = false; - virAsprintf(&sysfs_path, "%s/host%d", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host); + sysfs_path = g_strdup_printf("%s/host%d", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host); if (virFileExists(sysfs_path)) ret = true; @@ -83,13 +83,13 @@ virVHBAIsVportCapable(const char *sysfs_prefix, char *fc_host_path = NULL; bool ret = false; - virAsprintf(&fc_host_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, - "vport_create"); + fc_host_path = g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, + "vport_create"); - virAsprintf(&scsi_host_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host, - "vport_create"); + scsi_host_path = g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host, + "vport_create"); if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret = true; @@ -120,8 +120,8 @@ virVHBAGetConfig(const char *sysfs_prefix, char *buf = NULL; char *result = NULL; - virAsprintf(&sysfs_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, entry); + sysfs_path = g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, entry); if (!virFileExists(sysfs_path)) goto cleanup; @@ -258,13 +258,13 @@ virVHBAManageVport(const int parent_host, goto cleanup; } - virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_FC_HOST_PATH, - parent_host, operation_file); + operation_path = g_strdup_printf("%s/host%d/%s", SYSFS_FC_HOST_PATH, + parent_host, operation_file); if (!virFileExists(operation_path)) { VIR_FREE(operation_path); - virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_SCSI_HOST_PATH, - parent_host, operation_file); + operation_path = g_strdup_printf("%s/host%d/%s", SYSFS_SCSI_HOST_PATH, + parent_host, operation_file); if (!virFileExists(operation_path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -281,7 +281,7 @@ virVHBAManageVport(const int parent_host, * in calling either the Add or Remove device functions. This translates * into either adding or removing a node device object and a node device * lifecycle event for applications to consume. */ - virAsprintf(&vport_name, "%s:%s", wwpn, wwnn); + vport_name = g_strdup_printf("%s:%s", wwpn, wwnn); if (virFileWriteStr(operation_path, vport_name, 0) == 0) ret = 0; @@ -321,7 +321,7 @@ vhbaReadCompareWWN(const char *prefix, char *p; int ret = -1; - virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name); + path = g_strdup_printf("%s/%s/%s", prefix, d_name, f_name); if (!virFileExists(path)) { ret = 0; @@ -425,8 +425,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, /* Existing vHBA's will have the same fabric_name, but won't * have the vport_create file - so we check for both */ - virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, - entry->d_name); + vport_create_path = g_strdup_printf("%s/%s/vport_create", prefix, + entry->d_name); if (!virFileExists(vport_create_path)) continue; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vbox/vbox_MSCOMGlue.c | 4 ++-- src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_common.c | 30 +++++++++++++++--------------- src/vbox/vbox_network.c | 10 +++++----- src/vbox/vbox_snapshot_conf.c | 12 ++++++------ src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index db000385bc..18a291a0d8 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -525,8 +525,8 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, CoInitialize(NULL); - if (virAsprintf(&mbsVirtualBoxIID, "{%s}", pszVirtualBoxIID) < 0 || - virAsprintf(&mbsSessionIID, "{%s}", pszSessionIID) < 0) + mbsVirtualBoxIID = g_strdup_printf("{%s}", pszVirtualBoxIID); + mbsSessionIID = g_strdup_printf("{%s}", pszSessionIID) goto cleanup; if (vboxUtf8ToUtf16(mbsVirtualBoxIID, &wcsVirtualBoxIID) < 0 || diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 09768d5d38..f48a78a923 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -85,7 +85,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; if (dir != NULL) { - virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME); + name = g_strdup_printf("%s/%s", dir, DYNLIB_NAME); if (!virFileExists(name)) { if (!ignoreMissing) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 6ffa43addc..05656bffb2 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1770,7 +1770,7 @@ vboxAttachUSB(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) /* Zero pad for nice alignment when fewer than 9999 * devices. */ - virAsprintf(&filtername, "filter%04zu", i); + filtername = g_strdup_printf("filter%04zu", i); VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); VIR_FREE(filtername); gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, @@ -2126,7 +2126,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid if (guiPresent) { if (guiDisplay) { char *displayutf8; - virAsprintf(&displayutf8, "DISPLAY=%s", guiDisplay); + displayutf8 = g_strdup_printf("DISPLAY=%s", guiDisplay); VBOX_UTF8_TO_UTF16(displayutf8, &env); VIR_FREE(displayutf8); VIR_FREE(guiDisplay); @@ -2138,7 +2138,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIID *iid if (sdlPresent) { if (sdlDisplay) { char *displayutf8; - virAsprintf(&displayutf8, "DISPLAY=%s", sdlDisplay); + displayutf8 = g_strdup_printf("DISPLAY=%s", sdlDisplay); VBOX_UTF8_TO_UTF16(displayutf8, &env); VIR_FREE(displayutf8); VIR_FREE(sdlDisplay); @@ -4616,7 +4616,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - virAsprintf(&nameTmpUse, "%s.vbox", machineName); + nameTmpUse = g_strdup_printf("%s.vbox", machineName); machineLocationPath = virStringReplace(settingsFilePath_Utf8, nameTmpUse, ""); if (machineLocationPath == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4632,8 +4632,8 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } if (snapshotMachineDesc->currentSnapshot != NULL) { - virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", - machineLocationPath, snapshotMachineDesc->currentSnapshot); + currentSnapshotXmlFilePath = g_strdup_printf("%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnapshot); snapshotFileExists = virFileExists(currentSnapshotXmlFilePath); } @@ -5201,8 +5201,8 @@ vboxSnapshotRedefine(virDomainPtr dom, vboxIIDUnalloc(&parentiid); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); - virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", - machineLocationPath, it); + newLocationUtf8 = g_strdup_printf("%sfakedisk-%d.vdi", + machineLocationPath, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc = gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -5300,8 +5300,8 @@ vboxSnapshotRedefine(virDomainPtr dom, * next define. This file is saved as "'machineLocation'/snapshot-'uuid'.xml" */ VIR_FREE(currentSnapshotXmlFilePath); - virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", - machineLocationPath, snapshotMachineDesc->currentSnapshot); + currentSnapshotXmlFilePath = g_strdup_printf("%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnapshot); char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, data->caps, data->xmlopt, @@ -6888,7 +6888,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) goto cleanup; } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - virAsprintf(&nameTmpUse, "%s.vbox", machineName); + nameTmpUse = g_strdup_printf("%s.vbox", machineName); machineLocationPath = virStringReplace(settingsFilepath, nameTmpUse, ""); if (machineLocationPath == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6972,8 +6972,8 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) VBOX_UTF16_FREE(locationUtf16); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); - virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", - machineLocationPath, def->parent.parent_name, it); + newLocationUtf8 = g_strdup_printf("%sfakedisk-%s-%d.vdi", + machineLocationPath, def->parent.parent_name, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc = gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -7377,13 +7377,13 @@ vboxDomainScreenshot(virDomainPtr dom, } if (privileged) { - virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR); + cacheDir = g_strdup_printf("%s/cache/libvirt", LOCALSTATEDIR); } else if (!(cacheDir = virGetUserCacheDirectory())) { VBOX_RELEASE(machine); return NULL; } - virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir); + tmp = g_strdup_printf("%s/vbox.screendump.XXXXXX", cacheDir); if ((tmp_fd = mkostemp(tmp, O_CLOEXEC)) == -1) { virReportSystemError(errno, _("mkostemp(\"%s\") failed"), tmp); diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index a942587bcb..19b4d23ed8 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -432,8 +432,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) VBOX_UTF16_TO_UTF8(networkInterfaceNameUtf16, &networkInterfaceNameUtf8); - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", - networkInterfaceNameUtf8); + networkNameUtf8 = g_strdup_printf("HostInterfaceNetworking-%s", + networkInterfaceNameUtf8); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); @@ -588,7 +588,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) * show up in the net-list in virsh */ - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); + networkNameUtf8 = g_strdup_printf("HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); @@ -692,7 +692,7 @@ static int vboxNetworkCreate(virNetworkPtr network) * server by giving the machine static IP */ - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); + networkNameUtf8 = g_strdup_printf("HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); @@ -789,7 +789,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) def->ips = ipdef; def->nips = 1; - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->name); + networkNameUtf8 = g_strdup_printf("HostInterfaceNetworking-%s", network->name); VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 8c92d8797b..acac037208 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -84,7 +84,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlNodePtr diskNode, } if (location[0] != '/') { /*The location is a relative path, so we must change it into an absolute one. */ - virAsprintf(&tmp, "%s%s", machineLocation, location); + tmp = g_strdup_printf("%s%s", machineLocation, location); hardDisk->location = g_strdup(tmp); } else { hardDisk->location = g_strdup(location); @@ -330,7 +330,7 @@ virVBoxSnapshotConfCreateHardDiskNode(virVBoxSnapshotConfHardDiskPtr hardDisk) size_t i = 0; char *uuid = NULL; xmlNodePtr ret = xmlNewNode(NULL, BAD_CAST "HardDisk"); - virAsprintf(&uuid, "{%s}", hardDisk->uuid); + uuid = g_strdup_printf("{%s}", hardDisk->uuid); if (xmlNewProp(ret, BAD_CAST "uuid", BAD_CAST uuid) == NULL) goto cleanup; @@ -376,7 +376,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, char **secondRegex = NULL; int secondRegexResult = 0; - virAsprintf(&uuid, "{%s}", snapshot->uuid); + uuid = g_strdup_printf("{%s}", snapshot->uuid); if (xmlNewProp(node, BAD_CAST "uuid", BAD_CAST uuid) == NULL) goto cleanup; @@ -397,7 +397,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, goto cleanup; if (secondRegexResult < 1) goto cleanup; - virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); + timeStamp = g_strdup_printf("%sT%sZ", firstRegex[0], secondRegex[0]); if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) == NULL) goto cleanup; @@ -1069,7 +1069,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, } if (machine->currentSnapshot != NULL) { - virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot); + currentSnapshot = g_strdup_printf("{%s}", machine->currentSnapshot); if (!xmlNewProp(machineNode, BAD_CAST "currentSnapshot", BAD_CAST currentSnapshot)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); @@ -1106,7 +1106,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, if (secondRegexResult < 1) goto cleanup; - virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); + timeStamp = g_strdup_printf("%sT%sZ", firstRegex[0], secondRegex[0]); if (!xmlNewProp(machineNode, BAD_CAST "lastStateChange", BAD_CAST timeStamp)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 8cd1b20628..beb5b9e846 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -449,7 +449,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, /* If target.path isn't given, use default path ~/.VirtualBox/image_name */ if (!def->target.path) - virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDirectory(), def->name); + def->target.path = g_strdup_printf("%s/.VirtualBox/%s", virGetUserDirectory(), def->name); VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16); if (!hddFormatUtf16 || !hddNameUtf16) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88e7deaea0..a5a907768b 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -619,7 +619,7 @@ _virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine **mac VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); - virAsprintf(&createFlags, "UUID=%s,forceOverwrite=0", uuidstr); + createFlags = g_strdup_printf("UUID=%s,forceOverwrite=0", uuidstr); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vmware/vmware_conf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 1e836ec7ed..ef7696a496 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -275,15 +275,15 @@ vmwareExtractVersion(struct vmware_driver *driver) switch (driver->type) { case VMWARE_DRIVER_PLAYER: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer"); + bin = g_strdup_printf("%s/%s", vmwarePath, "vmplayer"); break; case VMWARE_DRIVER_WORKSTATION: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmware"); + bin = g_strdup_printf("%s/%s", vmwarePath, "vmware"); break; case VMWARE_DRIVER_FUSION: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx"); + bin = g_strdup_printf("%s/%s", vmwarePath, "vmware-vmx"); break; default: @@ -366,9 +366,9 @@ void vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath) { if (directoryName != NULL) - virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name); + *vmxPath = g_strdup_printf("%s/%s.vmx", directoryName, name); else - virAsprintf(vmxPath, "%s.vmx", name); + *vmxPath = g_strdup_printf("%s.vmx", name); } int @@ -467,7 +467,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) int vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath) { - virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt); + *outpath = g_strdup_printf("%s/%s.%s", srcDir, srcName, srcExt); return 0; } @@ -484,7 +484,7 @@ vmwareExtractPid(const char * vmxPath) if ((vmxDir = mdir_name(vmxPath)) == NULL) goto cleanup; - virAsprintf(&logFilePath, "%s/vmware.log", vmxDir); + logFilePath = g_strdup_printf("%s/vmware.log", vmxDir); if ((logFile = fopen(logFilePath, "r")) == NULL) goto cleanup; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vmx/vmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 6f47546edf..8aaefba1c1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2081,7 +2081,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit); + prefix = g_strdup_printf("scsi%d:%d", controllerOrBus, unit); (*def)->dst = virIndexToDiskName @@ -2103,7 +2103,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit); + prefix = g_strdup_printf("ide%d:%d", controllerOrBus, unit); (*def)->dst = virIndexToDiskName(controllerOrBus * 2 + unit, "hd"); @@ -2132,7 +2132,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } - virAsprintf(&prefix, "floppy%d", unit); + prefix = g_strdup_printf("floppy%d", unit); (*def)->dst = virIndexToDiskName(unit, "fd"); @@ -2839,7 +2839,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, (*def)->source->data.tcp.host = g_strdup(parsedUri->server); - virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->port); + (*def)->source->data.tcp.service = g_strdup_printf("%d", parsedUri->port); /* See vSphere API documentation about VirtualSerialPortURIBackingInfo */ if (parsedUri->scheme == NULL || -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index adde179951..54413fdc67 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2955,7 +2955,7 @@ vzMigrationCreateURI(void) goto cleanup; } - virAsprintf(&uri, "vzmigr://%s", hostname); + uri = g_strdup_printf("vzmigr://%s", hostname); cleanup: VIR_FREE(hostname); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9e2bddf6df..70bbde5e1d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1213,22 +1213,22 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) break; case PDT_USE_TCP: chr->source->type = VIR_DOMAIN_CHR_TYPE_TCP; - virAsprintf(&uristr, "tcp://%s", friendlyName); + uristr = g_strdup_printf("tcp://%s", friendlyName); if (!(uri = virURIParse(uristr))) goto cleanup; chr->source->data.tcp.host = g_strdup(uri->server); - virAsprintf(&chr->source->data.tcp.service, "%d", uri->port); + chr->source->data.tcp.service = g_strdup_printf("%d", uri->port); chr->source->data.tcp.listen = socket_mode == PSP_SERIAL_SOCKET_SERVER; break; case PDT_USE_UDP: chr->source->type = VIR_DOMAIN_CHR_TYPE_UDP; - virAsprintf(&uristr, "udp://%s", friendlyName); + uristr = g_strdup_printf("udp://%s", friendlyName); if (!(uri = virURIParse(uristr))) goto cleanup; chr->source->data.udp.bindHost = g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.bindService, "%d", uri->port); + chr->source->data.udp.bindService = g_strdup_printf("%d", uri->port); chr->source->data.udp.connectHost = g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.connectService, "%d", uri->port); + chr->source->data.udp.connectService = g_strdup_printf("%d", uri->port); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3123,16 +3123,16 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDomainChrDefPtr chr) break; case VIR_DOMAIN_CHR_TYPE_TCP: emutype = PDT_USE_TCP; - virAsprintf(&url, "%s:%s", chr->source->data.tcp.host, - chr->source->data.tcp.service); + url = g_strdup_printf("%s:%s", chr->source->data.tcp.host, + chr->source->data.tcp.service); if (!chr->source->data.tcp.listen) socket_mode = PSP_SERIAL_SOCKET_CLIENT; path = url; break; case VIR_DOMAIN_CHR_TYPE_UDP: emutype = PDT_USE_UDP; - virAsprintf(&url, "%s:%s", chr->source->data.udp.bindHost, - chr->source->data.udp.bindService); + url = g_strdup_printf("%s:%s", chr->source->data.udp.bindHost, + chr->source->data.udp.bindService); path = url; break; default: @@ -3324,7 +3324,7 @@ static int prlsdkConfigureNet(vzDriverPtr driver G_GNUC_UNUSED, if (!(tmpstr = virSocketAddrFormat(&net->guestIP.ips[i]->address))) goto cleanup; - virAsprintf(&addrstr, "%s/%d", tmpstr, net->guestIP.ips[i]->prefix); + addrstr = g_strdup_printf("%s/%d", tmpstr, net->guestIP.ips[i]->prefix); VIR_FREE(tmpstr); pret = PrlStrList_AddItem(addrlist, addrstr); @@ -3779,8 +3779,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) prlsdkCheckRetGoto(pret, cleanup); if (fs->type == VIR_DOMAIN_FS_TYPE_VOLUME) { - virAsprintf(&storage, "libvirt://localhost/%s/%s", - fs->src->srcpool->pool, fs->src->srcpool->volume); + storage = g_strdup_printf("libvirt://localhost/%s/%s", + fs->src->srcpool->pool, fs->src->srcpool->volume); pret = PrlVmDevHd_SetStorageURL(sdkdisk, storage); prlsdkCheckRetGoto(pret, cleanup); } @@ -4393,8 +4393,7 @@ prlsdkGetBlockStats(PRL_HANDLE sdkstats, #define PRLSDK_GET_STAT_PARAM(VAL, TYPE, NAME) \ - if (virAsprintf(&name, "devices.%s%d.%s", prefix, idx, NAME) < 0) \ - goto cleanup; \ + name = g_strdup_printf("devices.%s%d.%s", prefix, idx, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4474,8 +4473,7 @@ prlsdkGetNetStats(PRL_HANDLE sdkstats, PRL_HANDLE sdkdom, const char *device, prlsdkCheckRetGoto(pret, cleanup); #define PRLSDK_GET_NET_COUNTER(VAL, NAME) \ - if (virAsprintf(&name, "net.nic%u.%s", net_index, NAME) < 0) \ - goto cleanup; \ + name = g_strdup_printf("net.nic%u.%s", net_index, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4506,7 +4504,7 @@ prlsdkGetVcpuStats(PRL_HANDLE sdkstats, int idx, unsigned long long *vtime) long long ptime = 0; int ret = -1; - virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx); + name = g_strdup_printf("guest.vcpu%u.time", (unsigned int)idx); if (prlsdkExtractStatsParam(sdkstats, name, &ptime) < 0) goto cleanup; *vtime = ptime == -1 ? 0 : ptime; -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/bhyveargv2xmltest.c | 10 ++-- tests/bhyvexml2argvtest.c | 18 +++---- tests/bhyvexml2xmltest.c | 10 ++-- tests/commandtest.c | 18 +++---- tests/cputest.c | 60 ++++++++++----------- tests/domaincapstest.c | 16 +++--- tests/domainconftest.c | 4 +- tests/fchosttest.c | 2 +- tests/fdstreamtest.c | 4 +- tests/genericxml2xmltest.c | 8 +-- tests/interfacexml2xmltest.c | 4 +- tests/libxlxml2domconfigtest.c | 4 +- tests/lxcconf2xmltest.c | 16 +++--- tests/lxcxml2xmltest.c | 8 +-- tests/networkxml2conftest.c | 4 +- tests/networkxml2firewalltest.c | 10 ++-- tests/networkxml2xmltest.c | 4 +- tests/networkxml2xmlupdatetest.c | 12 ++--- tests/nodedevxml2xmltest.c | 4 +- tests/nssmock.c | 6 +-- tests/nwfilterxml2firewalltest.c | 12 ++--- tests/nwfilterxml2xmltest.c | 4 +- tests/openvzutilstest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 22 ++++---- tests/qemucapabilitiestest.c | 16 +++--- tests/qemucaps2xmltest.c | 10 ++-- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 2 +- tests/qemuhotplugtest.c | 26 ++++----- tests/qemumemlocktest.c | 4 +- tests/qemumigparamstest.c | 20 +++---- tests/qemumonitorjsontest.c | 50 +++++++++--------- tests/qemumonitortestutils.c | 24 ++++----- tests/qemusecuritymock.c | 2 +- tests/qemusecuritytest.c | 2 +- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvtest.c | 18 +++---- tests/qemuxml2xmltest.c | 18 +++---- tests/scsihosttest.c | 14 ++--- tests/secretxml2xmltest.c | 10 ++-- tests/securityselinuxlabeltest.c | 16 +++--- tests/storagebackendsheepdogtest.c | 8 +-- tests/storagepoolcapstest.c | 4 +- tests/storagepoolxml2argvtest.c | 8 +-- tests/storagepoolxml2xmltest.c | 8 +-- tests/storagevolxml2argvtest.c | 22 ++++---- tests/storagevolxml2xmltest.c | 12 ++--- tests/sysinfotest.c | 8 +-- tests/testutils.c | 10 ++-- tests/testutils.h | 2 +- tests/testutilsqemu.c | 8 +-- tests/vboxsnapshotxmltest.c | 4 +- tests/virbuftest.c | 2 +- tests/vircaps2xmltest.c | 12 ++--- tests/vircgroupmock.c | 8 +-- tests/vircgrouptest.c | 2 +- tests/virconftest.c | 4 +- tests/virfilemock.c | 2 +- tests/virfiletest.c | 2 +- tests/virfilewrapper.c | 2 +- tests/virhostcputest.c | 32 +++++------ tests/virjsontest.c | 24 ++++----- tests/virmacmaptest.c | 6 +-- tests/virnetdaemontest.c | 8 +-- tests/virnetdevmock.c | 4 +- tests/virnetdevopenvswitchtest.c | 4 +- tests/virnetsockettest.c | 4 +- tests/virnetworkportxml2xmltest.c | 4 +- tests/virnumamock.c | 2 +- tests/virnwfilterbindingxml2xmltest.c | 4 +- tests/virpcimock.c | 70 ++++++++++++------------- tests/virpcitest.c | 10 ++-- tests/virrandommock.c | 4 +- tests/virresctrltest.c | 12 ++--- tests/virschematest.c | 10 ++-- tests/virscsitest.c | 6 +-- tests/virshtest.c | 4 +- tests/virstoragetest.c | 58 ++++++++++---------- tests/virtestmock.c | 2 +- tests/virusbmock.c | 2 +- tests/virusbtest.c | 4 +- tests/vmwarevertest.c | 2 +- tests/vmx2xmltest.c | 12 ++--- tests/xlconfigtest.c | 4 +- tests/xmconfigtest.c | 4 +- tests/xml2vmxtest.c | 12 ++--- 88 files changed, 467 insertions(+), 473 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index d108366682..5e39face33 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -106,15 +106,13 @@ testCompareXMLToArgvHelper(const void *data) char *xml = NULL; char *args = NULL; - if (virAsprintf(&xml, "%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/bhyveargv2xmldata/bhyveargv2xml-%s.args", - abs_srcdir, info->name) < 0) - goto cleanup; + xml = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", + abs_srcdir, info->name); + args = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.args", + abs_srcdir, info->name); result = testCompareXMLToArgvFiles(xml, args, info->flags); - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index eeedd04f72..f5dbb4e154 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -119,19 +119,17 @@ testCompareXMLToArgvHelper(const void *data) char *xml = NULL; char *args = NULL, *ldargs = NULL, *dmargs = NULL; - if (virAsprintf(&xml, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.args", - abs_srcdir, info->name) < 0 || - virAsprintf(&ldargs, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldargs", - abs_srcdir, info->name) < 0 || - virAsprintf(&dmargs, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.devmap", - abs_srcdir, info->name) < 0) - goto cleanup; + xml = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", + abs_srcdir, info->name); + args = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.args", + abs_srcdir, info->name); + ldargs = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldargs", + abs_srcdir, info->name); + dmargs = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.devmap", + abs_srcdir, info->name); ret = testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); - cleanup: VIR_FREE(xml); VIR_FREE(args); VIR_FREE(ldargs); diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 9f64df8bb2..a0c20a14c1 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -31,11 +31,10 @@ testCompareXMLToXMLHelper(const void *data) bool is_different = info->flags & FLAG_IS_DIFFERENT; int ret = -1; - if (virAsprintf(&xml_in, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + xml_in = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", + abs_srcdir, info->name); + xml_out = g_strdup_printf("%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s.xml", + abs_srcdir, info->name); ret = testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, @@ -49,7 +48,6 @@ testCompareXMLToXMLHelper(const void *data) virResetLastError(); } - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/commandtest.c b/tests/commandtest.c index 9ee23add4c..a8686f777f 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -67,8 +67,8 @@ static int checkoutput(const char *testname, char *actualname = NULL; char *actuallog = NULL; - virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, testname); - virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir); + expectname = g_strdup_printf("%s/commanddata/%s.log", abs_srcdir, testname); + actualname = g_strdup_printf("%s/commandhelper.log", abs_builddir); if (virFileReadAll(expectname, 1024*64, &expectlog) < 0) { fprintf(stderr, "cannot read %s\n", expectname); @@ -83,7 +83,7 @@ static int checkoutput(const char *testname, if (prefix) { char *tmp = NULL; - virAsprintf(&tmp, "%s%s", prefix, expectlog); + tmp = g_strdup_printf("%s%s", prefix, expectlog); VIR_FREE(expectlog); expectlog = tmp; @@ -591,7 +591,7 @@ static int test15(const void *unused G_GNUC_UNUSED) char *cwd = NULL; int ret = -1; - virAsprintf(&cwd, "%s/commanddata", abs_srcdir); + cwd = g_strdup_printf("%s/commanddata", abs_srcdir); virCommandSetWorkingDirectory(cmd, cwd); virCommandSetUmask(cmd, 002); @@ -810,7 +810,7 @@ static int test20(const void *unused G_GNUC_UNUSED) sigaction(SIGPIPE, &sig_action, NULL); - virAsprintf(&buf, "1\n%100000d\n", 2); + buf = g_strdup_printf("1\n%100000d\n", 2); virCommandSetInputBuffer(cmd, buf); if (virCommandRun(cmd, NULL) < 0) { @@ -1168,10 +1168,10 @@ static int test27(const void *unused G_GNUC_UNUSED) buffer2[buflen - 2] = '\n'; buffer2[buflen - 1] = 0; - virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, - buffer0, buffer1, buffer2); - virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, - buffer0, buffer1, buffer2); + outexpect = g_strdup_printf(TEST27_OUTEXPECT_TEMP, + buffer0, buffer1, buffer2); + errexpect = g_strdup_printf(TEST27_ERREXPECT_TEMP, + buffer0, buffer1, buffer2); if (pipe(pipe1) < 0 || pipe(pipe2) < 0) { printf("Could not create pipe: %s\n", g_strerror(errno)); diff --git a/tests/cputest.c b/tests/cputest.c index e1b609ef73..e872861690 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -75,8 +75,8 @@ cpuTestLoadXML(virArch arch, const char *name) xmlXPathContextPtr ctxt = NULL; virCPUDefPtr cpu = NULL; - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml = g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -104,8 +104,8 @@ cpuTestLoadMultiXML(virArch arch, int n; size_t i; - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml = g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -148,8 +148,8 @@ cpuTestCompareXML(virArch arch, char *actual = NULL; int ret = -1; - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml = g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); if (!(actual = virCPUDefFormat(cpu, NULL))) goto cleanup; @@ -342,7 +342,7 @@ cpuTestBaseline(const void *arg) suffix = "migratable"; else suffix = "result"; - virAsprintf(&result, "%s-%s", data->name, suffix); + result = g_strdup_printf("%s-%s", data->name, suffix); if (cpuTestCompareXML(data->arch, baseline, result) < 0) goto cleanup; @@ -395,7 +395,7 @@ cpuTestUpdate(const void *arg) if (virCPUUpdate(host->arch, cpu, migHost) < 0) goto cleanup; - virAsprintf(&result, "%s+%s", data->host, data->name); + result = g_strdup_printf("%s+%s", data->host, data->name); ret = cpuTestCompareXML(data->arch, cpu, result); @@ -480,8 +480,8 @@ cpuTestMakeQEMUCaps(const struct data *data) bool fail_no_props = true; char *json = NULL; - virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, - virArchToString(data->arch), data->host); + json = g_strdup_printf("%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, + virArchToString(data->arch), data->host); if (!(testMon = qemuMonitorTestNewFromFile(json, driver.xmlopt, true))) goto error; @@ -583,8 +583,8 @@ cpuTestCPUID(bool guest, const void *arg) char *result = NULL; virDomainCapsCPUModelsPtr models = NULL; - virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, - virArchToString(data->arch), data->host); + hostFile = g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); if (virTestLoadFile(hostFile, &host) < 0 || !(hostData = virCPUDataParse(host))) @@ -615,7 +615,7 @@ cpuTestCPUID(bool guest, const void *arg) if (cpuDecode(cpu, hostData, models) < 0) goto cleanup; - virAsprintf(&result, "cpuid-%s-%s", data->host, guest ? "guest" : "host"); + result = g_strdup_printf("cpuid-%s-%s", data->host, guest ? "guest" : "host"); ret = cpuTestCompareXML(data->arch, cpu, result); @@ -657,12 +657,12 @@ cpuTestCompareSignature(const struct data *data, signature = virCPUx86DataGetSignature(hostData, &family, &model, &stepping); - virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", abs_srcdir, - virArchToString(data->arch), data->host); + result = g_strdup_printf("%s/cputestdata/%s-cpuid-%s.sig", abs_srcdir, + virArchToString(data->arch), data->host); - virAsprintf(&sigStr, "%1$06lx\n" "family: %2$3u (0x%2$02x)\n" - "model: %3$3u (0x%3$02x)\n" "stepping: %4$3u (0x%4$02x)\n", - signature, family, model, stepping); + sigStr = g_strdup_printf("%1$06lx\n" "family: %2$3u (0x%2$02x)\n" + "model: %3$3u (0x%3$02x)\n" "stepping: %4$3u (0x%4$02x)\n", + signature, family, model, stepping); return virTestCompareToFile(sigStr, result); } @@ -677,8 +677,8 @@ cpuTestCPUIDSignature(const void *arg) char *host = NULL; int ret = -1; - virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, - virArchToString(data->arch), data->host); + hostFile = g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); if (virTestLoadFile(hostFile, &host) < 0 || !(hostData = virCPUDataParse(host))) @@ -801,23 +801,23 @@ cpuTestUpdateLive(const void *arg) virDomainCapsCPUModelsPtr models = NULL; int ret = -1; - virAsprintf(&cpuFile, "cpuid-%s-guest", data->host); + cpuFile = g_strdup_printf("cpuid-%s-guest", data->host); if (!(cpu = cpuTestLoadXML(data->arch, cpuFile))) goto cleanup; - virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", - abs_srcdir, virArchToString(data->arch), data->host); + enabledFile = g_strdup_printf("%s/cputestdata/%s-cpuid-%s-enabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); if (virTestLoadFile(enabledFile, &enabled) < 0 || !(enabledData = virCPUDataParse(enabled))) goto cleanup; - virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xml", - abs_srcdir, virArchToString(data->arch), data->host); + disabledFile = g_strdup_printf("%s/cputestdata/%s-cpuid-%s-disabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); if (virTestLoadFile(disabledFile, &disabled) < 0 || !(disabledData = virCPUDataParse(disabled))) goto cleanup; - virAsprintf(&expectedFile, "cpuid-%s-json", data->host); + expectedFile = g_strdup_printf("cpuid-%s-json", data->host); if (!(expected = cpuTestLoadXML(data->arch, expectedFile))) goto cleanup; @@ -890,7 +890,7 @@ cpuTestJSONCPUID(const void *arg) char *result = NULL; int ret = -1; - virAsprintf(&result, "cpuid-%s-json", data->host); + result = g_strdup_printf("cpuid-%s-json", data->host); if (!(qemuCaps = cpuTestMakeQEMUCaps(data))) goto cleanup; @@ -1011,8 +1011,8 @@ mymain(void) tmp = virTestLogContentAndReset(); \ VIR_FREE(tmp); \ \ - virAsprintf(&testLabel, "%s(%s): %s", \ - #api, virArchToString(arch), name); \ + testLabel = g_strdup_printf("%s(%s): %s", #api, \ + virArchToString(arch), name); \ \ if (virTestRun(testLabel, api, &data) < 0) { \ if (virTestGetDebug()) { \ @@ -1052,7 +1052,7 @@ mymain(void) suffix = " (expanded)"; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) \ suffix = " (migratable)"; \ - virAsprintf(&label, "%s%s", name, suffix); \ + label = g_strdup_printf("%s%s", name, suffix); \ DO_TEST(arch, cpuTestBaseline, label, NULL, \ "baseline-" name, NULL, flags, result); \ VIR_FREE(label); \ diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 3289eb3ef7..7d37faefe5 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -88,7 +88,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, fakeHostCPU(caps, domCaps->arch) < 0) goto cleanup; - virAsprintf(&path, "%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch); + path = g_strdup_printf("%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch); if (!(qemuCaps = qemuTestParseCapabilities(caps, path))) goto cleanup; @@ -216,8 +216,8 @@ test_virDomainCapsFormat(const void *opaque) char *domCapsXML = NULL; int ret = -1; - virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", abs_srcdir, - data->name); + path = g_strdup_printf("%s/domaincapsschemadata/%s.xml", abs_srcdir, + data->name); if (!(domCaps = virDomainCapsNew(data->emulator, data->machine, virArchFromString(data->arch), @@ -297,10 +297,10 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ char *name = NULL; \ - virAsprintf(&name, "qemu_%s%s%s.%s", \ - Name, \ - Machine ? "-" : "", Machine ? Machine : "", \ - Arch); \ + name = g_strdup_printf("qemu_%s%s%s.%s", \ + Name, \ + Machine ? "-" : "", Machine ? Machine : "", \ + Arch); \ struct testData data = { \ .name = name, \ .emulator = Emulator, \ @@ -333,7 +333,7 @@ mymain(void) #define DO_TEST_BHYVE(Name, Emulator, BhyveCaps, Type) \ do { \ char *name = NULL; \ - virAsprintf(&name, "bhyve_%s.x86_64", Name); \ + name = g_strdup_printf("bhyve_%s.x86_64", Name); \ struct testData data = { \ .name = name, \ .emulator = Emulator, \ diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 3de6e7740e..f48c3ca682 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -46,8 +46,8 @@ static int testGetFilesystem(const void *opaque) const struct testGetFilesystemData *data = opaque; virDomainFSDefPtr fsdef; - virAsprintf(&filename, "%s/domainconfdata/%s.xml", abs_srcdir, - data->filename); + filename = g_strdup_printf("%s/domainconfdata/%s.xml", abs_srcdir, + data->filename); if (!(def = virDomainDefParseFile(filename, caps, xmlopt, NULL, 0))) goto cleanup; diff --git a/tests/fchosttest.c b/tests/fchosttest.c index fe4f255fe1..44e7f11599 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -343,7 +343,7 @@ mymain(void) { int ret = 0; - virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/"); + fchost_prefix = g_strdup_printf("%s/%s", abs_srcdir, "fchostdata/fc_host/"); if (virTestRun("virVHBAPathExists", test1, NULL) < 0) ret = -1; diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 4acc97967e..f4d38d5a20 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -62,7 +62,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; - virAsprintf(&file, "%s/input.data", scratchdir); + file = g_strdup_printf("%s/input.data", scratchdir); if ((fd = open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) goto cleanup; @@ -193,7 +193,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; - virAsprintf(&file, "%s/input.data", scratchdir); + file = g_strdup_printf("%s/input.data", scratchdir); if (!(st = virStreamNew(conn, flags))) goto cleanup; diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 7b59749d01..0d04413712 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -29,10 +29,10 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out = NULL; int ret = -1; - virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", - abs_srcdir, info->name); + xml_in = g_strdup_printf("%s/genericxml2xmlindata/%s.xml", + abs_srcdir, info->name); + xml_out = g_strdup_printf("%s/genericxml2xmloutdata/%s.xml", + abs_srcdir, info->name); ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index c7de2e4bd0..f9740d1cf3 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -50,8 +50,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", abs_srcdir, - (const char *)data); + xml = g_strdup_printf("%s/interfaceschemadata/%s.xml", abs_srcdir, + (const char *)data); result = testCompareXMLToXMLFiles(xml); diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index efd003eb58..5bda6db360 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -151,8 +151,8 @@ testCompareXMLToDomConfigHelper(const void *data) char *xmlfile = NULL; char *jsonfile = NULL; - virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); - virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); + xmlfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); + jsonfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); ret = testCompareXMLToDomConfig(xmlfile, jsonfile); diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index f2d884dc15..c52c6e7fd7 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -71,10 +71,10 @@ testCompareXMLToConfigHelperLegacy(const void *data) char *xml = NULL; char *config = NULL; - virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name); - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", - abs_srcdir, info->name); + xml = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.config", + abs_srcdir, info->name); result = testCompareXMLToConfigFiles(xml, config, info->expectError); @@ -91,10 +91,10 @@ testCompareXMLToConfigHelperV3(const void *data) char *xml = NULL; char *config = NULL; - virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name); - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", - abs_srcdir, info->name); + xml = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", + abs_srcdir, info->name); result = testCompareXMLToConfigFiles(xml, config, info->expectError); diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index ded35f8d4b..6a720503a9 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -34,10 +34,10 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out = NULL; int ret = -1; - virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", - abs_srcdir, info->name); - virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", - abs_srcdir, info->name); + xml_in = g_strdup_printf("%s/lxcxml2xmldata/lxc-%s.xml", + abs_srcdir, info->name); + xml_out = g_strdup_printf("%s/lxcxml2xmloutdata/lxc-%s.xml", + abs_srcdir, info->name); ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 9992afaf62..a8355272b9 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -86,8 +86,8 @@ testCompareXMLToConfHelper(const void *data) char *inxml = NULL; char *outconf = NULL; - virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info->name); - virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", abs_srcdir, info->name); + inxml = g_strdup_printf("%s/networkxml2confdata/%s.xml", abs_srcdir, info->name); + outconf = g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcdir, info->name); result = testCompareXMLToConfFiles(inxml, outconf, info->caps); diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 0aaebf5bc6..831b7630d4 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -117,10 +117,10 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml = NULL; char *args = NULL; - virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE); + xml = g_strdup_printf("%s/networkxml2firewalldata/%s.xml", + abs_srcdir, info->name); + args = g_strdup_printf("%s/networkxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); result = testCompareXMLToArgvFiles(xml, args, info->baseargs); @@ -167,7 +167,7 @@ mymain(void) goto cleanup; } - virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_srcdir); + basefile = g_strdup_printf("%s/networkxml2firewalldata/base.args", abs_srcdir); if (virTestLoadFile(basefile, &baseargs) < 0) { ret = -1; diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 64aada5f34..f784b90c69 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -90,8 +90,8 @@ testCompareXMLToXMLHelper(const void *data) char *inxml = NULL; char *outxml = NULL; - virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", abs_srcdir, info->name); - virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", abs_srcdir, info->name); + inxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, info->name); + outxml = g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, info->name); result = testCompareXMLToXMLFiles(inxml, outxml, info->flags, info->expectResult); diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index a76498c085..00d867fbc2 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -82,12 +82,12 @@ testCompareXMLToXMLHelper(const void *data) char *updatexml = NULL; char *outxml = NULL; - virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->netxml); - virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", - abs_srcdir, info->updatexml); - virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", - abs_srcdir, info->outxml); + netxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", + abs_srcdir, info->netxml); + updatexml = g_strdup_printf("%s/networkxml2xmlupdatein/%s.xml", + abs_srcdir, info->updatexml); + outxml = g_strdup_printf("%s/networkxml2xmlupdateout/%s.xml", + abs_srcdir, info->outxml); result = testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, info->command, info->section, diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index e8b869526d..6168c29c70 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -72,8 +72,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", abs_srcdir, - (const char *)data); + xml = g_strdup_printf("%s/nodedevschemadata/%s.xml", abs_srcdir, + (const char *)data); result = testCompareXMLToXMLFiles(xml); diff --git a/tests/nssmock.c b/tests/nssmock.c index 8d707a64a5..62e8fa372a 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,9 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - virAsprintf(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)); + *newpath = g_strdup_printf("%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath = g_strdup(path); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 95b6b24014..2f92885d0f 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -243,8 +243,8 @@ virNWFilterIncludeDefToRuleInst(virNWFilterIncludeDefPtr inc, int ret = -1; char *xml; - virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, - inc->filterref); + xml = g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, + inc->filterref); /* create a temporary hashmap for depth-first tree traversal */ if (!(tmpvars = virNWFilterCreateVarsFrom(inc->params, @@ -428,10 +428,10 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml = NULL; char *args = NULL; - virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE); + xml = g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", + abs_srcdir, info->name); + args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); result = testCompareXMLToArgvFiles(xml, args); diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 344dd68bc5..52a4af12cc 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -62,8 +62,8 @@ testCompareXMLToXMLHelper(const void *data) char *inxml = NULL; char *outxml = NULL; - virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->name); - virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->name); + inxml = g_strdup_printf("%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->name); + outxml = g_strdup_printf("%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->name); result = testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 9287dc3c79..83969197c6 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -17,7 +17,7 @@ static int testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, const char *ext G_GNUC_UNUSED) { - virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + *conffile = g_strdup_printf("%s/openvzutilstest.conf", abs_srcdir); return 0; } @@ -41,7 +41,7 @@ testReadConfigParam(const void *data G_GNUC_UNUSED) char *conf = NULL; char *value = NULL; - virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir); + conf = g_strdup_printf("%s/openvzutilstest.conf", abs_srcdir); for (i = 0; i < G_N_ELEMENTS(configParams); ++i) { if (openvzReadConfigParam(conf, configParams[i].param, diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 65fb937901..f9f0930a33 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -183,7 +183,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlopt, if (!(ret_test = qemuMonitorTestNewAgent(xmlopt))) return -1; - virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", abs_srcdir); + domain_filename = g_strdup_printf("%s/qemuagentdata/fsinfo.xml", abs_srcdir); if (!(ret_def = virDomainDefParseFile(domain_filename, driver.caps, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0c7c6ed4fa..0f1bf68315 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -82,7 +82,7 @@ testBackingXMLjsonXML(const void *args) if (!(propsstr = virJSONValueToString(wrapper, false))) return -1; - virAsprintf(&protocolwrapper, "json:%s", propsstr); + protocolwrapper = g_strdup_printf("json:%s", propsstr); if (virStorageSourceNewFromBackingAbsolute(protocolwrapper, &jsonsrc) < 0) { @@ -162,8 +162,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr src) srcpriv->secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; srcpriv->secinfo->s.aes.username = g_strdup(src->auth->username); - virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", - NULLSTR(src->nodestorage)); + srcpriv->secinfo->s.aes.alias = g_strdup_printf("%s-secalias", + NULLSTR(src->nodestorage)); } if (src->encryption) { @@ -171,8 +171,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr src) return -1; srcpriv->encinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; - virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", - NULLSTR(src->nodeformat)); + srcpriv->encinfo->s.aes.alias = g_strdup_printf("%s-encalias", + NULLSTR(src->nodeformat)); } return 0; @@ -194,7 +194,7 @@ testQemuDiskXMLToProps(const void *opaque) char *xmlstr = NULL; int ret = -1; - virAsprintf(&xmlpath, "%s%s.xml", testQemuDiskXMLToJSONPath, data->name); + xmlpath = g_strdup_printf("%s%s.xml", testQemuDiskXMLToJSONPath, data->name); if (virTestLoadFile(xmlpath, &xmlstr) < 0) goto cleanup; @@ -311,7 +311,7 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque) if (data->fail) return EXIT_AM_SKIP; - virAsprintf(&jsonpath, "%s%s.json", testQemuDiskXMLToJSONPath, data->name); + jsonpath = g_strdup_printf("%s%s.json", testQemuDiskXMLToJSONPath, data->name); for (i = 0; i < data->nprops; i++) { char *jsonstr; @@ -360,7 +360,7 @@ testQemuImageCreateLoadDiskXML(const char *name, g_autofree char *xmlpath = NULL; virStorageSourcePtr ret = NULL; - virAsprintf(&xmlpath, "%s%s.xml", testQemuImageCreatePath, name); + xmlpath = g_strdup_printf("%s%s.xml", testQemuImageCreatePath, name); if (!(doc = virXMLParseFileCtxt(xmlpath, &ctxt))) return NULL; @@ -456,7 +456,7 @@ testQemuImageCreate(const void *opaque) virBufferTrim(&actualbuf, "\n", -1); virBufferAddLit(&actualbuf, "\n"); - virAsprintf(&jsonpath, "%s%s.json", testQemuImageCreatePath, data->name); + jsonpath = g_strdup_printf("%s%s.json", testQemuImageCreatePath, data->name); if (!(actual = virBufferContentAndReset(&actualbuf))) return -1; @@ -477,8 +477,8 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) if (data->fail) return EXIT_AM_SKIP; - virAsprintf(&jsonpath, "%s%s-srconly.json", testQemuDiskXMLToJSONPath, - data->name); + jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath, + data->name); for (i = 0; i < data->npropssrc; i++) { g_autofree char *jsonstr = NULL; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index cf1e86c893..f62f147e64 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -76,10 +76,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion = 0; const char *p; - virAsprintf(&repliesFile, "%s/%s.%s.replies", - data->dataDir, data->base, data->archName); - virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName); + repliesFile = g_strdup_printf("%s/%s.%s.replies", + data->dataDir, data->base, data->archName); + capsFile = g_strdup_printf("%s/%s.%s.xml", + data->dataDir, data->base, data->archName); if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL, NULL))) @@ -144,8 +144,8 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy = NULL; char *actual = NULL; - virAsprintf(&capsFile, "%s/%s.%s.xml", data->dataDir, data->base, - data->archName); + capsFile = g_strdup_printf("%s/%s.%s.xml", data->dataDir, data->base, + data->archName); if (!(caps = virCapabilitiesNew(virArchFromString(data->archName), false, false))) @@ -184,8 +184,8 @@ doCapsTest(const char *base, g_autofree char *title = NULL; g_autofree char *copyTitle = NULL; - virAsprintf(&title, "%s (%s)", base, archName); - virAsprintf(©Title, "copy %s (%s)", base, archName); + title = g_strdup_printf("%s (%s)", base, archName); + copyTitle = g_strdup_printf("copy %s (%s)", base, archName); data->base = base; data->archName = archName; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f46b056c18..ea8735df36 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -102,7 +102,7 @@ testGetCaps(char *capsData, const testQemuData *data) virArch arch = virArchFromString(data->archName); g_autofree char *binary = NULL; - virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName); + binary = g_strdup_printf("/usr/bin/qemu-system-%s", data->archName); if ((qemuCaps = testQemuGetCaps(capsData)) == NULL) { fprintf(stderr, "failed to parse qemu capabilities flags"); @@ -141,10 +141,10 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - virAsprintf(&xmlFile, "%s/caps.%s.xml", data->outputDir, data->archName); + xmlFile = g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->archName); - virAsprintf(&capsFile, "%s/%s.%s.xml", data->inputDir, data->base, - data->archName); + capsFile = g_strdup_printf("%s/%s.%s.xml", data->inputDir, data->base, + data->archName); if (virTestLoadFile(capsFile, &capsData) < 0) goto cleanup; @@ -177,7 +177,7 @@ doCapsTest(const char *base, testQemuDataPtr data = (testQemuDataPtr) opaque; g_autofree char *title = NULL; - virAsprintf(&title, "%s (%s)", base, archName); + title = g_strdup_printf("%s (%s)", base, archName); data->base = base; data->archName = archName; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index 7f393d68a8..49e8cddeb3 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -121,7 +121,7 @@ testCheckpointPostParse(virDomainMomentDefPtr def) return -1; def->creationTime = mocktime; if (!def->name) - virAsprintf(&def->name, "%lld", def->creationTime); + def->name = g_strdup_printf("%lld", def->creationTime); return 0; } diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index 0a3aaac6cf..fd3bb04e26 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -106,7 +106,7 @@ testSnapshotPostParse(virDomainMomentDefPtr def) return -1; def->creationTime = mocktime; if (!def->name) - virAsprintf(&def->name, "%lld", def->creationTime); + def->name = g_strdup_printf("%lld", def->creationTime); return 0; } diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 01d4ebc26f..906d594ace 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -24,7 +24,7 @@ testParseFormatFW(const void *opaque) g_autofree char *expected = NULL; g_autofree char *actual = NULL; - virAsprintf(&path, "%s/qemufirmwaredata/%s", abs_srcdir, filename); + path = g_strdup_printf("%s/qemufirmwaredata/%s", abs_srcdir, filename); if (!(fw = qemuFirmwareParse(path))) return -1; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 04dc347fd8..a78f97d2ae 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -245,14 +245,14 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon = NULL; qemuDomainObjPrivatePtr priv = NULL; - virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%s.xml", - abs_srcdir, test->domain_filename); - virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%s.xml", - abs_srcdir, test->device_filename); - virAsprintf(&result_filename, - "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", - abs_srcdir, test->domain_filename, - test->device_filename); + domain_filename = g_strdup_printf("%s/qemuhotplugtestdomains/qemuhotplug-%s.xml", + abs_srcdir, test->domain_filename); + device_filename = g_strdup_printf("%s/qemuhotplugtestdevices/qemuhotplug-%s.xml", + abs_srcdir, test->device_filename); + result_filename = g_strdup_printf( + "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", + abs_srcdir, test->domain_filename, + test->device_filename); if (virTestLoadFile(domain_filename, &domain_xml) < 0 || virTestLoadFile(device_filename, &device_xml) < 0) @@ -408,17 +408,17 @@ testQemuHotplugCpuPrepare(const char *test, char *prefix = NULL; struct testQemuHotplugCpuData *data = NULL; - virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test); + prefix = g_strdup_printf("%s/qemuhotplugtestcpus/%s", abs_srcdir, test); if (VIR_ALLOC(data) < 0) goto error; data->modern = modern; - virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix); - virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix); - virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix); - virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix); + data->file_xml_dom = g_strdup_printf("%s-domain.xml", prefix); + data->file_xml_res_live = g_strdup_printf("%s-result-live.xml", prefix); + data->file_xml_res_conf = g_strdup_printf("%s-result-conf.xml", prefix); + data->file_json_monitor = g_strdup_printf("%s-monitor.json", prefix); if (virTestLoadFile(data->file_xml_dom, &data->xml_dom) < 0) goto error; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 8e395759e1..d5a4fb1268 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -34,8 +34,8 @@ testCompareMemLock(const void *data) char *xml = NULL; int ret = -1; - virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", abs_srcdir, - info->name); + xml = g_strdup_printf("%s/qemumemlockdata/qemumemlock-%s.xml", abs_srcdir, + info->name); if (!(def = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index ded3a8ef64..b36aa60302 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -66,8 +66,8 @@ qemuMigParamsTestXML2XML(const void *opaque) char *actualXML = NULL; int ret = -1; - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", abs_srcdir, - data->name); + xmlFile = g_strdup_printf("%s/qemumigparamsdata/%s.xml", abs_srcdir, + data->name); if (!(doc = virXMLParseFileCtxt(xmlFile, &ctxt))) goto cleanup; @@ -109,10 +109,10 @@ qemuMigParamsTestXML(const void *opaque) char *actualXML = NULL; int ret = -1; - virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name); - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name); + replyFile = g_strdup_printf("%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + xmlFile = g_strdup_printf("%s/qemumigparamsdata/%s.xml", + abs_srcdir, data->name); if (!(mon = qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true))) goto cleanup; @@ -159,10 +159,10 @@ qemuMigParamsTestJSON(const void *opaque) char *actualJSON = NULL; int ret = -1; - virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name); - virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", - abs_srcdir, data->name); + replyFile = g_strdup_printf("%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + jsonFile = g_strdup_printf("%s/qemumigparamsdata/%s.json", + abs_srcdir, data->name); if (!(mon = qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true))) goto cleanup; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index c87f7db2e0..2420ac8e18 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -796,9 +796,9 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, if (!reply) reply = ""; - virAsprintf(&jsonreply, "{\"return\": {%s}}", reply); + jsonreply = g_strdup_printf("{\"return\": {%s}}", reply); - virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", label); + fulllabel = g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", label); data.chr = chr; data.fail = fail; @@ -2457,12 +2457,12 @@ testQemuMonitorJSONGetCPUData(const void *opaque) if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; - virAsprintf(&jsonFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", - abs_srcdir, data->name); - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", - abs_srcdir, data->name); + jsonFile = g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", + abs_srcdir, data->name); + dataFile = g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", + abs_srcdir, data->name); if (virTestLoadFile(jsonFile, &jsonStr) < 0) goto cleanup; @@ -2709,15 +2709,15 @@ testQemuMonitorCPUInfo(const void *opaque) if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; - virAsprintf(&queryCpusFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.json", - abs_srcdir, data->name); - virAsprintf(&queryHotpluggableFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug.json", - abs_srcdir, data->name); - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", - abs_srcdir, data->name); + queryCpusFile = g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.json", + abs_srcdir, data->name); + queryHotpluggableFile = g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug.json", + abs_srcdir, data->name); + dataFile = g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", + abs_srcdir, data->name); if (virTestLoadFile(queryCpusFile, &queryCpusStr) < 0) goto cleanup; @@ -2812,8 +2812,8 @@ testBlockNodeNameDetect(const void *opaque) virBuffer buf = VIR_BUFFER_INITIALIZER; int ret = -1; - virAsprintf(&resultFile, "%s/%s%s.result", abs_srcdir, pathprefix, - testname); + resultFile = g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefix, + testname); if (!(namedNodesJson = virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) @@ -2956,12 +2956,12 @@ testQueryJobs(const void *opaque) if (!test) return -1; - virAsprintf(&filenameJSON, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", - data->name); - virAsprintf(&filenameResult, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", - data->name); + filenameJSON = g_strdup_printf( + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", + data->name); + filenameResult = g_strdup_printf( + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", + data->name); if (virTestLoadFile(filenameJSON, &fileJSON) < 0) goto cleanup; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index b7625bb157..3c93468a4e 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -145,8 +145,8 @@ qemuMonitorTestAddErrorResponse(qemuMonitorTestPtr test, } /* format the JSON error message */ - virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", escapemsg); + jsonmsg = g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", escapemsg); return qemuMonitorTestAddResponse(test, jsonmsg); } @@ -158,7 +158,7 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test, { g_autofree char *msg = NULL; - virAsprintf(&msg, "unexpected command: '%s'", command); + msg = g_strdup_printf("unexpected command: '%s'", command); return qemuMonitorTestAddErrorResponse(test, msg); } @@ -171,8 +171,8 @@ qemuMonitorTestAddInvalidCommandResponse(qemuMonitorTestPtr test, { g_autofree char *msg = NULL; - virAsprintf(&msg, "expected command '%s' got '%s'", expectedcommand, - actualcommand); + msg = g_strdup_printf("expected command '%s' got '%s'", expectedcommand, + actualcommand); return qemuMonitorTestAddErrorResponse(test, msg); } @@ -191,8 +191,8 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) if (virVasprintf(&msg, errmsg, msgargs) < 0) goto cleanup; - virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", msg); + jsonmsg = g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", msg); ret = qemuMonitorTestAddResponse(test, jsonmsg); @@ -522,7 +522,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test, if (STREQ(cmdname, "device_add")) return 0; - virAsprintf(&schemapath, "%s/arg-type", cmdname); + schemapath = g_strdup_printf("%s/arg-type", cmdname); if (virQEMUQAPISchemaPathGet(schemapath, test->qapischema, &schemaroot) < 0 || !schemaroot) { @@ -640,7 +640,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test, ret = qemuMonitorTestAddResponse(test, data->response); } else { if (data->cmderr) { - virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr); + errmsg = g_strdup_printf("%s: %s", data->cmderr, cmdstr); ret = qemuMonitorTestAddErrorResponse(test, errmsg); } else { @@ -731,7 +731,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, goto cleanup; } - virAsprintf(&retmsg, "{\"return\":%llu}", id); + retmsg = g_strdup_printf("{\"return\":%llu}", id); ret = qemuMonitorTestAddResponse(test, retmsg); @@ -1057,7 +1057,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, tmpdir_template = NULL; - virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir); + path = g_strdup_printf("%s/qemumonitorjsontest.sock", test->tmpdir); if (vm) { test->vm = virObjectRef(vm); @@ -1285,7 +1285,7 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test, char *cmderr; int ret; - virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", filename, line); + cmderr = g_strdup_printf("wrong expected command in %s:%zu: ", filename, line); ret = qemuMonitorTestAddItemVerbatim(test, command, cmderr, response); diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 63bcae0f27..ad182c7bf7 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -117,7 +117,7 @@ get_key(const char *path, { char *ret; - virAsprintf(&ret, "%s:%s", path, name); + ret = g_strdup_printf("%s:%s", path, name); return ret; } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index e8ebbf36d8..685ac4dca2 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -45,7 +45,7 @@ prepareObjects(virQEMUDriverPtr driver, g_autofree char *domxml = NULL; g_autofree char *latestCapsFile = NULL; - virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname); + filename = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname); if (virTestLoadFile(filename, &domxml) < 0) return -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 903e6631dc..cc1e523841 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -24,7 +24,7 @@ testParseFormatVU(const void *opaque) g_autofree char *expected = NULL; g_autofree char *actual = NULL; - virAsprintf(&path, "%s/qemuvhostuserdata/%s", abs_srcdir, filename); + path = g_strdup_printf("%s/qemuvhostuserdata/%s", abs_srcdir, filename); if (!(vu = qemuVhostUserParse(path))) return -1; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 39bc3b0aef..1aca59a3e3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -106,8 +106,8 @@ fakeStoragePoolLookupByName(virConnectPtr conn, virStoragePoolPtr ret = NULL; if (STRNEQ(name, "inactive")) { - virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, - STORAGE_POOL_XML_PATH, name); + xmlpath = g_strdup_printf("%s/%s%s.xml", abs_srcdir, + STORAGE_POOL_XML_PATH, name); if (!virFileExists(xmlpath)) { virReportError(VIR_ERR_NO_STORAGE_POOL, @@ -187,7 +187,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) { char *ret = NULL; - virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name); + ret = g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); return ret; } @@ -205,8 +205,8 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, return NULL; } - virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XML_PATH, - pool->name); + xmlpath = g_strdup_printf("%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XML_PATH, + pool->name); if (virTestLoadFile(xmlpath, &xmlbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -592,10 +592,10 @@ static void testInfoSetPaths(struct testQemuInfo *info, const char *suffix) { - virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", - abs_srcdir, info->name, suffix ? suffix : ""); + info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", + abs_srcdir, info->name); + info->outfile = g_strdup_printf("%s/qemuxml2argvdata/%s%s.args", + abs_srcdir, info->name, suffix ? suffix : ""); } # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 679b882704..02bbc504ae 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,18 +98,18 @@ testInfoSetPaths(struct testQemuInfo *info, VIR_FREE(info->infile); VIR_FREE(info->outfile); - virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, - info->name); + info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, + info->name); - virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s-%s%s.xml", - abs_srcdir, info->name, - when == WHEN_ACTIVE ? "active" : "inactive", suffix); + info->outfile = g_strdup_printf("%s/qemuxml2xmloutdata/%s-%s%s.xml", + abs_srcdir, info->name, + when == WHEN_ACTIVE ? "active" : "inactive", suffix); if (!virFileExists(info->outfile)) { VIR_FREE(info->outfile); - virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s%s.xml", - abs_srcdir, info->name, suffix); + info->outfile = g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml", + abs_srcdir, info->name, suffix); } return 0; @@ -121,8 +121,8 @@ static const char *statusPath = abs_srcdir "/qemustatusxml2xmldata/"; static void testInfoSetStatusPaths(struct testQemuInfo *info) { - virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name); - virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name); + info->infile = g_strdup_printf("%s%s-in.xml", statusPath, info->name); + info->outfile = g_strdup_printf("%s%s-out.xml", statusPath, info->name); } diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 947a81560a..b35ec6980a 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,10 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *devicepath, int ret = -1; int fd = -1; - virAsprintf(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", - fakesysfsdir, devicepath); - virAsprintf(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname); + unique_id_path = g_strdup_printf("%s/devices/pci0000:00/%s/unique_id", + fakesysfsdir, devicepath); + link_path = g_strdup_printf("%s/class/scsi_host/%s", + fakesysfsdir, hostname); /* Rather than create path & file, temporarily snip off the file to * create the path @@ -205,7 +205,7 @@ testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) char *ret_host = NULL; int ret = -1; - virAsprintf(&path_addr, "%s/%s", abs_srcdir, "sysfs/class/scsi_host"); + path_addr = g_strdup_printf("%s/%s", abs_srcdir, "sysfs/class/scsi_host"); if (!(ret_host = virSCSIHostFindByPCI(TEST_SCSIHOST_CLASS_PATH, pci_addr1, unique_id1)) || @@ -255,14 +255,14 @@ mymain(void) goto cleanup; } - virAsprintf(&fakesysfsdir, "%s/sys", fakerootdir); + fakesysfsdir = g_strdup_printf("%s/sys", fakerootdir); if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs='%s'\n", fakesysfsdir); goto cleanup; } - virAsprintf(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); + scsihost_class_path = g_strdup_printf("%s/class/scsi_host", fakesysfsdir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 44f4615be8..9eb3c460e7 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -44,11 +44,11 @@ testCompareXMLToXMLHelper(const void *data) char *outxml = NULL; const struct testInfo *info = data; - virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", abs_srcdir, info->name); - virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", - abs_srcdir, - info->different ? "out" : "in", - info->name); + inxml = g_strdup_printf("%s/secretxml2xmlin/%s.xml", abs_srcdir, info->name); + outxml = g_strdup_printf("%s/secretxml2xml%s/%s.xml", + abs_srcdir, + info->different ? "out" : "in", + info->name); result = testCompareXMLToXMLFiles(inxml, outxml); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index cc0de456cd..703052418c 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -60,7 +60,7 @@ testUserXattrEnabled(void) ssize_t len; const char *con_value = "system_u:object_r:svirt_image_t:s0:c41,c264"; char *path = NULL; - virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", abs_builddir); + path = g_strdup_printf("%s/securityselinuxlabeldata/testxattr", abs_builddir); if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0 || virFileTouch(path, 0600) < 0) @@ -88,7 +88,7 @@ testSELinuxMungePath(char **path) { char *tmp; - virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", abs_builddir, *path); + tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, *path); VIR_FREE(*path); *path = tmp; @@ -108,8 +108,8 @@ testSELinuxLoadFileList(const char *testname, *files = NULL; *nfiles = 0; - virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", abs_srcdir, - testname); + path = g_strdup_printf("%s/securityselinuxlabeldata/%s.txt", abs_srcdir, + testname); if (!(fp = fopen(path, "r"))) goto cleanup; @@ -135,8 +135,8 @@ testSELinuxLoadFileList(const char *testname, *tmp = '\0'; tmp++; - virAsprintf(&file, "%s/securityselinuxlabeldata%s", abs_builddir, - line); + file = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, + line); if (*tmp != '\0' && *tmp != '\n') { context = g_strdup(tmp); @@ -172,8 +172,8 @@ testSELinuxLoadDef(const char *testname) virDomainDefPtr def = NULL; size_t i; - virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", abs_srcdir, - testname); + xmlfile = g_strdup_printf("%s/securityselinuxlabeldata/%s.xml", abs_srcdir, + testname); if (!(def = virDomainDefParseFile(xmlfile, driver.caps, driver.xmlopt, NULL, 0))) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 7d50b1a303..c7dabd976b 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -158,11 +158,11 @@ mymain(void) collie_test *test = node_info_tests; - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", - abs_srcdir); + poolxml = g_strdup_printf("%s/storagepoolxml2xmlin/pool-sheepdog.xml", + abs_srcdir); - virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", - abs_srcdir); + volxml = g_strdup_printf("%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir); #define DO_TEST_NODE(collie) \ do { \ diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 5f66a67da6..28b9f7d90a 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -62,8 +62,8 @@ test_virStoragePoolCapsFormat(const void *opaque) if (!(poolCaps = virStoragePoolCapsNew(driverCaps))) return -1; - virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", - abs_srcdir, data->filename); + path = g_strdup_printf("%s/storagepoolcapsschemadata/poolcaps-%s.xml", + abs_srcdir, data->filename); if (!(poolCapsXML = virStoragePoolCapsFormat(poolCaps))) return -1; diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 50b79b4625..967d1f21a8 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -108,11 +108,11 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *poolxml = NULL; g_autofree char *cmdline = NULL; - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, - info->pool); + poolxml = g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, + info->pool); - virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", - abs_srcdir, info->pool, info->platformSuffix); + cmdline = g_strdup_printf("%s/storagepoolxml2argvdata/%s%s.argv", + abs_srcdir, info->pool, info->platformSuffix); return testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline); } diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index e4c78d3fd5..382a7c659f 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -39,10 +39,10 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; - virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, (const char*)data); - virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", - abs_srcdir, (const char*)data); + inxml = g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, (const char*)data); + outxml = g_strdup_printf("%s/storagepoolxml2xmlout/%s.xml", + abs_srcdir, (const char*)data); return testCompareXMLToXMLFiles(inxml, outxml); } diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 833000a636..1832690e29 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -113,7 +113,7 @@ testCompareXMLToArgvFiles(bool shouldFail, if (!(cvtCmdline = virCommandToString(cmd, false))) goto cleanup; - virAsprintf(&actualCmdline, "%s\n%s", createCmdline, cvtCmdline); + actualCmdline = g_strdup_printf("%s\n%s", createCmdline, cvtCmdline); VIR_FREE(createCmdline); } @@ -159,17 +159,17 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *cmdline = NULL; if (info->inputvol) - virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->inputvol); + inputvolxml = g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->inputvol); if (info->inputpool) - virAsprintf(&inputpoolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->inputpool); - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool); - virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->vol); - virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", - abs_srcdir, info->cmdline); + inputpoolxml = g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->inputpool); + poolxml = g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + volxml = g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->vol); + cmdline = g_strdup_printf("%s/storagevolxml2argvdata/%s.argv", + abs_srcdir, info->cmdline); return testCompareXMLToArgvFiles(info->shouldFail, poolxml, volxml, inputpoolxml, inputvolxml, diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 4e92d2818c..c65296c7eb 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -50,12 +50,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool); - virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->name); - virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", - abs_srcdir, info->name); + poolxml = g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + inxml = g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->name); + outxml = g_strdup_printf("%s/storagevolxml2xmlout/%s.xml", + abs_srcdir, info->name); return testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); } diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 4167d4baee..a8a0d0869e 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -91,13 +91,13 @@ sysinfotest_run(const char *test, testdata.func = func; if (decoder) - virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder); + testdata.decoder = g_strdup_printf("%s/%s", abs_srcdir, decoder); if (sysinfo) - virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo); + testdata.sysinfo = g_strdup_printf("%s/%s", abs_srcdir, sysinfo); if (cpuinfo) - virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo); + testdata.cpuinfo = g_strdup_printf("%s/%s", abs_srcdir, cpuinfo); if (expected) - virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected); + testdata.expected = g_strdup_printf("%s/%s", abs_srcdir, expected); if (virTestRun(test, testSysinfo, &testdata) < 0) goto error; diff --git a/tests/testutils.c b/tests/testutils.c index 3ae66d3007..3116b1c5b9 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -404,7 +404,7 @@ virTestRewrapFile(const char *filename) return -1; } - virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir); + script = g_strdup_printf("%s/test-wrap-argv.pl", abs_srcdir); cmd = virCommandNewArgList(perl, script, "--in-place", filename, NULL); if (virCommandRun(cmd, NULL) < 0) @@ -663,7 +663,7 @@ virTestCompareToFile(const char *actual, if (filecontentLen > 0 && filecontent[filecontentLen - 1] == '\n' && (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) { - virAsprintf(&fixedcontent, "%s\n", cmpcontent); + fixedcontent = g_strdup_printf("%s\n", cmpcontent); cmpcontent = fixedcontent; } } @@ -689,9 +689,9 @@ virTestCompareToULL(unsigned long long expect, g_autofree char *expectStr = NULL; g_autofree char *actualStr = NULL; - virAsprintf(&expectStr, "%llu", expect); + expectStr = g_strdup_printf("%llu", expect); - virAsprintf(&actualStr, "%llu", actual); + actualStr = g_strdup_printf("%llu", actual); return virTestCompareToString(expectStr, actualStr); } @@ -809,7 +809,7 @@ virTestSetEnvPath(void) if (path) { if (strstr(path, abs_builddir) != path) - virAsprintf(&new_path, "%s:%s", abs_builddir, path); + new_path = g_strdup_printf("%s:%s", abs_builddir, path); } else { new_path = g_strdup(abs_builddir); } diff --git a/tests/testutils.h b/tests/testutils.h index 36d2d5ba04..0088251dca 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -138,7 +138,7 @@ int virTestMain(int argc, if (!preload) { \ newenv = (char *) lib; \ } else { \ - virAsprintf(&newenv, "%s:%s", lib, preload); \ + newenv = g_strdup_printf("%s:%s", lib, preload); \ } \ setenv(PRELOAD_VAR, newenv, 1); \ FORCE_FLAT_NAMESPACE \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 3b656cdd1e..fa73e18cb5 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -809,7 +809,7 @@ testQemuGetLatestCapsForArch(const char *arch, const char *maxname = NULL; char *ret = NULL; - virAsprintf(&fullsuffix, "%s.%s", arch, suffix); + fullsuffix = g_strdup_printf("%s.%s", arch, suffix); if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; @@ -845,7 +845,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; } - virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname); + ret = g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); cleanup: VIR_FREE(tmp); @@ -1042,8 +1042,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (STREQ(capsver, "latest")) { capsfile = g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases = true; - } else virAsprintf(&capsfile, "%s/caps_%s.%s.xml", - TEST_QEMU_CAPS_PATH, capsver, capsarch); + } else capsfile = g_strdup_printf("%s/caps_%s.%s.xml", + TEST_QEMU_CAPS_PATH, capsver, capsarch); if (!(qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(capsarch), capsfile))) { diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index fdc2c92719..db3ef3d550 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -104,8 +104,8 @@ testCompareXMLToXMLHelper(const void *data) int result = -1; char *xml = NULL; - virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, - (const char *)data); + xml = g_strdup_printf("%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, + (const char *)data); result = testCompareXMLtoXMLFiles(xml); diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 6bbd6545ac..9d69809268 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -31,7 +31,7 @@ static int testBufInfiniteLoop(const void *data) * This test is a bit fragile, since it relies on virBuffer internals. */ len = buf->size - buf->use - 1; - virAsprintf(&addstr, "%*s", len, "a"); + addstr = g_strdup_printf("%*s", len, "a"); if (info->doEscape) virBufferEscapeString(buf, "%s", addstr); diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index c0a1ef2e2b..32c8f95303 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -45,11 +45,11 @@ test_virCapabilities(const void *opaque) char *resctrl = NULL; int ret = -1; - virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, - data->filename); + system = g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_srcdir, + data->filename); - virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, - data->filename); + resctrl = g_strdup_printf("%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, + data->filename); virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); @@ -67,8 +67,8 @@ test_virCapabilities(const void *opaque) if (!(capsXML = virCapabilitiesFormatXML(caps))) goto cleanup; - virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir, - archStr, data->filename); + path = g_strdup_printf("%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir, + archStr, data->filename); if (virTestCompareToFile(capsXML, path) < 0) goto cleanup; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 1735852f39..3168b689f2 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,8 +376,8 @@ static void init_sysfs(void) VIR_FREE(fakesysfscgroupdir); - virAsprintf(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX); + fakesysfscgroupdir = g_strdup_printf("%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -458,8 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno = EACCES; return NULL; } - virAsprintf(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type); + filepath = g_strdup_printf("%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc = real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 224e8116dd..07f53f1857 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -189,7 +189,7 @@ testCgroupDetectMounts(const void *args) setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); - virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, data->file); + parsed = g_strdup_printf("%s/vircgroupdata/%s.parsed", abs_srcdir, data->file); if (virCgroupNewSelf(&group) < 0) { if (data->fail) diff --git a/tests/virconftest.c b/tests/virconftest.c index c6d8ff2272..83077342a9 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -39,8 +39,8 @@ static int testConfRoundTrip(const void *opaque) char *srcfile = NULL; char *dstfile = NULL; - virAsprintf(&srcfile, "%s/virconfdata/%s.conf", abs_srcdir, name); - virAsprintf(&dstfile, "%s/virconfdata/%s.out", abs_srcdir, name); + srcfile = g_strdup_printf("%s/virconfdata/%s.conf", abs_srcdir, name); + dstfile = g_strdup_printf("%s/virconfdata/%s.out", abs_srcdir, name); if (VIR_ALLOC_N_QUIET(buffer, len) < 0) { fprintf(stderr, "out of memory\n"); diff --git a/tests/virfilemock.c b/tests/virfilemock.c index bb5fcc2ed8..65685c6d26 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; if ((p = STRSKIP(path, "/some/symlink"))) - virAsprintf(&ret, "/gluster%s", p); + ret = g_strdup_printf("/gluster%s", p); else ret = g_strdup(path); diff --git a/tests/virfiletest.c b/tests/virfiletest.c index ba947129be..c7d5f6abeb 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -325,7 +325,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) bool actual; int ret = -1; - virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile); + mtabFile = g_strdup_printf(abs_srcdir "/virfiledata/%s", data->mtabFile); if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) { fprintf(stderr, "Unable to set env variable\n"); diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index e3d3c225ad..0500a3617e 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,7 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; - virAsprintf(newpath, "%s%s", overrides[i], tmp); + *newpath = g_strdup_printf("%s%s", overrides[i], tmp); break; } diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 7b1b1a6d89..01ba745338 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -55,12 +55,12 @@ linuxTestCompareFiles(const char *cpuinfofile, } VIR_FORCE_FCLOSE(cpuinfo); - virAsprintf(&actualData, - "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " - "Cores: %u, Threads: %u\n", - nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), - nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads); + actualData = g_strdup_printf( + "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " + "Cores: %u, Threads: %u\n", + nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), + nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, + nodeinfo.cores, nodeinfo.threads); if (virTestCompareToFile(actualData, outputfile) < 0) goto fail; @@ -176,12 +176,12 @@ linuxTestHostCPU(const void *opaque) struct linuxTestHostCPUData *data = (struct linuxTestHostCPUData *) opaque; const char *archStr = virArchToString(data->arch); - virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", - abs_srcdir, data->testName); - virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", - abs_srcdir, archStr, data->testName); - virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", - abs_srcdir, archStr, data->testName); + sysfs_prefix = g_strdup_printf("%s/virhostcpudata/linux-%s", + abs_srcdir, data->testName); + cpuinfo = g_strdup_printf("%s/virhostcpudata/linux-%s-%s.cpuinfo", + abs_srcdir, archStr, data->testName); + output = g_strdup_printf("%s/virhostcpudata/linux-%s-%s.expected", + abs_srcdir, archStr, data->testName); virFileWrapperAddPrefix(SYSFS_SYSTEM_PATH, sysfs_prefix); result = linuxTestCompareFiles(cpuinfo, data->arch, output); @@ -207,10 +207,10 @@ linuxTestNodeCPUStats(const void *data) char *cpustatfile = NULL; char *outfile = NULL; - virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat", - abs_srcdir, testData->name); - virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", - abs_srcdir, testData->name); + cpustatfile = g_strdup_printf("%s/virhostcpudata/linux-cpustat-%s.stat", + abs_srcdir, testData->name); + outfile = g_strdup_printf("%s/virhostcpudata/linux-cpustat-%s.out", + abs_srcdir, testData->name); result = linuxCPUStatsCompareFiles(cpustatfile, testData->ncpus, diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 75c70a49c9..9da0f9c90d 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -26,10 +26,10 @@ testJSONFromFile(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", - abs_srcdir, info->name); + infile = g_strdup_printf("%s/virjsondata/parse-%s-in.json", + abs_srcdir, info->name); + outfile = g_strdup_printf("%s/virjsondata/parse-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -113,10 +113,10 @@ testJSONAddRemove(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", - abs_srcdir, info->name); + infile = g_strdup_printf("%s/virjsondata/add-remove-%s-in.json", + abs_srcdir, info->name); + outfile = g_strdup_printf("%s/virjsondata/add-remove-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -348,10 +348,10 @@ testJSONDeflatten(const void *data) g_autofree char *outfile = NULL; g_autofree char *actual = NULL; - virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", - abs_srcdir, info->name); + infile = g_strdup_printf("%s/virjsondata/deflatten-%s-in.json", + abs_srcdir, info->name); + outfile = g_strdup_printf("%s/virjsondata/deflatten-%s-out.json", + abs_srcdir, info->name); if (virTestLoadFile(infile, &indata) < 0) return -1; diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 17880728e7..69d75dfa34 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -41,7 +41,7 @@ testMACLookup(const void *opaque) char *file = NULL; int ret = -1; - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); + file = g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (!(mgr = virMacMapNew(file))) goto cleanup; @@ -92,7 +92,7 @@ testMACRemove(const void *opaque) char *file = NULL; int ret = -1; - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); + file = g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (!(mgr = virMacMapNew(file))) goto cleanup; @@ -127,7 +127,7 @@ testMACFlush(const void *opaque) char *str = NULL; int ret = -1; - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); + file = g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, data->file); if (virMacMapDumpStr(data->mgr, &str) < 0) goto cleanup; diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 2dfa04e83f..825487f0a1 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -295,11 +295,11 @@ static int testExecRestart(const void *opaque) goto cleanup; } - virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", abs_srcdir, - data->jsonfile); + infile = g_strdup_printf("%s/virnetdaemondata/input-data-%s.json", abs_srcdir, + data->jsonfile); - virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", - abs_srcdir, data->jsonfile); + outfile = g_strdup_printf("%s/virnetdaemondata/output-data-%s.json", + abs_srcdir, data->jsonfile); if (virFileReadAll(infile, 8192, &injsonstr) < 0) goto cleanup; diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 8834b2ca6a..f26991a48c 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,8 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file); + *pf_sysfs_device_link = g_strdup_printf("%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } #else diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitchtest.c index 7b814474b7..fd47e927ea 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -38,8 +38,8 @@ testInterfaceParseStats(const void *opaque) g_autofree char *buf = NULL; virDomainInterfaceStatsStruct actual; - virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", abs_srcdir, - data->filename); + filename = g_strdup_printf("%s/virnetdevopenvswitchdata/%s", abs_srcdir, + data->filename); if (virFileReadAll(filename, 1024, &buf) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 29568eea1a..4e9f201e45 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -196,7 +196,7 @@ testSocketAccept(const void *opaque) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - virAsprintf(&path, "%s/test.sock", tmpdir); + path = g_strdup_printf("%s/test.sock", tmpdir); if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) < 0) goto cleanup; @@ -320,7 +320,7 @@ static int testSocketUNIXAddrs(const void *data G_GNUC_UNUSED) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - virAsprintf(&path, "%s/test.sock", tmpdir); + path = g_strdup_printf("%s/test.sock", tmpdir); if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0) goto cleanup; diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xmltest.c index 89f9de0c17..1b2175dd9d 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -66,8 +66,8 @@ testCompareXMLToXMLHelper(const void *data) int ret = -1; char *xml = NULL; - virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", abs_srcdir, - info->name); + xml = g_strdup_printf("%s/virnetworkportxml2xmldata/%s.xml", abs_srcdir, + info->name); ret = testCompareXMLToXMLFiles(xml); diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 4a52483a7f..e6282c7f33 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,7 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path = NULL; - virAsprintf(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); + sysfs_node_path = g_strdup_printf("%s/node", SYSFS_SYSTEM_PATH); numa_avail = virFileExists(sysfs_node_path); diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c index d5ace8f89f..3360dd28d3 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -72,8 +72,8 @@ testCompareXMLToXMLHelper(const void *data) const test_parms *tp = data; char *xml = NULL; - virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdir, - tp->name); + xml = g_strdup_printf("%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdir, + tp->name); result = testCompareXMLToXMLFiles(xml); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 67107450e6..0d502db68c 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,7 +186,7 @@ make_file(const char *path, if (value && len == -1) len = strlen(value); - virAsprintf(&filepath, "%s/%s", path, name); + filepath = g_strdup_printf("%s/%s", path, name); if ((fd = real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -203,7 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath = NULL; - virAsprintf(&dirpath, "%s/%s", path, name); + dirpath = g_strdup_printf("%s/%s", path, name); if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -216,7 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath = NULL; - virAsprintf(&filepath, "%s/%s", path, name); + filepath = g_strdup_printf("%s/%s", path, name); if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -232,7 +232,7 @@ pci_read_file(const char *path, int fd = -1; g_autofree char *newpath = NULL; - virAsprintf(&newpath, "%s/%s", fakerootdir, path); + newpath = g_strdup_printf("%s/%s", fakerootdir, path); if ((fd = real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -269,13 +269,13 @@ getrealpath(char **newpath, init_env(); if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - virAsprintf(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)); + *newpath = g_strdup_printf("%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - virAsprintf(newpath, "%s/%s", - fakerootdir, - path); + *newpath = g_strdup_printf("%s/%s", + fakerootdir, + path); } else { *newpath = g_strdup(path); } @@ -356,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; - virAsprintf(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); + ret = g_strdup_printf(ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } @@ -393,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid, file); + ret = g_strdup_printf("%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid); + ret = g_strdup_printf("%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } return ret; @@ -415,8 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; - virAsprintf(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", - fakerootdir, dev->iommuGroup); + iommuPath = g_strdup_printf("%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -482,7 +482,7 @@ pci_device_new_from_stub(const struct pciDevice *data) if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); - virAsprintf(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); + configSrc = g_strdup_printf("%s/virpcitestdata/%s.config", abs_srcdir, id); memcpy(dev, data, sizeof(*dev)); @@ -544,7 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } - virAsprintf(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); + devsympath = g_strdup_printf("%s" SYSFS_PCI_PREFIX "devices", fakerootdir); make_symlink(devsympath, devid, tmp); @@ -625,9 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - virAsprintf(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + vfiopath = g_strdup_printf("%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if (unlink(vfiopath) < 0) return -1; @@ -651,9 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; if (pciIommuGroups[i]->nDevicesBoundToVFIO == 0) { - virAsprintf(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + vfiopath = g_strdup_printf("%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd = real_open(vfiopath, O_CREAT)) < 0) goto cleanup; @@ -685,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix = fakerootdir; if (file) { - virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", - prefix, driver->name, file); + ret = g_strdup_printf("%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", - prefix, driver->name); + ret = g_strdup_printf("%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } return ret; @@ -971,7 +971,7 @@ init_env(void) if (!(fakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); - virAsprintf(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); + tmp = g_strdup_printf("%s%s", fakerootdir, SYSFS_PCI_PREFIX); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -982,7 +982,7 @@ init_env(void) /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - virAsprintf(&tmp, "%s/dev/vfio", fakerootdir); + tmp = g_strdup_printf("%s/dev/vfio", fakerootdir); if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 20eb2caea9..0bac23cb23 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -349,8 +349,8 @@ mymain(void) domain, bus, slot, function, NULL \ }; \ char *label = NULL; \ - virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ - #fnc, domain, bus, slot, function); \ + label = g_strdup_printf("%s(%04x:%02x:%02x.%x)", \ +#fnc, domain, bus, slot, function); \ if (virTestRun(label, fnc, &data) < 0) \ ret = -1; \ VIR_FREE(label); \ @@ -362,9 +362,9 @@ mymain(void) domain, bus, slot, function, driver \ }; \ char *label = NULL; \ - virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ - domain, bus, slot, function, \ - NULLSTR(driver)); \ + label = g_strdup_printf("PCI driver %04x:%02x:%02x.%x is %s", \ + domain, bus, slot, function, \ + NULLSTR(driver)); \ if (virTestRun(label, testVirPCIDeviceCheckDriverTest, \ &data) < 0) \ ret = -1; \ diff --git a/tests/virrandommock.c b/tests/virrandommock.c index eff72a8aa7..6dd15213e3 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -53,8 +53,8 @@ uint64_t virRandomBits(int nbits) int virRandomGenerateWWN(char **wwn, const char *virt_type G_GNUC_UNUSED) { - virAsprintf(wwn, "5100000%09llx", - (unsigned long long)virRandomBits(36)); + *wwn = g_strdup_printf("5100000%09llx", + (unsigned long long)virRandomBits(36)); return 0; } diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index 71870e9f3f..bb6d0fe48e 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -26,14 +26,14 @@ test_virResctrlGetUnused(const void *opaque) char *schemata_file; virCapsPtr caps = NULL; - virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, - data->filename); + system_dir = g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_srcdir, + data->filename); - virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename); + resctrl_dir = g_strdup_printf("%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename); - virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", abs_srcdir, - data->filename); + schemata_file = g_strdup_printf("%s/virresctrldata/%s.schemata", abs_srcdir, + data->filename); virFileWrapperAddPrefix("/sys/devices/system", system_dir); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl_dir); diff --git a/tests/virschematest.c b/tests/virschematest.c index 1370068601..c301b37a9d 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -87,9 +87,9 @@ testSchemaDir(const char *schema, if (ent->d_name[0] == '.') continue; - virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name); + xml_path = g_strdup_printf("%s/%s", dir_path, ent->d_name); - virAsprintf(&test_name, "Checking %s against %s", ent->d_name, schema); + test_name = g_strdup_printf("Checking %s against %s", ent->d_name, schema); data.xml_path = xml_path; if (virTestRun(test_name, testSchemaFile, &data) < 0) @@ -120,7 +120,7 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr validator, ...) va_start(args, validator); while ((dir = va_arg(args, char *))) { - virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir); + dir_path = g_strdup_printf("%s/%s", abs_srcdir, dir); if (testSchemaDir(schema, validator, dir_path) < 0) ret = -1; VIR_FREE(dir_path); @@ -139,8 +139,8 @@ testSchemaGrammar(const void *opaque) char *schema_path; int ret = -1; - virAsprintf(&schema_path, "%s/docs/schemas/%s", abs_top_srcdir, - data->schema); + schema_path = g_strdup_printf("%s/docs/schemas/%s", abs_top_srcdir, + data->schema); if (!(data->validator = virXMLValidatorInit(schema_path))) goto cleanup; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 0d2ddd3b6a..4d40f2bb82 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -167,9 +167,9 @@ create_symlink(const char *tmpdir, const char *src_name, const char *dst_name) char *src_path = NULL; char *dst_path = NULL; - virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name); + src_path = g_strdup_printf("%s/%s", virscsi_prefix, src_name); - virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name); + dst_path = g_strdup_printf("%s/%s", tmpdir, dst_name); if (symlink(src_path, dst_path) < 0) { VIR_WARN("Failed to create symlink '%s' to '%s'", src_path, dst_path); @@ -192,7 +192,7 @@ mymain(void) char *tmpdir = NULL; char template[] = "/tmp/libvirt_XXXXXX"; - virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir); + virscsi_prefix = g_strdup_printf("%s" VIR_SCSI_DATA, abs_srcdir); tmpdir = mkdtemp(template); diff --git a/tests/virshtest.c b/tests/virshtest.c index 475933a93c..189238b826 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -252,8 +252,8 @@ mymain(void) { int ret = 0; - virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", - abs_srcdir); + custom_uri = g_strdup_printf("test://%s/../examples/xml/test/testnode.xml", + abs_srcdir); if (virTestRun("virsh list (default)", testCompareListDefault, NULL) != 0) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index af1b4fc43f..f0de35dd83 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -138,12 +138,12 @@ testPrepImages(void) compat = true; VIR_FREE(buf); - virAsprintf(&absraw, "%s/raw", datadir); - virAsprintf(&absqcow2, "%s/qcow2", datadir); - virAsprintf(&abswrap, "%s/wrap", datadir); - virAsprintf(&absqed, "%s/qed", datadir); - virAsprintf(&absdir, "%s/dir", datadir); - virAsprintf(&abslink2, "%s/sub/link2", datadir); + absraw = g_strdup_printf("%s/raw", datadir); + absqcow2 = g_strdup_printf("%s/qcow2", datadir); + abswrap = g_strdup_printf("%s/wrap", datadir); + absqed = g_strdup_printf("%s/qed", datadir); + absdir = g_strdup_printf("%s/dir", datadir); + abslink2 = g_strdup_printf("%s/sub/link2", datadir); if (virFileMakePath(datadir "/sub") < 0) { fprintf(stderr, "unable to create directory %s\n", datadir "/sub"); @@ -159,7 +159,7 @@ testPrepImages(void) goto cleanup; } - virAsprintf(&buf, "%1024d", 0); + buf = g_strdup_printf("%1024d", 0); if (virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; @@ -321,28 +321,28 @@ testStorageChain(const void *args) return -1; } - virAsprintf(&expect, - testStorageChainFormat, i, - NULLSTR(data->files[i]->path), - NULLSTR(data->files[i]->expBackingStoreRaw), - data->files[i]->expCapacity, - data->files[i]->expEncrypted, - NULLSTR(data->files[i]->pathRel), - data->files[i]->type, - data->files[i]->format, - virStorageNetProtocolTypeToString(data->files[i]->protocol), - NULLSTR(data->files[i]->hostname)); - virAsprintf(&actual, - testStorageChainFormat, i, - NULLSTR(elt->path), - NULLSTR(elt->backingStoreRaw), - elt->capacity, - !!elt->encryption, - NULLSTR(elt->relPath), - elt->type, - elt->format, - virStorageNetProtocolTypeToString(elt->protocol), - NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); + expect = g_strdup_printf( + testStorageChainFormat, i, + NULLSTR(data->files[i]->path), + NULLSTR(data->files[i]->expBackingStoreRaw), + data->files[i]->expCapacity, + data->files[i]->expEncrypted, + NULLSTR(data->files[i]->pathRel), + data->files[i]->type, + data->files[i]->format, + virStorageNetProtocolTypeToString(data->files[i]->protocol), + NULLSTR(data->files[i]->hostname)); + actual = g_strdup_printf( + testStorageChainFormat, i, + NULLSTR(elt->path), + NULLSTR(elt->backingStoreRaw), + elt->capacity, + !!elt->encryption, + NULLSTR(elt->relPath), + elt->type, + elt->format, + virStorageNetProtocolTypeToString(elt->protocol), + NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); if (STRNEQ(expect, actual)) { virTestDifference(stderr, expect, actual); return -1; diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 116a6ad400..046898dbe1 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -110,7 +110,7 @@ checkPath(const char *path, char *crippledPath = NULL; if (path[0] != '/') - virAsprintf(&relPath, "./%s", path); + relPath = g_strdup_printf("./%s", path); /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 1b0beb81cb..57c9611e54 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -54,7 +54,7 @@ static char *get_fake_path(const char *real_path) char *path = NULL; if ((p = STRSKIP(real_path, USB_SYSFS))) - virAsprintf(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); + path = g_strdup_printf("%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); else if (!p) path = g_strdup(real_path); diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 94c55e1fb8..7df4e3aec3 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -52,8 +52,8 @@ static int testDeviceFileActor(virUSBDevicePtr dev, char *str = NULL; int ret = 0; - virAsprintf(&str, USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), - virUSBDeviceGetDevno(dev)); + str = g_strdup_printf(USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), + virUSBDeviceGetDevno(dev)); if (STRNEQ(path, str)) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index b482873103..fa909ad022 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -43,7 +43,7 @@ testVerStrParse(const void *data) unsigned long version; int vmware_type; - virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, info->name); + path = g_strdup_printf("%s/vmwareverdata/%s.txt", abs_srcdir, info->name); if (virTestLoadFile(path, &databuf) < 0) goto cleanup; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 7e05052744..ad7b3360c3 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -114,10 +114,10 @@ testCompareHelper(const void *data) char *vmx = NULL; char *xml = NULL; - virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input); - virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output); + vmx = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + info->input); + xml = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + info->output); ret = testCompareFiles(vmx, xml); @@ -148,7 +148,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) goto cleanup; } - virAsprintf(&src, "[%s] %s", datastoreName, directoryAndFileName); + src = g_strdup_printf("[%s] %s", datastoreName, directoryAndFileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src = g_strdup(fileName); @@ -157,7 +157,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) src = NULL; } else { /* Found single file name referencing a file inside a datastore */ - virAsprintf(&src, "[datastore] directory/%s", fileName); + src = g_strdup_printf("[datastore] directory/%s", fileName); } cleanup: diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 25988b1ae8..5a094e3b0e 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -187,8 +187,8 @@ testCompareHelper(const void *data) char *xml = NULL; char *cfg = NULL; - virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", abs_srcdir, info->name); - virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->name); + xml = g_strdup_printf("%s/xlconfigdata/test-%s.xml", abs_srcdir, info->name); + cfg = g_strdup_printf("%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->name); if (info->mode == 0) result = testCompareParseXML(cfg, xml, info->replaceVars); diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 55fcd95081..82f4908a63 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -131,8 +131,8 @@ testCompareHelper(const void *data) char *cfg = NULL; char *cfgout = NULL; - virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name); - virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->name); + xml = g_strdup_printf("%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name); + cfg = g_strdup_printf("%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->name); if (info->mode == 0) result = testCompareParseXML(cfg, xml); diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index b39862b4bb..8dc37f265a 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -115,10 +115,10 @@ testCompareHelper(const void *data) char *xml = NULL; char *vmx = NULL; - virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, - info->input); - virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, - info->output); + xml = g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, + info->input); + vmx = g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, + info->output); result = testCompareFiles(xml, vmx, info->virtualHW_version); @@ -166,8 +166,8 @@ testFormatVMXFileName(const char *src, void *opaque G_GNUC_UNUSED) directoryAndFileName += strspn(directoryAndFileName, " "); } - virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, - directoryAndFileName); + absolutePath = g_strdup_printf("/vmfs/volumes/%s/%s", datastoreName, + directoryAndFileName); } else if (STRPREFIX(src, "/")) { /* Found absolute path */ absolutePath = g_strdup(src); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tools/virsh-completer-domain.c | 6 +++--- tools/virsh-completer-host.c | 10 +++++----- tools/virsh-completer.c | 2 +- tools/virsh-domain-monitor.c | 18 +++++++++--------- tools/virsh-domain.c | 22 +++++++++++----------- tools/virsh-host.c | 2 +- tools/virsh-interface.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-pool.c | 12 ++++++------ tools/virsh-volume.c | 6 +++--- tools/virt-admin.c | 4 ++-- tools/vsh.c | 22 +++++++++++----------- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 0bf6202c0a..d625ab8bb4 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -221,9 +221,9 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, if (virMacAddrParse(iface, &macaddr) == 0) virMacAddrFormat(&macaddr, macstr); - virAsprintf(&xpath, "/domain/devices/interface[(mac/@address = '%s') or " - " (target/@dev = '%s')]", macstr, - iface); + xpath = g_strdup_printf("/domain/devices/interface[(mac/@address = '%s') or " + " (target/@dev = '%s')]", macstr, + iface); if ((ninterfaces = virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) return NULL; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 8cb98ad88d..41615226d2 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -44,7 +44,7 @@ virshPagesizeNodeToString(xmlNodePtr node) if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) return NULL; size = vshPrettyCapacity(byteval, &suffix); - virAsprintf(&ret, "%.0f%s", size, suffix); + ret = g_strdup_printf("%.0f%s", size, suffix); return ret; } @@ -78,11 +78,11 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, return NULL; if (cellno && vshCommandOptStringQuiet(ctl, cmd, "cellno", &cellnum) > 0) { - virAsprintf(&path, - "/capabilities/host/topology/cells/cell[@id=\"%s\"]/pages", - cellnum); + path = g_strdup_printf( + "/capabilities/host/topology/cells/cell[@id=\"%s\"]/pages", + cellnum); } else { - virAsprintf(&path, "/capabilities/host/cpu/pages"); + path = g_strdup_printf("/capabilities/host/cpu/pages"); } npages = virXPathNodeSet(path, ctxt, &pages); diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 8bd7be888f..1d9d212f8a 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -119,7 +119,7 @@ virshCommaStringListComplete(const char *input, continue; if (inputCopy) - virAsprintf(&ret[nret], "%s,%s", inputCopy, options[i]); + ret[nret] = g_strdup_printf("%s,%s", inputCopy, options[i]); else ret[nret] = g_strdup(options[i]); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 9178e534d6..530bfeca1b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -431,9 +431,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, *alloc = g_strdup("-"); *phy = g_strdup("-"); } else if (!human) { - virAsprintf(cap, "%llu", info->capacity); - virAsprintf(alloc, "%llu", info->allocation); - virAsprintf(phy, "%llu", info->physical); + *cap = g_strdup_printf("%llu", info->capacity); + *alloc = g_strdup_printf("%llu", info->allocation); + *phy = g_strdup_printf("%llu", info->physical); } else { double val_cap, val_alloc, val_phy; const char *unit_cap, *unit_alloc, *unit_phy; @@ -442,9 +442,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, val_alloc = vshPrettyCapacity(info->allocation, &unit_alloc); val_phy = vshPrettyCapacity(info->physical, &unit_phy); - virAsprintf(cap, "%.3lf %s", val_cap, unit_cap); - virAsprintf(alloc, "%.3lf %s", val_alloc, unit_alloc); - virAsprintf(phy, "%.3lf %s", val_phy, unit_phy); + *cap = g_strdup_printf("%.3lf %s", val_cap, unit_cap); + *alloc = g_strdup_printf("%.3lf %s", val_alloc, unit_alloc); + *phy = g_strdup_printf("%.3lf %s", val_phy, unit_phy); } return true; @@ -826,9 +826,9 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if (virMacAddrParse(iface, &macaddr) == 0) virMacAddrFormat(&macaddr, macstr); - virAsprintf(&xpath, "/domain/devices/interface[(mac/@address = '%s') or " - " (target/@dev = '%s')]", macstr, - iface); + xpath = g_strdup_printf("/domain/devices/interface[(mac/@address = '%s') or " + " (target/@dev = '%s')]", macstr, + iface); if ((ninterfaces = virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) { vshError(ctl, _("Failed to extract interface information")); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7a03c1fb6e..3a7015b198 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5535,8 +5535,8 @@ virshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime) localtime_r(&cur_time, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); - virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), timestr, - NULLSTR_EMPTY(ext)); + ret = g_strdup_printf("%s-%s%s", virDomainGetName(dom), timestr, + NULLSTR_EMPTY(ext)); return ret; } @@ -6966,7 +6966,7 @@ virshVcpuPinQuery(vshControl *ctl, cpumaplen))) goto cleanup; - virAsprintf(&vcpuStr, "%zu", i); + vcpuStr = g_strdup_printf("%zu", i); if (vshTableRowAppend(table, vcpuStr, pinInfo, NULL) < 0) goto cleanup; @@ -7582,7 +7582,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) g_autofree char *pinInfo = NULL; g_autofree char *iothreadIdStr = NULL; - virAsprintf(&iothreadIdStr, "%u", info[i]->iothread_id); + iothreadIdStr = g_strdup_printf("%u", info[i]->iothread_id); ignore_value(pinInfo = virBitmapDataFormat(info[i]->cpumap, info[i]->cpumaplen)); @@ -11386,7 +11386,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Create our XPATH lookup for the current display's port */ VIR_FREE(xpath); - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "@port"); /* Attempt to get the port number for the current graphics scheme */ tmp = virXPathInt(xpath, ctxt, &port); @@ -11399,7 +11399,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Create our XPATH lookup for TLS Port (automatically skipped * for unsupported schemes */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@tlsPort"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "@tlsPort"); /* Attempt to get the TLS port number */ tmp = virXPathInt(xpath, ctxt, &tls_port); @@ -11408,7 +11408,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) tls_port = 0; /* Create our XPATH lookup for the current display's address */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "@listen"); /* Attempt to get the listening addr if set for the current * graphics scheme */ @@ -11417,7 +11417,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); /* Create our XPATH lookup for the current spice type. */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "listen/@type"); /* Attempt to get the type of spice connection */ VIR_FREE(type_conn); @@ -11426,7 +11426,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (STREQ_NULLABLE(type_conn, "socket")) { if (!sockpath) { - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@socket"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "listen/@socket"); sockpath = virXPathString(xpath, ctxt); @@ -11446,7 +11446,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * subelement (which, by the way, doesn't exist on libvirt * < 0.9.4, so we really do need to check both places) */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@address"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "listen/@address"); listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); @@ -11482,7 +11482,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * care of when getting the XML */ /* Create our XPATH lookup for the password */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@passwd"); + xpath = g_strdup_printf(xpath_fmt, scheme[iter], "@passwd"); /* Attempt to get the password */ VIR_FREE(passwd); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index fe172d2c29..0fd77cbae5 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1140,7 +1140,7 @@ vshExtractCPUDefXMLs(vshControl *ctl, else doc = buffer; - virAsprintf(&xmlStr, "<container>%s</container>", doc); + xmlStr = g_strdup_printf("<container>%s</container>", doc); if (!(xml = virXMLParseStringCtxt(xmlStr, xmlFile, &ctxt))) goto error; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index fbeb40fc6a..8aa2fcf71d 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -894,7 +894,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) } if (stp) { - virAsprintf(&delay_str, "%d", delay); + delay_str = g_strdup_printf("%d", delay); if (!xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str)) { vshError(ctl, _("Failed to set bridge delay %d in xml document"), delay); goto cleanup; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 662ca00e1c..59b7b5d075 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1447,7 +1447,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) else if (lease->type == VIR_IP_ADDR_TYPE_IPV6) typestr = "ipv6"; - virAsprintf(&cidr_format, "%s/%d", lease->ipaddr, lease->prefix); + cidr_format = g_strdup_printf("%s/%d", lease->ipaddr, lease->prefix); if (vshTableRowAppend(table, expirytime, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 5138a5946c..2c39a9b1a6 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1286,16 +1286,16 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) const char *unit; val = vshPrettyCapacity(info.capacity, &unit); - virAsprintf(&poolInfoTexts[i].capacity, "%.2lf %s", val, - unit); + poolInfoTexts[i].capacity = g_strdup_printf("%.2lf %s", val, + unit); val = vshPrettyCapacity(info.allocation, &unit); - virAsprintf(&poolInfoTexts[i].allocation, "%.2lf %s", val, - unit); + poolInfoTexts[i].allocation = g_strdup_printf("%.2lf %s", val, + unit); val = vshPrettyCapacity(info.available, &unit); - virAsprintf(&poolInfoTexts[i].available, "%.2lf %s", val, - unit); + poolInfoTexts[i].available = g_strdup_printf("%.2lf %s", val, + unit); } else { /* Capacity related information isn't available */ poolInfoTexts[i].capacity = g_strdup(_("-")); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index bd57fd695d..b4afa51d9b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1430,11 +1430,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) volInfoTexts[i].type = g_strdup(virshVolumeTypeToString(volumeInfo.type)); val = vshPrettyCapacity(volumeInfo.capacity, &unit); - virAsprintf(&volInfoTexts[i].capacity, "%.2lf %s", val, unit); + volInfoTexts[i].capacity = g_strdup_printf("%.2lf %s", val, unit); val = vshPrettyCapacity(volumeInfo.allocation, &unit); - virAsprintf(&volInfoTexts[i].allocation, "%.2lf %s", val, - unit); + volInfoTexts[i].allocation = g_strdup_printf("%.2lf %s", val, + unit); } } } diff --git a/tools/virt-admin.c b/tools/virt-admin.c index da28d760db..30106d1971 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -394,7 +394,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) for (i = 0; i < nsrvs; i++) { g_autofree char *idStr = NULL; - virAsprintf(&idStr, "%zu", i); + idStr = g_strdup_printf("%zu", i); if (vshTableRowAppend(table, idStr, @@ -655,7 +655,7 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) ×tr) < 0) goto cleanup; - virAsprintf(&idStr, "%llu", id); + idStr = g_strdup_printf("%llu", id); if (vshTableRowAppend(table, idStr, vshAdmClientTransportToString(transport), timestr, NULL) < 0) diff --git a/tools/vsh.c b/tools/vsh.c index 8cd613bbbd..7002aa635e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1799,23 +1799,23 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) switch (item->type) { case VIR_TYPED_PARAM_INT: - virAsprintf(&str, "%d", item->value.i); + str = g_strdup_printf("%d", item->value.i); break; case VIR_TYPED_PARAM_UINT: - virAsprintf(&str, "%u", item->value.ui); + str = g_strdup_printf("%u", item->value.ui); break; case VIR_TYPED_PARAM_LLONG: - virAsprintf(&str, "%lld", item->value.l); + str = g_strdup_printf("%lld", item->value.l); break; case VIR_TYPED_PARAM_ULLONG: - virAsprintf(&str, "%llu", item->value.ul); + str = g_strdup_printf("%llu", item->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - virAsprintf(&str, "%f", item->value.d); + str = g_strdup_printf("%f", item->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: @@ -2418,7 +2418,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc) tmpdir = getenv("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; - virAsprintf(&ret, "%s/virshXXXXXX.xml", tmpdir); + ret = g_strdup_printf("%s/virshXXXXXX.xml", tmpdir); fd = mkostemps(ret, 4, O_CLOEXEC); if (fd == -1) { vshError(ctl, _("mkostemps: failed to create temporary file: %s"), @@ -2936,7 +2936,7 @@ vshReadlineInit(vshControl *ctl) rl_completer_quote_characters = quote_characters; rl_char_is_quoted_p = vshReadlineCharIsQuoted; - virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix); + histsize_env = g_strdup_printf("%s_HISTSIZE", ctl->env_prefix); /* Limit the total size of the history buffer */ if ((histsize_str = getenv(histsize_env))) { @@ -2962,9 +2962,9 @@ vshReadlineInit(vshControl *ctl) goto cleanup; } - virAsprintf(&ctl->historydir, "%s/%s", userdir, ctl->name); + ctl->historydir = g_strdup_printf("%s/%s", userdir, ctl->name); - virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir); + ctl->historyfile = g_strdup_printf("%s/history", ctl->historydir); read_history(ctl->historyfile); ret = 0; @@ -3046,7 +3046,7 @@ vshInitDebug(vshControl *ctl) char *env = NULL; if (ctl->debug == VSH_DEBUG_DEFAULT) { - virAsprintf(&env, "%s_DEBUG", ctl->env_prefix); + env = g_strdup_printf("%s_DEBUG", ctl->env_prefix); /* log level not set from commandline, check env variable */ debugEnv = getenv(env); @@ -3064,7 +3064,7 @@ vshInitDebug(vshControl *ctl) } if (ctl->logfile == NULL) { - virAsprintf(&env, "%s_LOG_FILE", ctl->env_prefix); + env = g_strdup_printf("%s_LOG_FILE", ctl->env_prefix); /* log file not set from cmdline */ debugEnv = getenv(env); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/driver.c | 4 ++-- src/libvirt-admin.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver.c b/src/driver.c index 89851cb629..2392fd7d5f 100644 --- a/src/driver.c +++ b/src/driver.c @@ -90,7 +90,7 @@ virDriverShouldAutostart(const char *dir, *autostart = false; - virAsprintf(&path, "%s/autostarted", dir); + path = g_strdup_printf("%s/autostarted", dir); if (virFileExists(path)) { VIR_DEBUG("Autostart file %s exists, skipping autostart", path); @@ -151,7 +151,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const char *name) g_autofree char *uri = NULL; const char *uriPath = geteuid() == 0 ? "/system" : "/session"; - virAsprintf(&uri, "%s://%s", name, uriPath); + uri = g_strdup_printf("%s://%s", name, uriPath); conn = virConnectOpen(uri); VIR_DEBUG("Opened new %s connection %p", name, conn); diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 7ff549bca4..f156736d9f 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -141,16 +141,16 @@ getSocketPath(virURIPtr uri) if (legacy) { sockbase = g_strdup("libvirt-admin-sock"); } else { - virAsprintf(&sockbase, "%s-admin-sock", uri->scheme); + sockbase = g_strdup_printf("%s-admin-sock", uri->scheme); } if (STREQ_NULLABLE(uri->path, "/system")) { - virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", sockbase); + sock_path = g_strdup_printf(RUNSTATEDIR "/libvirt/%s", sockbase); } else if (STREQ_NULLABLE(uri->path, "/session")) { if (!rundir) goto error; - virAsprintf(&sock_path, "%s/%s", rundir, sockbase); + sock_path = g_strdup_printf("%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid URI path '%s', try '/system'"), -- 2.21.0

Since we are not passing the @fakerootdir variable to any inline function anymore, we can make the variable static. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/virpcimock.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 0d502db68c..7e4554a1dc 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -39,11 +39,7 @@ static int (*real_close)(int fd); static DIR * (*real_opendir)(const char *name); static char *(*real_virFileCanonicalizePath)(const char *path); -/* Don't make static, since it causes problems with clang - * when passed as an arg to virAsprintf() - * vircgroupmock.c:462:22: error: static variable 'fakesysfsdir' is used in an inline function with external linkage [-Werror,-Wstatic-in-inline] - */ -char *fakerootdir; +static char *fakerootdir; /* To add a new mocked prefix in virpcimock: * - add the prefix here as a define to make it easier to track what we -- 2.21.0

Now that function is no longer used, it can be dropped. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- build-aux/syntax-check.mk | 10 +++++----- docs/hacking.html.in | 8 ++++---- m4/virt-compile-warnings.m4 | 2 -- src/libvirt_private.syms | 1 - src/util/virstring.c | 14 -------------- src/util/virstring.h | 14 -------------- 6 files changed, 9 insertions(+), 40 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..11b0ac7150 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -443,14 +443,14 @@ sc_prohibit_strtol: halt='use virStrToDouble, not strtod variants' \ $(_sc_search_regexp) -# Use virAsprintf rather than as'printf since *strp is undefined on error. -# But for plain %s, virAsprintf is overkill compared to strdup. +# Use g_strdup_printf rather than as'printf since *strp is undefined on error. +# But for plain %s, g_strdup_printf is overkill compared to g_strdup. sc_prohibit_asprintf: @prohibit='\<v?a[s]printf\>' \ - halt='use virAsprintf, not asprintf' \ + halt='use g_strdup_printf, not asprintf' \ $(_sc_search_regexp) - @prohibit='virAsprintf.*, *"%s",' \ - halt='use VIR_STRDUP instead of virAsprintf with "%s"' \ + @prohibit='g_strdup_printf.*, *"%s",' \ + halt='use g_strdup instead of g_strdup_printf with "%s"' \ $(_sc_search_regexp) sc_prohibit_strdup: diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 981b782d31..f442eeb32a 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1321,12 +1321,12 @@ BAD: Whenever you add a new printf-style function, i.e., one with a format string argument and following "..." in its prototype, be sure to use gcc's printf attribute directive in the prototype. For example, here's - the one for virAsprintf, in util.h: + the one for virBufferAsprintf, in virbuffer.h: </p> <pre> - int virAsprintf(char **strp, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + void virBufferAsprintf(virBufferPtr buf, const char *format, ...) + G_GNUC_PRINTF(2, 3); </pre> <p> @@ -1337,7 +1337,7 @@ BAD: <p> When printing to a string, consider using virBuffer for - incremental allocations, virAsprintf for a one-shot allocation, + incremental allocations, g_strdup_printf for a one-shot allocation, and snprintf for fixed-width buffers. Do not use sprintf, even if you can prove the buffer won't overflow, since gnulib does not provide the same portability guarantees for sprintf as it diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 1318ca59b9..be5dc3de51 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -51,8 +51,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wstrict-overflow" # Not a problem since we don't use -funsafe-loop-optimizations dontwarn="$dontwarn -Wunsafe-loop-optimizations" - # Things like virAsprintf mean we can't use this - dontwarn="$dontwarn -Wformat-nonliteral" # Gnulib's stat-time.h violates this dontwarn="$dontwarn -Waggregate-return" # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 12cb3b5bf7..e8458e26c7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3070,7 +3070,6 @@ virStorageFileBackendRegister; # util/virstring.h -virAsprintfInternal; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; diff --git a/src/util/virstring.c b/src/util/virstring.c index ac132ff924..f6495fdb72 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -746,20 +746,6 @@ virVasprintfInternal(char **strp, return ret; } -void -virAsprintfInternal(char **strp, - const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - g_vasprintf(strp, fmt, ap); - va_end(ap); - - if (!*strp) - abort(); -} - /** * virStrncpy: * diff --git a/src/util/virstring.h b/src/util/virstring.h index 318b64a136..5de6dd3252 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,8 +133,6 @@ int virStrdup(char **dest, const char *src) int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -void virAsprintfInternal(char **strp, const char *fmt, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 3); int virVasprintfInternal(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0) G_GNUC_WARN_UNUSED_RESULT; @@ -228,18 +226,6 @@ size_t virStringListLength(const char * const *strings); */ #define virVasprintfQuiet(strp, fmt, list) virVasprintf(strp, fmt, list) -/** - * virAsprintf: - * @strp: variable to hold result (char **) - * @fmt: printf format - * - * Like glibc's asprintf but aborts on OOM. - * - * Returns number of bytes printed on success, aborts on OOM - */ - -#define virAsprintf(strp, ...) virAsprintfInternal(strp, __VA_ARGS__) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); -- 2.21.0

There's no difference between virVasprintf() and virVasprintfQuiet(). Fix places where the latter is used to use the former. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virerror.c | 4 ++-- src/util/virlog.c | 2 +- tests/eventtest.c | 2 +- tools/vsh.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index 76a75e27a8..5403caf025 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - ignore_value(virVasprintfQuiet(&str, fmt, ap)); + ignore_value(virVasprintf(&str, fmt, ap)); va_end(ap); } @@ -1485,7 +1485,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) va_start(args, fmt); - if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) + if (virVasprintf(&fmtmsg, fmt, args) < 0) goto cleanup; newmsg = g_strdup_printf("%s: %s", fmtmsg, err->message); diff --git a/src/util/virlog.c b/src/util/virlog.c index e7d62e3948..f7ae47559f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,7 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - if (virVasprintfQuiet(&str, fmt, vargs) < 0) + if (virVasprintf(&str, fmt, vargs) < 0) goto cleanup; virLogFormatString(&msg, linenr, funcname, priority, str); diff --git a/tests/eventtest.c b/tests/eventtest.c index 363fc776fd..74b2a807f3 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,7 +89,7 @@ testEventReport(const char *name, bool failed, const char *msg, ...) char *str = NULL; struct testEventResultData data; - if (msg && virVasprintfQuiet(&str, msg, vargs) != 0) + if (msg && virVasprintf(&str, msg, vargs) != 0) failed = true; data.failed = failed; diff --git a/tools/vsh.c b/tools/vsh.c index 7002aa635e..7af3ce237c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1875,7 +1875,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) return; va_start(ap, format); - if (virVasprintfQuiet(&str, format, ap) < 0) + if (virVasprintf(&str, format, ap) < 0) vshErrorOOM(); va_end(ap); fputs(str, stdout); @@ -1890,7 +1890,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...) char *str; va_start(ap, format); - if (virVasprintfQuiet(&str, format, ap) < 0) + if (virVasprintf(&str, format, ap) < 0) vshErrorOOM(); va_end(ap); fputs(str, stdout); -- 2.21.0

This macro is no longer used and therefore can be dropped. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virstring.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/util/virstring.h b/src/util/virstring.h index 5de6dd3252..6072af8f59 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -217,15 +217,6 @@ size_t virStringListLength(const char * const *strings); */ #define virVasprintf(strp, fmt, list) virVasprintfInternal(strp, fmt, list) -/** - * virVasprintfQuiet - * - * Like glibc's vasprintf but aborts on OOM. - * - * Returns number of bytes printed on success, aborts on OOM - */ -#define virVasprintfQuiet(strp, fmt, list) virVasprintf(strp, fmt, list) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); -- 2.21.0

These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/libxl/libxl_logger.c | 3 +-- src/qemu/qemu_domain.c | 6 ++---- src/util/viraudit.c | 3 +-- src/util/vircommand.c | 12 ++---------- src/util/virerror.c | 6 ++---- src/util/virfile.c | 29 ++++++----------------------- src/util/virfirewall.c | 8 ++------ src/util/virlog.c | 3 +-- tests/eventtest.c | 4 ++-- tests/qemumonitortestutils.c | 4 +--- tools/virt-host-validate-common.c | 10 ++-------- tools/vsh.c | 16 ++++------------ 12 files changed, 26 insertions(+), 78 deletions(-) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index ffbc722f2c..63e2df046f 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -74,8 +74,7 @@ libvirt_vmessage(xentoollog_logger *logger_in, if (level < lg->minLevel) return; - if (virVasprintf(&message, format, args) < 0) - return; + virVasprintf(&message, format, args); /* Should we print to a domain-specific log file? */ if ((start = strstr(message, ": Domain ")) && diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe97e13c4f..a2eac8f579 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9396,8 +9396,7 @@ int qemuDomainLogContextWrite(qemuDomainLogContextPtr ctxt, va_start(argptr, fmt); - if (virVasprintf(&message, fmt, argptr) < 0) - goto cleanup; + virVasprintf(&message, fmt, argptr); if (!ctxt->manager && lseek(ctxt->writefd, 0, SEEK_END) < 0) { virReportSystemError(errno, "%s", @@ -9490,8 +9489,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, va_start(ap, fmt); - if (virVasprintf(&message, fmt, ap) < 0) - goto cleanup; + virVasprintf(&message, fmt, ap); VIR_DEBUG("Append log message (vm='%s' message='%s) stdioLogD=%d", vm->def->name, message, cfg->stdioLogD); diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 8a0ef6f72c..1210ba8c94 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -110,8 +110,7 @@ void virAuditSend(virLogSourcePtr source, #endif va_start(args, fmt); - if (virVasprintf(&str, fmt, args) < 0) - VIR_WARN("Out of memory while formatting audit message"); + virVasprintf(&str, fmt, args); va_end(args); if (auditlog && str) { diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 223a2a824e..4b9e837ff0 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1324,11 +1324,7 @@ virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) return; va_start(list, format); - if (virVasprintf(&env, format, list) < 0) { - cmd->has_error = ENOMEM; - va_end(list); - return; - } + virVasprintf(&env, format, list); va_end(list); virCommandAddEnv(cmd, env); @@ -1557,11 +1553,7 @@ virCommandAddArgFormat(virCommandPtr cmd, const char *format, ...) return; va_start(list, format); - if (virVasprintf(&arg, format, list) < 0) { - cmd->has_error = ENOMEM; - va_end(list); - return; - } + virVasprintf(&arg, format, list); va_end(list); /* Arg plus trailing NULL. */ diff --git a/src/util/virerror.c b/src/util/virerror.c index 5403caf025..a5e43361b8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - ignore_value(virVasprintf(&str, fmt, ap)); + virVasprintf(&str, fmt, ap); va_end(ap); } @@ -1485,15 +1485,13 @@ virLastErrorPrefixMessage(const char *fmt, ...) va_start(args, fmt); - if (virVasprintf(&fmtmsg, fmt, args) < 0) - goto cleanup; + virVasprintf(&fmtmsg, fmt, args); newmsg = g_strdup_printf("%s: %s", fmtmsg, err->message); VIR_FREE(err->message); err->message = g_steal_pointer(&newmsg); - cleanup: va_end(args); errno = save_errno; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 042847137d..d2407e7068 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3387,8 +3387,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...) va_start(vargs, msg); - if (virVasprintf(&str, msg, vargs) < 0) - goto cleanup; + virVasprintf(&str, msg, vargs); ret = strlen(str); if (fwrite(str, 1, ret, fp) != ret) { @@ -3397,7 +3396,6 @@ int virFilePrintf(FILE *fp, const char *msg, ...) ret = -1; } - cleanup: va_end(vargs); return ret; @@ -4149,10 +4147,7 @@ virFileReadValueInt(int *value, const char *format, ...) va_list ap; va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); if (!virFileExists(path)) @@ -4192,10 +4187,7 @@ virFileReadValueUint(unsigned int *value, const char *format, ...) va_list ap; va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); if (!virFileExists(path)) @@ -4236,10 +4228,7 @@ virFileReadValueScaledInt(unsigned long long *value, const char *format, ...) va_list ap; va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); if (!virFileExists(path)) @@ -4282,10 +4271,7 @@ virFileReadValueBitmap(virBitmapPtr *value, const char *format, ...) va_list ap; va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); if (!virFileExists(path)) @@ -4323,10 +4309,7 @@ virFileReadValueString(char **value, const char *format, ...) va_list ap; va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); if (!virFileExists(path)) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index fc2c7248cb..55dfc65d0f 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -509,19 +509,15 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewall, VIR_FIREWALL_RULE_RETURN_IF_ERROR(firewall, rule); va_start(list, fmt); - - if (virVasprintf(&arg, fmt, list) < 0) - goto no_memory; + virVasprintf(&arg, fmt, list); + va_end(list); ADD_ARG(rule, arg); - va_end(list); - return; no_memory: firewall->err = ENOMEM; - va_end(list); } diff --git a/src/util/virlog.c b/src/util/virlog.c index f7ae47559f..d2c7b373cf 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,8 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - if (virVasprintf(&str, fmt, vargs) < 0) - goto cleanup; + virVasprintf(&str, fmt, vargs); virLogFormatString(&msg, linenr, funcname, priority, str); diff --git a/tests/eventtest.c b/tests/eventtest.c index 74b2a807f3..4c553d5eb7 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,8 +89,8 @@ testEventReport(const char *name, bool failed, const char *msg, ...) char *str = NULL; struct testEventResultData data; - if (msg && virVasprintf(&str, msg, vargs) != 0) - failed = true; + if (msg) + virVasprintf(&str, msg, vargs); data.failed = failed; data.msg = str; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 3c93468a4e..c522ee6a83 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -188,15 +188,13 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) va_start(msgargs, errmsg); - if (virVasprintf(&msg, errmsg, msgargs) < 0) - goto cleanup; + virVasprintf(&msg, errmsg, msgargs); jsonmsg = g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", msg); ret = qemuMonitorTestAddResponse(test, jsonmsg); - cleanup: va_end(msgargs); return ret; } diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index daeb2f0e1c..bc14227864 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -59,10 +59,7 @@ void virHostMsgCheck(const char *prefix, return; va_start(args, format); - if (virVasprintf(&msg, format, args) < 0) { - perror("malloc"); - abort(); - } + virVasprintf(&msg, format, args); va_end(args); fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); @@ -120,10 +117,7 @@ void virHostMsgFail(virHostValidateLevel level, return; va_start(args, format); - if (virVasprintf(&msg, format, args) < 0) { - perror("malloc"); - abort(); - } + virVasprintf(&msg, format, args); va_end(args); if (virHostMsgWantEscape()) diff --git a/tools/vsh.c b/tools/vsh.c index 7af3ce237c..b1d3bcff6d 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1855,11 +1855,7 @@ vshDebug(vshControl *ctl, int level, const char *format, ...) va_end(ap); va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) { - /* Skip debug messages on low memory */ - va_end(ap); - return; - } + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1875,8 +1871,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) return; va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) - vshErrorOOM(); + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1890,8 +1885,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...) char *str; va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) - vshErrorOOM(); + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -2023,9 +2017,7 @@ vshError(vshControl *ctl, const char *format, ...) fputs(_("error: "), stderr); va_start(ap, format); - /* We can't recursively call vshError on an OOM situation, so ignore - failure here. */ - ignore_value(virVasprintf(&str, format, ap)); + virVasprintf(&str, format, ap); va_end(ap); fprintf(stderr, "%s\n", NULLSTR(str)); -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virstring.c | 7 ++----- src/util/virstring.h | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index f6495fdb72..c704ce38f0 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -722,15 +722,14 @@ virDoubleToStr(char **strp, double number) } -int +void virVasprintfInternal(char **strp, const char *fmt, va_list list) { char *str = NULL; - int ret; - ret = g_vasprintf(&str, fmt, list); + g_vasprintf(&str, fmt, list); /* GLib is supposed to abort() on OOM, but a mistake meant * it did not. Delete this once our min glib is at 2.64.0 @@ -742,8 +741,6 @@ virVasprintfInternal(char **strp, abort(); #endif *strp = str; - - return ret; } /** diff --git a/src/util/virstring.h b/src/util/virstring.h index 6072af8f59..ea0774f2c7 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,9 +133,8 @@ int virStrdup(char **dest, const char *src) int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -int virVasprintfInternal(char **strp, const char *fmt, va_list list) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0) - G_GNUC_WARN_UNUSED_RESULT; +void virVasprintfInternal(char **strp, const char *fmt, va_list list) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0); /** * VIR_STRDUP: -- 2.21.0

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/libxl/libxl_logger.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/util/viraudit.c | 2 +- src/util/vircommand.c | 4 ++-- src/util/virerror.c | 4 ++-- src/util/virfile.c | 18 +++++++++--------- src/util/virfirewall.c | 2 +- src/util/virlog.c | 2 +- tests/eventtest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tools/virt-host-validate-common.c | 4 ++-- tools/vsh.c | 8 ++++---- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 63e2df046f..a829142b2b 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -74,7 +74,7 @@ libvirt_vmessage(xentoollog_logger *logger_in, if (level < lg->minLevel) return; - virVasprintf(&message, format, args); + message = g_strdup_vprintf(format, args); /* Should we print to a domain-specific log file? */ if ((start = strstr(message, ": Domain ")) && diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a2eac8f579..b1fa2d1862 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9396,7 +9396,7 @@ int qemuDomainLogContextWrite(qemuDomainLogContextPtr ctxt, va_start(argptr, fmt); - virVasprintf(&message, fmt, argptr); + message = g_strdup_vprintf(fmt, argptr); if (!ctxt->manager && lseek(ctxt->writefd, 0, SEEK_END) < 0) { virReportSystemError(errno, "%s", @@ -9489,7 +9489,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, va_start(ap, fmt); - virVasprintf(&message, fmt, ap); + message = g_strdup_vprintf(fmt, ap); VIR_DEBUG("Append log message (vm='%s' message='%s) stdioLogD=%d", vm->def->name, message, cfg->stdioLogD); diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 1210ba8c94..20eb3f3621 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -110,7 +110,7 @@ void virAuditSend(virLogSourcePtr source, #endif va_start(args, fmt); - virVasprintf(&str, fmt, args); + str = g_strdup_vprintf(fmt, args); va_end(args); if (auditlog && str) { diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 4b9e837ff0..e062ac554f 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1324,7 +1324,7 @@ virCommandAddEnvFormat(virCommandPtr cmd, const char *format, ...) return; va_start(list, format); - virVasprintf(&env, format, list); + env = g_strdup_vprintf(format, list); va_end(list); virCommandAddEnv(cmd, env); @@ -1553,7 +1553,7 @@ virCommandAddArgFormat(virCommandPtr cmd, const char *format, ...) return; va_start(list, format); - virVasprintf(&arg, format, list); + arg = g_strdup_vprintf(format, list); va_end(list); /* Arg plus trailing NULL. */ diff --git a/src/util/virerror.c b/src/util/virerror.c index a5e43361b8..f569cd363c 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - virVasprintf(&str, fmt, ap); + str = g_strdup_vprintf(fmt, ap); va_end(ap); } @@ -1485,7 +1485,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) va_start(args, fmt); - virVasprintf(&fmtmsg, fmt, args); + fmtmsg = g_strdup_vprintf(fmt, args); newmsg = g_strdup_printf("%s: %s", fmtmsg, err->message); diff --git a/src/util/virfile.c b/src/util/virfile.c index d2407e7068..7382f8e19a 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3374,9 +3374,9 @@ virFileRemoveLastComponent(char *path) /** * virFilePrintf: * - * A replacement for fprintf() which uses virVasprintf to - * ensure that portable string format placeholders can be - * used, since gnulib's fprintf() replacement is not + * A replacement for fprintf() which uses g_strdup_vprintf + * to ensure that portable string format placeholders can + * be used, since gnulib's fprintf() replacement is not * LGPLV2+ compatible */ int virFilePrintf(FILE *fp, const char *msg, ...) @@ -3387,7 +3387,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...) va_start(vargs, msg); - virVasprintf(&str, msg, vargs); + str = g_strdup_vprintf(msg, vargs); ret = strlen(str); if (fwrite(str, 1, ret, fp) != ret) { @@ -4147,7 +4147,7 @@ virFileReadValueInt(int *value, const char *format, ...) va_list ap; va_start(ap, format); - virVasprintf(&path, format, ap); + path = g_strdup_vprintf(format, ap); va_end(ap); if (!virFileExists(path)) @@ -4187,7 +4187,7 @@ virFileReadValueUint(unsigned int *value, const char *format, ...) va_list ap; va_start(ap, format); - virVasprintf(&path, format, ap); + path = g_strdup_vprintf(format, ap); va_end(ap); if (!virFileExists(path)) @@ -4228,7 +4228,7 @@ virFileReadValueScaledInt(unsigned long long *value, const char *format, ...) va_list ap; va_start(ap, format); - virVasprintf(&path, format, ap); + path = g_strdup_vprintf(format, ap); va_end(ap); if (!virFileExists(path)) @@ -4271,7 +4271,7 @@ virFileReadValueBitmap(virBitmapPtr *value, const char *format, ...) va_list ap; va_start(ap, format); - virVasprintf(&path, format, ap); + path = g_strdup_vprintf(format, ap); va_end(ap); if (!virFileExists(path)) @@ -4309,7 +4309,7 @@ virFileReadValueString(char **value, const char *format, ...) va_list ap; va_start(ap, format); - virVasprintf(&path, format, ap); + path = g_strdup_vprintf(format, ap); va_end(ap); if (!virFileExists(path)) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 55dfc65d0f..ee72b579e4 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -509,7 +509,7 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewall, VIR_FIREWALL_RULE_RETURN_IF_ERROR(firewall, rule); va_start(list, fmt); - virVasprintf(&arg, fmt, list); + arg = g_strdup_vprintf(fmt, list); va_end(list); ADD_ARG(rule, arg); diff --git a/src/util/virlog.c b/src/util/virlog.c index d2c7b373cf..c104687ace 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,7 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - virVasprintf(&str, fmt, vargs); + str = g_strdup_vprintf(fmt, vargs); virLogFormatString(&msg, linenr, funcname, priority, str); diff --git a/tests/eventtest.c b/tests/eventtest.c index 4c553d5eb7..fdd732f7fa 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -90,7 +90,7 @@ testEventReport(const char *name, bool failed, const char *msg, ...) struct testEventResultData data; if (msg) - virVasprintf(&str, msg, vargs); + str = g_strdup_vprintf(msg, vargs); data.failed = failed; data.msg = str; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index c522ee6a83..4ec0e107ab 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -188,7 +188,7 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...) va_start(msgargs, errmsg); - virVasprintf(&msg, errmsg, msgargs); + msg = g_strdup_vprintf(errmsg, msgargs); jsonmsg = g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", msg); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index bc14227864..af8def21f3 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -59,7 +59,7 @@ void virHostMsgCheck(const char *prefix, return; va_start(args, format); - virVasprintf(&msg, format, args); + msg = g_strdup_vprintf(format, args); va_end(args); fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); @@ -117,7 +117,7 @@ void virHostMsgFail(virHostValidateLevel level, return; va_start(args, format); - virVasprintf(&msg, format, args); + msg = g_strdup_vprintf(format, args); va_end(args); if (virHostMsgWantEscape()) diff --git a/tools/vsh.c b/tools/vsh.c index b1d3bcff6d..ce7d80c621 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1855,7 +1855,7 @@ vshDebug(vshControl *ctl, int level, const char *format, ...) va_end(ap); va_start(ap, format); - virVasprintf(&str, format, ap); + str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1871,7 +1871,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) return; va_start(ap, format); - virVasprintf(&str, format, ap); + str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1885,7 +1885,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...) char *str; va_start(ap, format); - virVasprintf(&str, format, ap); + str = g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -2017,7 +2017,7 @@ vshError(vshControl *ctl, const char *format, ...) fputs(_("error: "), stderr); va_start(ap, format); - virVasprintf(&str, format, ap); + str = g_strdup_vprintf(format, ap); va_end(ap); fprintf(stderr, "%s\n", NULLSTR(str)); -- 2.21.0

Now that function is no longer used, it can be dropped. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/hacking.html.in | 5 ----- src/libvirt_private.syms | 1 - src/util/virstring.c | 21 --------------------- src/util/virstring.h | 11 ----------- 4 files changed, 38 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index f442eeb32a..4b6bcaed53 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1028,11 +1028,6 @@ BAD: <dt><code>VIR_STRDUP</code>, <code>VIR_STRNDUP</code></dt> <dd>Prefer the GLib APIs <code>g_strdup</code> and <code>g_strndup</code>.</dd> - <dt><code>virAsprintf</code>, <code>virVasprintf</code></dt> - <dd>The GLib APIs <code>g_strdup_printf</code> / <code>g_strdup_vprint</code> should be used - instead. Don't use <code>g_vasprintf</code> unless having the string length - returned is unavoidable.</dd> - <dt><code>virStrerror</code></dt> <dd>The GLib <code>g_strerror()</code> function should be used instead, which has a simpler calling convention as an added benefit.</dd> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e8458e26c7..59a1fdbe79 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3121,7 +3121,6 @@ virStrToLong_ull; virStrToLong_ullp; virStrToLong_ulp; virTrimSpaces; -virVasprintfInternal; # util/virsysinfo.h diff --git a/src/util/virstring.c b/src/util/virstring.c index c704ce38f0..f729bf9aa3 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -722,27 +722,6 @@ virDoubleToStr(char **strp, double number) } -void -virVasprintfInternal(char **strp, - const char *fmt, - va_list list) -{ - char *str = NULL; - - g_vasprintf(&str, fmt, list); - - /* GLib is supposed to abort() on OOM, but a mistake meant - * it did not. Delete this once our min glib is at 2.64.0 - * which includes the fix: - * https://gitlab.gnome.org/GNOME/glib/merge_requests/1145 - */ -#if !GLIB_CHECK_VERSION(2, 64, 0) - if (!str) - abort(); -#endif - *strp = str; -} - /** * virStrncpy: * diff --git a/src/util/virstring.h b/src/util/virstring.h index ea0774f2c7..081a5ff1aa 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,8 +133,6 @@ int virStrdup(char **dest, const char *src) int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -void virVasprintfInternal(char **strp, const char *fmt, va_list list) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0); /** * VIR_STRDUP: @@ -207,15 +205,6 @@ void virVasprintfInternal(char **strp, const char *fmt, va_list list) size_t virStringListLength(const char * const *strings); -/** - * virVasprintf - * - * Like glibc's vasprintf but aborts on OOM - * - * Returns number of bytes printed on success, aborts on OOM - */ -#define virVasprintf(strp, fmt, list) virVasprintfInternal(strp, fmt, list) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); -- 2.21.0

On 10/22/19 3:57 PM, Michal Privoznik wrote:

For future reference and anybody interested, I've made these changes using coccinelle http://coccinelle.lip6.fr/ I've used three semantic patches (aka spatch). The first one was to rename virAsprintfQueit() to virAsprintf(). It is trivial: $ cat virasprintf_rename.spatch @@ @@ -virAsprintfQuiet +virAsprintf Runnig coccinelle is fairly easy now that Jano pushed the macro file [1]: libvirt.git $ spatch --in-place --macro-file scripts/cocci-macro-file.h \ --sp-file virasprintf_rename.spatch --dir . The second spatch is a bit more complicated/verbose: $ cat virasprintf_no_return.spatch @@ expression e1, e2, e3; statement S; @@ -if (virAsprintf(e1, e2, e3) < 0) -S +virAsprintf(e1, e2, e3); @@ expression e1, e2, e3, e4; statement S; @@ -if (virAsprintf(e1, e2, e3, e4) < 0) -S +virAsprintf(e1, e2, e3, e4); [this pattern continues 3 more times, each time new argument is added] It is here that I've encountered first problems. Firstly, my spatch skills are not good enough (obviously), because I had to write several rules - each one for different number of arguments passed to virAsprintf(). But more importantly, I've completely missed joined statements like: if (virAsprintf() < 0 || virAsprintf() < 0) goto cleanup; On the other hand, I was left with only a few places that needed fixing. Coccinelle did 90% of conversion and I needed to do the rest by hand, which is a fair trade off IMO. Finally, the last spatch was used to rewrite code from using virAsprintf() to g_strdup_printf: $ cat g_strdup_printf.spatch @@ expression x; @@ -virAsprintf(&x, +x = g_strdup_printf( ... ); Again, worked perfectly except few places where we did not pass &x but x (which was char **). I've tried to make an spatch for that too but didn't succeed, so I've fixed those places by hand. Michal 1: Thing is, while coccinelle understands C very well, it doesn't quite understand all those __attribute__ and other extensions. Therefore, some macros made it impossible for coccinelle to parse some functions (e.g. g_autofree, g_autoptr and similar) and it did not perform requested change there then.