Signed-off-by: Ján Tomko <jtomko@redhat.com> --- scripts/cocci-macro-file.h | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 scripts/cocci-macro-file.h diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h new file mode 100644 index 0000000000..a76ba533b4 --- /dev/null +++ b/scripts/cocci-macro-file.h @@ -0,0 +1,39 @@ +/* + * cocci-macro-file.h: simplified macro definitions for Coccinelle + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * To be used with: + * $ spatch --macro-file scripts/cocci-macro-file.h + */ + +#pragma once + +#define ATTRIBUTE_NONNULL(x) +#define ATTRIBUTE_PACKED + +#define G_GNUC_WARN_UNUSED_RESULT +#define G_GNUC_UNUSED +#define G_GNUC_NULL_TERMINATED +#define G_GNUC_NORETURN +#define G_GNUC_NO_INLINE +#define G_GNUC_FALLTHROUGH +#define G_GNUC_PRINTF(a, b) + +#define g_autoptr(x) x##_autoptr +#define g_autofree +#define g_auto + +#define BAD_CAST -- 2.21.0

Use a temporary variable to allow copying from the currently set source. Always return 0 since none of the callers distinguishes between 0 and 1 propagated from VIR_STRDUP. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/conf/domain_conf.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 88e93f6fb8..cd9b6ca993 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2139,15 +2139,10 @@ virDomainDiskGetSource(virDomainDiskDef const *def) int virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src) { - int ret; - char *tmp = def->src->path; - - ret = VIR_STRDUP(def->src->path, src); - if (ret < 0) - def->src->path = tmp; - else - VIR_FREE(tmp); - return ret; + char *tmp = g_strdup(src); + g_free(def->src->path); + def->src->path = tmp; + return 0; } @@ -2174,15 +2169,10 @@ virDomainDiskGetDriver(const virDomainDiskDef *def) int virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name) { - int ret; - char *tmp = def->driverName; - - ret = VIR_STRDUP(def->driverName, name); - if (ret < 0) - def->driverName = tmp; - else - VIR_FREE(tmp); - return ret; + char *tmp = g_strdup(name); + g_free(def->driverName); + def->driverName = tmp; + return 0; } -- 2.21.0

Replace all the occurrences of ignore_value(VIR_STRDUP_QUIET(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- src/qemu/qemu_process.c | 14 +++++++------- src/util/virerror.c | 11 +++++------ src/util/virfile.c | 4 ++-- src/util/virstoragefile.c | 2 +- src/util/virutil.c | 8 ++++---- tests/networkxml2firewalltest.c | 4 ++-- tests/virfilemock.c | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 9cedf39578..1d1691f6ba 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -101,7 +101,7 @@ virLockManagerSanlockError(int err, { if (err <= -200) { #if HAVE_SANLOCK_STRERROR - ignore_value(VIR_STRDUP_QUIET(*message, sanlock_strerror(err))); + *message = g_strdup(sanlock_strerror(err)); #else ignore_value(virAsprintfQuiet(message, _("sanlock error %d"), err)); #endif diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9eaea4edfd..843e852591 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -959,7 +959,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNUSED, /* We have a SYNC API waiting for this event, dispatch it back */ job->newstate = status; VIR_FREE(job->errmsg); - ignore_value(VIR_STRDUP_QUIET(job->errmsg, error)); + job->errmsg = g_strdup(error); virDomainObjBroadcast(vm); } else { /* there is no waiting SYNC API, dispatch the update to a thread */ @@ -1749,11 +1749,11 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, } priv->job.dumpCompleted = true; priv->job.current->stats.dump = *stats; - ignore_value(VIR_STRDUP_QUIET(priv->job.error, error)); + priv->job.error = g_strdup(error); /* Force error if extracting the DUMP_COMPLETED status failed */ if (!error && status < 0) { - ignore_value(VIR_STRDUP_QUIET(priv->job.error, virGetLastErrorMessage())); + priv->job.error = g_strdup(virGetLastErrorMessage()); priv->job.current->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; } @@ -3407,20 +3407,20 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) oldReason == VIR_DOMAIN_PAUSED_STARTING_UP))) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_BOOTED; - ignore_value(VIR_STRDUP_QUIET(msg, "finished booting")); + msg = g_strdup("finished booting"); } else if (state == VIR_DOMAIN_PAUSED && running) { newState = VIR_DOMAIN_RUNNING; newReason = VIR_DOMAIN_RUNNING_UNPAUSED; - ignore_value(VIR_STRDUP_QUIET(msg, "was unpaused")); + msg = g_strdup("was unpaused"); } else if (state == VIR_DOMAIN_RUNNING && !running) { if (reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { newState = VIR_DOMAIN_SHUTDOWN; newReason = VIR_DOMAIN_SHUTDOWN_UNKNOWN; - ignore_value(VIR_STRDUP_QUIET(msg, "shutdown")); + msg = g_strdup("shutdown"); } else if (reason == VIR_DOMAIN_PAUSED_CRASHED) { newState = VIR_DOMAIN_CRASHED; newReason = VIR_DOMAIN_CRASHED_PANICKED; - ignore_value(VIR_STRDUP_QUIET(msg, "crashed")); + msg = g_strdup("crashed"); } else { newState = VIR_DOMAIN_PAUSED; newReason = reason; diff --git a/src/util/virerror.c b/src/util/virerror.c index b45c53b7df..512b2bc7fe 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -187,8 +187,7 @@ virErrorGenericFailure(virErrorPtr err) err->code = VIR_ERR_INTERNAL_ERROR; err->domain = VIR_FROM_NONE; err->level = VIR_ERR_ERROR; - ignore_value(VIR_STRDUP_QUIET(err->message, - _("An error occurred, but the cause is unknown"))); + err->message = g_strdup(_("An error occurred, but the cause is unknown")); } @@ -831,7 +830,7 @@ virRaiseErrorFull(const char *filename, * formats the message; drop message on OOM situations */ if (fmt == NULL) { - ignore_value(VIR_STRDUP_QUIET(str, _("No error message provided"))); + str = g_strdup(_("No error message provided")); } else { va_list ap; va_start(ap, fmt); @@ -850,9 +849,9 @@ virRaiseErrorFull(const char *filename, to->code = code; to->message = str; to->level = level; - ignore_value(VIR_STRDUP_QUIET(to->str1, str1)); - ignore_value(VIR_STRDUP_QUIET(to->str2, str2)); - ignore_value(VIR_STRDUP_QUIET(to->str3, str3)); + to->str1 = g_strdup(str1); + to->str2 = g_strdup(str2); + to->str3 = g_strdup(str3); to->int1 = int1; to->int2 = int2; diff --git a/src/util/virfile.c b/src/util/virfile.c index 2fb389eeb2..15713a58d9 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1264,7 +1264,7 @@ virFileFindMountPoint(const char *type) while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) { if (STREQ(mb.mnt_type, type)) { - ignore_value(VIR_STRDUP_QUIET(ret, mb.mnt_dir)); + ret = g_strdup(mb.mnt_dir); goto cleanup; } } @@ -1667,7 +1667,7 @@ virFindFileInPath(const char *file) if (IS_ABSOLUTE_FILE_NAME(file)) { char *ret = NULL; if (virFileIsExecutable(file)) - ignore_value(VIR_STRDUP_QUIET(ret, file)); + ret = g_strdup(file); return ret; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 098d2684cc..64e09d7951 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1711,7 +1711,7 @@ virStorageFileChainLookup(virStorageSourcePtr chain, if (*parent && virStorageSourceIsLocalStorage(*parent)) parentDir = mdir_name((*parent)->path); else - ignore_value(VIR_STRDUP_QUIET(parentDir, ".")); + parentDir = g_strdup("."); if (!parentDir) { virReportOOMError(); diff --git a/src/util/virutil.c b/src/util/virutil.c index 637d19e46c..63071e2fa6 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -523,7 +523,7 @@ virGetHostnameImpl(bool quiet) * string as-is; it's up to callers to check whether "localhost" * is allowed. */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); + result = g_strdup(hostname); goto cleanup; } @@ -539,7 +539,7 @@ virGetHostnameImpl(bool quiet) if (!quiet) VIR_WARN("getaddrinfo failed for '%s': %s", hostname, gai_strerror(r)); - ignore_value(VIR_STRDUP_QUIET(result, hostname)); + result = g_strdup(hostname); goto cleanup; } @@ -552,10 +552,10 @@ virGetHostnameImpl(bool quiet) * localhost. Ignore the canonicalized name and just return the * original hostname */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); + result = g_strdup(hostname); else /* Caller frees this string. */ - ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); + result = g_strdup(info->ai_canonname); freeaddrinfo(info); diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index e49eef6162..b8e974971a 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -53,8 +53,8 @@ testCommandDryRun(const char *const*args G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { *status = 0; - ignore_value(VIR_STRDUP_QUIET(*output, "")); - ignore_value(VIR_STRDUP_QUIET(*error, "")); + *output = g_strdup(""); + *error = g_strdup(""); } static int testCompareXMLToArgvFiles(const char *xml, diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 6d1153dd9f..00efb820ad 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -190,7 +190,7 @@ canonicalize_file_name(const char *path) if ((p = STRSKIP(path, "/some/symlink"))) ignore_value(virAsprintfQuiet(&ret, "/gluster%s", p)); else - ignore_value(VIR_STRDUP_QUIET(ret, path)); + ret = g_strdup(path); return ret; } -- 2.21.0

All the callers of these functions only check for a negative return value. However, virNetDevOpenvswitchGetVhostuserIfname is documented as returning 1 for openvswitch interfaces so preserve that. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/esx/esx_vi.c | 3 ++- src/esx/esx_vi_types.c | 6 ++---- src/qemu/qemu_alias.c | 21 ++++++++++++++------- src/qemu/qemu_monitor_json.c | 3 ++- src/storage/storage_util.c | 3 ++- src/util/vircgroupv2.c | 6 ++++-- src/util/viriscsi.c | 6 ++++-- src/util/virnuma.c | 3 ++- src/util/virresctrl.c | 3 ++- src/util/virstoragefile.c | 3 ++- src/util/viruri.c | 3 ++- tests/qemuxml2argvmock.c | 6 ++++-- tests/securityselinuxhelper.c | 6 ++++-- 13 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 004434c454..ef37bbf88d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2388,7 +2388,8 @@ esxVI_GetVirtualMachineMORef(esxVI_ObjectContent *virtualMachine, if (virtualMachine->obj && STREQ(virtualMachine->obj->type, "VirtualMachine") && virtualMachine->obj->value) { - return VIR_STRDUP(*moref, virtualMachine->obj->value); + *moref = g_strdup(virtualMachine->obj->value); + return 0; } } return -1; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index deb6ebd09f..29b1b01b9b 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1206,10 +1206,8 @@ esxVI_String_DeepCopyValue(char **dest, const char *src) { ESX_VI_CHECK_ARG_LIST(dest); - if (!src) - return 0; - - return VIR_STRDUP(*dest, src); + *dest = g_strdup(src); + return 0; } /* esxVI_String_CastFromAnyType */ diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 5af3725bf5..d4d8eb4252 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -134,7 +134,8 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, * hardcoded the name of their single PCI controller as * "pci". */ - return VIR_STRDUP(controller->info.alias, "pci"); + controller->info.alias = g_strdup("pci"); + return 0; } else if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { /* The pcie-root controller on Q35 machinetypes uses a * different naming convention ("pcie.0"), because it is @@ -153,18 +154,24 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, * controller hardcoded with id "ide" */ if (qemuDomainHasBuiltinIDE(domainDef) && - controller->idx == 0) - return VIR_STRDUP(controller->info.alias, "ide"); + controller->idx == 0) { + controller->info.alias = g_strdup("ide"); + return 0; + } } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { /* for any Q35 machine, the first SATA controller is the * integrated one, and it too is hardcoded with id "ide" */ - if (qemuDomainIsQ35(domainDef) && controller->idx == 0) - return VIR_STRDUP(controller->info.alias, "ide"); + if (qemuDomainIsQ35(domainDef) && controller->idx == 0) { + controller->info.alias = g_strdup("ide"); + return 0; + } } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) { /* first USB device is "usb", others are normal "usb%d" */ - if (controller->idx == 0) - return VIR_STRDUP(controller->info.alias, "usb"); + if (controller->idx == 0) { + controller->info.alias = g_strdup("usb"); + return 0; + } } /* all other controllers use the default ${type}${index} naming * scheme for alias/id. diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 4b765da0b1..602a0380d7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5957,7 +5957,8 @@ qemuMonitorJSONGetCPUModelComparison(qemuMonitorPtr mon, return -1; } - return VIR_STRDUP(*result, data_result); + *result = g_strdup(data_result); + return 0; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a4c8a5e971..692b3e7a9d 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2072,7 +2072,8 @@ virStorageBackendVolCreateLocal(virStoragePoolObjPtr pool, } VIR_FREE(vol->key); - return VIR_STRDUP(vol->key, vol->target.path); + vol->key = g_strdup(vol->target.path); + return 0; } diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 621ab71eb5..7a64e74c3a 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -146,7 +146,8 @@ static int virCgroupV2CopyMounts(virCgroupPtr group, virCgroupPtr parent) { - return VIR_STRDUP(group->unified.mountPoint, parent->unified.mountPoint); + group->unified.mountPoint = g_strdup(parent->unified.mountPoint); + return 0; } @@ -189,7 +190,8 @@ virCgroupV2DetectMounts(virCgroupPtr group, VIR_FREE(group->unified.mountPoint); - return VIR_STRDUP(group->unified.mountPoint, mntDir); + group->unified.mountPoint = g_strdup(mntDir); + return 0; } diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index dc553e7752..1b143ec61f 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -60,8 +60,10 @@ virISCSIExtractSession(char **const groups, struct virISCSISessionData *data = opaque; if (!data->session && - STREQ(groups[1], data->devpath)) - return VIR_STRDUP(data->session, groups[0]); + STREQ(groups[1], data->devpath)) { + data->session = g_strdup(groups[0]); + return 0; + } return 0; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 8f50634c2a..448833d8d1 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -579,7 +579,8 @@ static int virNumaGetHugePageInfoDir(char **path, int node) { if (node == -1) { - return VIR_STRDUP(*path, HUGEPAGES_SYSTEM_PREFIX); + *path = g_strdup(HUGEPAGES_SYSTEM_PREFIX); + return 0; } else { return virAsprintf(path, HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index ab650b59b9..e52408ed06 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1388,7 +1388,8 @@ virResctrlSetID(char **resctrlid, return -1; } - return VIR_STRDUP(*resctrlid, id); + *resctrlid = g_strdup(id); + return 0; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 64e09d7951..c13ed9fee5 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -4468,7 +4468,8 @@ int virStorageSourceInitiatorCopy(virStorageSourceInitiatorDefPtr dest, const virStorageSourceInitiatorDef *src) { - return VIR_STRDUP(dest->iqn, src->iqn); + dest->iqn = g_strdup(src->iqn); + return 0; } void diff --git a/src/util/viruri.c b/src/util/viruri.c index a43fe2afd4..af2e828c28 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -350,7 +350,8 @@ virURIFindAliasMatch(char *const*aliases, const char *alias, STREQLEN(*aliases, alias, alias_len)) { VIR_DEBUG("Resolved alias '%s' to '%s'", alias, offset+1); - return VIR_STRDUP(*uri, offset+1); + *uri = g_strdup(offset + 1); + return 0; } aliases++; diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 2b9e5e7a49..34e0eb91a6 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -153,7 +153,8 @@ virNetDevTapCreate(char **ifname, return 0; } else { VIR_FREE(*ifname); - return VIR_STRDUP(*ifname, "vnet0"); + *ifname = g_strdup("vnet0"); + return 0; } } @@ -229,7 +230,8 @@ int virNetDevOpenvswitchGetVhostuserIfname(const char *path G_GNUC_UNUSED, char **ifname) { - return VIR_STRDUP(*ifname, "vhost-user0"); + *ifname = g_strdup("vhost-user0"); + return 1; } int diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 6391f67360..814250b731 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -111,7 +111,8 @@ int getcon_raw(security_context_t *context) errno = EINVAL; return -1; } - return VIR_STRDUP_QUIET(*context, getenv("FAKE_SELINUX_CONTEXT")); + *context = g_strdup(getenv("FAKE_SELINUX_CONTEXT")); + return 0; } int getcon(security_context_t *context) @@ -135,7 +136,8 @@ int getpidcon_raw(pid_t pid, security_context_t *context) errno = EINVAL; return -1; } - return VIR_STRDUP_QUIET(*context, getenv("FAKE_SELINUX_CONTEXT")); + *context = g_strdup(getenv("FAKE_SELINUX_CONTEXT")); + return 0; } int getpidcon(pid_t pid, security_context_t *context) -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/bhyve/bhyve_command.c | 15 +++++--------- src/bhyve/bhyve_conf.c | 3 +-- src/bhyve/bhyve_driver.c | 3 +-- src/bhyve/bhyve_parse_command.c | 35 +++++++++------------------------ 4 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 912cf99683..8ea76cee2e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -58,12 +58,10 @@ bhyveBuildNetArgStr(virConnectPtr conn, virDomainNetType actualType = virDomainNetGetActualType(net); if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO) { - if (VIR_STRDUP(nic_model, "virtio-net") < 0) - return -1; + nic_model = g_strdup("virtio-net"); } else if (net->model == VIR_DOMAIN_NET_MODEL_E1000) { if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_NET_E1000) != 0) { - if (VIR_STRDUP(nic_model, "e1000") < 0) - return -1; + nic_model = g_strdup("e1000"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("NIC model 'e1000' is not supported " @@ -77,8 +75,7 @@ bhyveBuildNetArgStr(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) - goto cleanup; + brname = g_strdup(virDomainNetGetActualBridgeName(net)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Network type %d is not supported"), @@ -90,8 +87,7 @@ bhyveBuildNetArgStr(virConnectPtr conn, STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_TAP_PREFIX "%d") < 0) - goto cleanup; + net->ifname = g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d"); } if (!dryRun) { @@ -117,8 +113,7 @@ bhyveBuildNetArgStr(virConnectPtr conn, if (virNetDevSetOnline(net->ifname, true) != 0) goto cleanup; } else { - if (VIR_STRDUP(realifname, "tap0") < 0) - goto cleanup; + realifname = g_strdup("tap0"); } diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index 617b25eb8f..ab5d7f467b 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -56,8 +56,7 @@ virBhyveDriverConfigNew(void) if (!(cfg = virObjectNew(virBhyveDriverConfigClass))) return NULL; - if (VIR_STRDUP(cfg->firmwareDir, DATADIR "/uefi-firmware") < 0) - goto error; + cfg->firmwareDir = g_strdup(DATADIR "/uefi-firmware"); return cfg; diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index db3d71f2b2..e3d984f69a 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -470,8 +470,7 @@ bhyveDomainGetOSType(virDomainPtr dom) if (virDomainGetOSTypeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (VIR_STRDUP(ret, virDomainOSTypeToString(vm->def->os.type)) < 0) - goto cleanup; + ret = g_strdup(virDomainOSTypeToString(vm->def->os.type)); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 7c72651b00..fa3b881f21 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -299,16 +299,8 @@ bhyveParseBhyveLPCArg(virDomainDefPtr def, goto error; } - if (VIR_STRDUP(chr->source->data.nmdm.master, param) < 0) { - virDomainChrDefFree(chr); - goto error; - } - - if (VIR_STRDUP(chr->source->data.nmdm.slave, chr->source->data.file.path) - < 0) { - virDomainChrDefFree(chr); - goto error; - } + chr->source->data.nmdm.master = g_strdup(param); + chr->source->data.nmdm.slave = g_strdup(chr->source->data.file.path); /* If the last character of the master is 'A', the slave will be 'B' * and vice versa */ @@ -456,13 +448,11 @@ bhyveParsePCIDisk(virDomainDefPtr def, if (bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { idx = *nvirtiodisk; *nvirtiodisk += 1; - if (VIR_STRDUP(disk->dst, "vda") < 0) - goto error; + disk->dst = g_strdup("vda"); } else if (bus == VIR_DOMAIN_DISK_BUS_SATA) { idx = *nahcidisk; *nahcidisk += 1; - if (VIR_STRDUP(disk->dst, "sda") < 0) - goto error; + disk->dst = g_strdup("sda"); } if (idx > 'z' - 'a') { @@ -507,8 +497,7 @@ bhyveParsePCINet(virDomainDefPtr def, * guess the actual bridge name from the command line, * try to come up with some reasonable defaults */ net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0) - goto error; + net->data.bridge.brname = g_strdup("virbr0"); net->model = model; net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; @@ -738,8 +727,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, } if (def->name == NULL) { - if (VIR_STRDUP(def->name, argv[argc]) < 0) - goto error; + def->name = g_strdup(argv[argc]); } else if (STRNEQ(def->name, argv[argc])) { /* the vm name of the loader and the bhyverun command differ, throw an * error here */ @@ -819,15 +807,12 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, if (arguments != 3) { /* Set os.bootloader since virDomainDefFormatInternal will only format * the bootloader arguments if os->bootloader is set. */ - if (VIR_STRDUP(def->os.bootloader, argv[0]) < 0) - goto error; - + def->os.bootloader = g_strdup(argv[0]); def->os.bootloaderArgs = virStringListJoin((const char**) &argv[1], " "); } if (def->name == NULL) { - if (VIR_STRDUP(def->name, argv[argc]) < 0) - goto error; + def->name = g_strdup(argv[argc]); } else if (STRNEQ(def->name, argv[argc])) { /* the vm name of the loader and the bhyverun command differ, throw an * error here */ @@ -849,9 +834,7 @@ bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, if (!argv) goto error; - if (VIR_STRDUP(def->os.bootloader, argv[0]) < 0) - goto error; - + def->os.bootloader = g_strdup(argv[0]); def->os.bootloaderArgs = virStringListJoin((const char**) &argv[1], " "); return 0; -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/datatypes.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 33c3f6be88..552115c7a3 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -290,8 +290,7 @@ virGetDomain(virConnectPtr conn, if (!(ret = virObjectNew(virDomainClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->conn = virObjectRef(conn); ret->id = id; @@ -354,8 +353,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) if (!(ret = virObjectNew(virNetworkClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->conn = virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); @@ -477,9 +475,8 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) if (!(ret = virObjectNew(virInterfaceClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0 || - VIR_STRDUP(ret->mac, mac) < 0) - goto error; + ret->name = g_strdup(name); + ret->mac = g_strdup(mac); ret->conn = virObjectRef(conn); @@ -542,8 +539,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, if (!(ret = virObjectNew(virStoragePoolClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->conn = virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); @@ -618,10 +614,9 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, if (!(ret = virObjectNew(virStorageVolClass))) goto error; - if (VIR_STRDUP(ret->pool, pool) < 0 || - VIR_STRDUP(ret->name, name) < 0 || - VIR_STRDUP(ret->key, key) < 0) - goto error; + ret->pool = g_strdup(pool); + ret->name = g_strdup(name); + ret->key = g_strdup(key); ret->conn = virObjectRef(conn); @@ -687,8 +682,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) if (!(ret = virObjectNew(virNodeDeviceClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->conn = virObjectRef(conn); return ret; @@ -749,8 +743,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); ret->usageType = usageType; - if (VIR_STRDUP(ret->usageID, NULLSTR_EMPTY(usageID)) < 0) - goto error; + ret->usageID = g_strdup(NULLSTR_EMPTY(usageID)); ret->conn = virObjectRef(conn); @@ -859,8 +852,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, if (!(ret = virObjectNew(virNWFilterClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); @@ -924,11 +916,9 @@ virGetNWFilterBinding(virConnectPtr conn, const char *portdev, if (!(ret = virObjectNew(virNWFilterBindingClass))) goto error; - if (VIR_STRDUP(ret->portdev, portdev) < 0) - goto error; + ret->portdev = g_strdup(portdev); - if (VIR_STRDUP(ret->filtername, filtername) < 0) - goto error; + ret->filtername = g_strdup(filtername); ret->conn = virObjectRef(conn); @@ -987,8 +977,7 @@ virGetDomainCheckpoint(virDomainPtr domain, if (!(ret = virObjectNew(virDomainCheckpointClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->domain = virObjectRef(domain); @@ -1044,8 +1033,7 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name) if (!(ret = virObjectNew(virDomainSnapshotClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->domain = virObjectRef(domain); @@ -1192,8 +1180,7 @@ virAdmGetServer(virAdmConnectPtr conn, const char *name) if (!(ret = virObjectNew(virAdmServerClass))) goto error; - if (VIR_STRDUP(ret->name, name) < 0) - goto error; + ret->name = g_strdup(name); ret->conn = virObjectRef(conn); -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/interface/interface_backend_netcf.c | 11 ++------- src/interface/interface_backend_udev.c | 30 ++++++------------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 00b5c00822..27590af134 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -251,17 +251,10 @@ netcfGetMinimalDefForDevice(struct netcf_if *iface) if (VIR_ALLOC(def) < 0) return NULL; - if (VIR_STRDUP(def->name, ncf_if_name(iface)) < 0) - goto cleanup; - - if (VIR_STRDUP(def->mac, ncf_if_mac_string(iface)) < 0) - goto cleanup; + def->name = g_strdup(ncf_if_name(iface)); + def->mac = g_strdup(ncf_if_mac_string(iface)); return def; - - cleanup: - virInterfaceDefFree(def); - return NULL; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index dcf22af440..251c2ecdf0 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -89,17 +89,10 @@ udevGetMinimalDefForDevice(struct udev_device *dev) if (VIR_ALLOC(def) < 0) return NULL; - if (VIR_STRDUP(def->name, udev_device_get_sysname(dev)) < 0) - goto cleanup; - - if (VIR_STRDUP(def->mac, udev_device_get_sysattr_value(dev, "address")) < 0) - goto cleanup; + def->name = g_strdup(udev_device_get_sysname(dev)); + def->mac = g_strdup(udev_device_get_sysattr_value(dev, "address")); return def; - - cleanup: - virInterfaceDefFree(def); - return NULL; } @@ -236,11 +229,7 @@ udevListInterfacesByStatus(virConnectPtr conn, def = udevGetMinimalDefForDevice(dev); if (filter(conn, def)) { - if (VIR_STRDUP(names[count], udev_device_get_sysname(dev)) < 0) { - udev_device_unref(dev); - virInterfaceDefFree(def); - goto error; - } + names[count] = g_strdup(udev_device_get_sysname(dev)); count++; } udev_device_unref(dev); @@ -755,8 +744,7 @@ udevGetIfaceDefBond(struct udev *udev, _("Could not retrieve 'bonding/arp_ip_target' for '%s'"), name); goto error; } - if (VIR_STRDUP(ifacedef->data.bond.target, tmp_str) < 0) - goto error; + ifacedef->data.bond.target = g_strdup(tmp_str); /* Slaves of the bond */ /* Get each slave in the bond */ @@ -837,8 +825,7 @@ udevGetIfaceDefBridge(struct udev *udev, goto error; } - if (VIR_STRDUP(ifacedef->data.bridge.delay, tmp_str) < 0) - goto error; + ifacedef->data.bridge.delay = g_strdup(tmp_str); /* Retrieve Spanning Tree State. Valid values = -1, 0, 1 */ tmp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state"); @@ -1001,8 +988,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) /* Clear our structure and set safe defaults */ ifacedef->startmode = VIR_INTERFACE_START_UNSPECIFIED; - if (VIR_STRDUP(ifacedef->name, name) < 0) - goto error; + ifacedef->name = g_strdup(name); /* Lookup the device we've been asked about */ dev = udev_device_new_from_subsystem_sysname(udev, "net", name); @@ -1013,9 +999,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) } /* MAC address */ - if (VIR_STRDUP(ifacedef->mac, - udev_device_get_sysattr_value(dev, "address")) < 0) - goto error; + ifacedef->mac = g_strdup(udev_device_get_sysattr_value(dev, "address")); /* Link state and speed */ if (virNetDevGetLinkInfo(ifacedef->name, &ifacedef->lnk) < 0) -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/locking/lock_daemon.c | 24 +++++++----------------- src/locking/lock_daemon_config.c | 3 +-- src/locking/lock_daemon_dispatch.c | 3 +-- src/locking/lock_driver_lockd.c | 24 ++++++++---------------- src/locking/lock_driver_sanlock.c | 12 ++---------- src/locking/lock_manager.c | 3 +-- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 0894ee8e93..7d8c11a2a3 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -447,9 +447,8 @@ virLockDaemonUnixSocketPaths(bool privileged, char **adminSockfile) { if (privileged) { - if (VIR_STRDUP(*sockfile, RUNSTATEDIR "/libvirt/virtlockd-sock") < 0 || - VIR_STRDUP(*adminSockfile, RUNSTATEDIR "/libvirt/virtlockd-admin-sock") < 0) - goto error; + *sockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-sock"); + *adminSockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-admin-sock"); } else { char *rundir = NULL; mode_t old_umask; @@ -760,8 +759,7 @@ virLockDaemonClientNewPostExecRestart(virNetServerClientPtr client, _("Missing ownerName data in JSON document")); goto error; } - if (VIR_STRDUP(priv->ownerName, ownerName) < 0) - goto error; + priv->ownerName = g_strdup(ownerName); if (!(ownerUUID = virJSONValueObjectGetString(object, "ownerUUID"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing ownerUUID data in JSON document")); @@ -831,8 +829,7 @@ virLockDaemonExecRestartStatePath(bool privileged, char **state_file) { if (privileged) { - if (VIR_STRDUP(*state_file, RUNSTATEDIR "/virtlockd-restart-exec.json") < 0) - goto error; + *state_file = g_strdup(RUNSTATEDIR "/virtlockd-restart-exec.json"); } else { char *rundir = NULL; mode_t old_umask; @@ -1162,14 +1159,12 @@ int main(int argc, char **argv) { case 'p': VIR_FREE(pid_file); - if (VIR_STRDUP_QUIET(pid_file, optarg) < 0) - goto no_memory; + pid_file = g_strdup(optarg); break; case 'f': VIR_FREE(remote_config_file); - if (VIR_STRDUP_QUIET(remote_config_file, optarg) < 0) - goto no_memory; + remote_config_file = g_strdup(optarg); break; case 'V': @@ -1247,8 +1242,7 @@ int main(int argc, char **argv) { /* Ensure the rundir exists (on tmpfs on some systems) */ if (privileged) { - if (VIR_STRDUP_QUIET(run_dir, RUNSTATEDIR "/libvirt") < 0) - goto no_memory; + run_dir = g_strdup(RUNSTATEDIR "/libvirt"); } else { if (!(run_dir = virGetUserRuntimeDirectory())) { VIR_ERROR(_("Can't determine user directory")); @@ -1448,8 +1442,4 @@ int main(int argc, char **argv) { VIR_FREE(run_dir); virLockDaemonConfigFree(config); return ret; - - no_memory: - VIR_ERROR(_("Can't allocate memory")); - exit(EXIT_FAILURE); } diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index a506423e5e..6e635f1e0b 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -39,8 +39,7 @@ int virLockDaemonConfigFilePath(bool privileged, char **configfile) { if (privileged) { - if (VIR_STRDUP(*configfile, SYSCONFDIR "/libvirt/virtlockd.conf") < 0) - goto error; + *configfile = g_strdup(SYSCONFDIR "/libvirt/virtlockd.conf"); } else { char *configdir = NULL; diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index d68fd9cf01..1a53772366 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -277,8 +277,7 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr server G_GNUC_UNUSED, goto cleanup; } - if (VIR_STRDUP(priv->ownerName, args->owner.name) < 0) - goto cleanup; + priv->ownerName = g_strdup(args->owner.name); memcpy(priv->ownerUUID, args->owner.uuid, VIR_UUID_BUFLEN); priv->ownerId = args->owner.id; priv->ownerPid = args->owner.pid; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 8277e5ba92..9452f2957c 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -120,8 +120,7 @@ static char *virLockManagerLockDaemonPath(bool privileged) { char *path; if (privileged) { - if (VIR_STRDUP(path, RUNSTATEDIR "/libvirt/virtlockd-sock") < 0) - return NULL; + path = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-sock"); } else { char *rundir = NULL; @@ -422,8 +421,7 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock, if (STREQ(params[i].key, "uuid")) { memcpy(priv->uuid, params[i].value.uuid, VIR_UUID_BUFLEN); } else if (STREQ(params[i].key, "name")) { - if (VIR_STRDUP(priv->name, params[i].value.str) < 0) - goto cleanup; + priv->name = g_strdup(params[i].value.str); } else if (STREQ(params[i].key, "id")) { priv->id = params[i].value.iv; } else if (STREQ(params[i].key, "pid")) { @@ -515,8 +513,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, if (newName) { VIR_DEBUG("Got an LVM UUID %s for %s", newName, name); - if (VIR_STRDUP(newLockspace, driver->lvmLockSpaceDir) < 0) - goto cleanup; + newLockspace = g_strdup(driver->lvmLockSpaceDir); autoCreate = true; break; } @@ -532,8 +529,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, if (newName) { VIR_DEBUG("Got an SCSI ID %s for %s", newName, name); - if (VIR_STRDUP(newLockspace, driver->scsiLockSpaceDir) < 0) - goto cleanup; + newLockspace = g_strdup(driver->scsiLockSpaceDir); autoCreate = true; break; } @@ -542,17 +538,14 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, } if (driver->fileLockSpaceDir) { - if (VIR_STRDUP(newLockspace, driver->fileLockSpaceDir) < 0) - goto cleanup; + newLockspace = g_strdup(driver->fileLockSpaceDir); if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName) < 0) goto cleanup; autoCreate = true; VIR_DEBUG("Using indirect lease %s for %s", newName, name); } else { - if (VIR_STRDUP(newLockspace, "") < 0) - goto cleanup; - if (VIR_STRDUP(newName, name) < 0) - goto cleanup; + newLockspace = g_strdup(""); + newName = g_strdup(name); VIR_DEBUG("Using direct lease for %s", name); } @@ -587,8 +580,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, if (virAsprintf(&newLockspace, "%s/%s", path, lockspace) < 0) goto cleanup; - if (VIR_STRDUP(newName, name) < 0) - goto cleanup; + newName = g_strdup(name); } break; default: diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 1d1691f6ba..beeeb6066b 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -440,10 +440,7 @@ static int virLockManagerSanlockInit(unsigned int version, driver->io_timeout = 0; driver->user = (uid_t) -1; driver->group = (gid_t) -1; - if (VIR_STRDUP(driver->autoDiskLeasePath, LOCALSTATEDIR "/lib/libvirt/sanlock") < 0) { - VIR_FREE(driver); - goto error; - } + driver->autoDiskLeasePath = g_strdup(LOCALSTATEDIR "/lib/libvirt/sanlock"); if (virLockManagerSanlockLoadConfig(driver, configFile) < 0) goto error; @@ -514,8 +511,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, if (STREQ(param->key, "uuid")) { memcpy(priv->vm_uuid, param->value.uuid, 16); } else if (STREQ(param->key, "name")) { - if (VIR_STRDUP(priv->vm_name, param->value.str) < 0) - goto error; + priv->vm_name = g_strdup(param->value.str); } else if (STREQ(param->key, "pid")) { priv->vm_pid = param->value.iv; } else if (STREQ(param->key, "id")) { @@ -540,10 +536,6 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, lock->privateData = priv; return 0; - - error: - VIR_FREE(priv); - return -1; } static void virLockManagerSanlockFree(virLockManagerPtr lock) diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index c6940e5a69..6898bfc556 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -179,8 +179,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, plugin->driver = driver; plugin->handle = handle; plugin->refs = 1; - if (VIR_STRDUP(plugin->name, name) < 0) - goto cleanup; + plugin->name = g_strdup(name); VIR_FREE(configFile); VIR_FREE(modfile); -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/lxc/lxc_conf.c | 21 ++++---------- src/lxc/lxc_container.c | 20 +++++-------- src/lxc/lxc_controller.c | 12 +++----- src/lxc/lxc_driver.c | 3 +- src/lxc/lxc_native.c | 63 +++++++++++++++------------------------- src/lxc/lxc_process.c | 13 +++------ 6 files changed, 46 insertions(+), 86 deletions(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 4d8314045e..de9793e523 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -150,10 +150,8 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) if (VIR_ALLOC(caps->host.secModels) < 0) goto error; caps->host.nsecModels = 1; - if (VIR_STRDUP(caps->host.secModels[0].model, model) < 0) - goto error; - if (VIR_STRDUP(caps->host.secModels[0].doi, doi) < 0) - goto error; + caps->host.secModels[0].model = g_strdup(model); + caps->host.secModels[0].doi = g_strdup(doi); if (label && virCapabilitiesHostSecModelAddBaseLabel(&caps->host.secModels[0], type, @@ -233,19 +231,12 @@ virLXCDriverConfigNew(void) cfg->securityRequireConfined = false; /* Set the container configuration directory */ - if (VIR_STRDUP(cfg->configDir, LXC_CONFIG_DIR) < 0) - goto error; - if (VIR_STRDUP(cfg->stateDir, LXC_STATE_DIR) < 0) - goto error; - if (VIR_STRDUP(cfg->logDir, LXC_LOG_DIR) < 0) - goto error; - if (VIR_STRDUP(cfg->autostartDir, LXC_AUTOSTART_DIR) < 0) - goto error; + cfg->configDir = g_strdup(LXC_CONFIG_DIR); + cfg->stateDir = g_strdup(LXC_STATE_DIR); + cfg->logDir = g_strdup(LXC_LOG_DIR); + cfg->autostartDir = g_strdup(LXC_AUTOSTART_DIR); return cfg; - error: - virObjectUnref(cfg); - return NULL; } int diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 5002356fe7..88dc2e2bdf 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -856,8 +856,9 @@ static int lxcContainerSetReadOnly(void) lxcIsBasicMountLocation(mntent.mnt_dir)) continue; - if (VIR_STRDUP(tmp, mntent.mnt_dir) < 0 || - VIR_APPEND_ELEMENT(mounts, nmounts, tmp) < 0) { + tmp = g_strdup(mntent.mnt_dir); + + if (VIR_APPEND_ELEMENT(mounts, nmounts, tmp) < 0) { VIR_FREE(tmp); goto cleanup; } @@ -910,12 +911,10 @@ static int lxcContainerMountBasicFS(bool userns_enabled, */ if (userns_enabled && netns_disabled && STREQ(mnt->src, "sysfs")) { - if (VIR_STRDUP(mnt_src, "/sys") < 0) - goto cleanup; + mnt_src = g_strdup("/sys"); mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) - goto cleanup; + mnt_src = g_strdup(mnt->src); mnt_mflags = mnt->mflags; } @@ -1292,8 +1291,7 @@ lxcContainerMountDetectFilesystem(const char *src, char **type) goto cleanup; } - if (VIR_STRDUP(*type, data) < 0) - goto cleanup; + *type = g_strdup(data); done: ret = 0; @@ -1633,8 +1631,7 @@ int lxcContainerSetupHostdevCapsMakePath(const char *dev) int ret = -1; char *dir, *tmp; - if (VIR_STRDUP(dir, dev) < 0) - return -1; + dir = g_strdup(dev); if ((tmp = strrchr(dir, '/'))) { *tmp = '\0'; @@ -2166,8 +2163,7 @@ static int lxcContainerSetHostname(virDomainDefPtr def) char *hostname = NULL; /* Filter the VM name to get a valid hostname */ - if (VIR_STRDUP(name, def->name) < 0) - goto cleanup; + name = g_strdup(def->name); /* RFC 1123 allows 0-9 digits as a first character in hostname */ virStringFilterChars(name, hostname_validchars); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 3c4e68524c..0c5b9e713d 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -172,8 +172,7 @@ static virLXCControllerPtr virLXCControllerNew(const char *name) ctrl->timerShutdown = -1; ctrl->firstClient = true; - if (VIR_STRDUP(ctrl->name, name) < 0) - goto error; + ctrl->name = g_strdup(name); if (!(caps = virLXCDriverCapsInit(NULL))) goto error; @@ -1643,8 +1642,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, goto cleanup; } - if (VIR_STRDUP(path, dev) < 0) - goto cleanup; + path = g_strdup(dev); while (*(path + len) == '/') len++; @@ -1722,8 +1720,7 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, goto cleanup; } - if (VIR_STRDUP(path, dev) < 0) - goto cleanup; + path = g_strdup(dev); while (*(path + len) == '/') len++; @@ -2534,8 +2531,7 @@ int main(int argc, char *argv[]) case 'v': if (VIR_REALLOC_N(veths, nveths+1) < 0) goto cleanup; - if (VIR_STRDUP(veths[nveths++], optarg) < 0) - goto cleanup; + veths[nveths++] = g_strdup(optarg); break; case 'c': diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 65d17aba8e..41a6a446bd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -617,8 +617,7 @@ static char *lxcDomainGetOSType(virDomainPtr dom) if (virDomainGetOSTypeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (VIR_STRDUP(ret, virDomainOSTypeToString(vm->def->os.type)) < 0) - goto cleanup; + ret = g_strdup(virDomainOSTypeToString(vm->def->os.type)); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 8ae3c7b006..5df09a849e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -64,18 +64,13 @@ lxcCreateFSDef(int type, def->type = type; def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; - if (src && VIR_STRDUP(def->src->path, src) < 0) - goto error; - if (VIR_STRDUP(def->dst, dst) < 0) - goto error; + if (src) + def->src->path = g_strdup(src); + def->dst = g_strdup(dst); def->readonly = readonly; def->usage = usage; return def; - - error: - virDomainFSDefFree(def); - return NULL; } typedef struct _lxcFstab lxcFstab; @@ -113,8 +108,7 @@ static char ** lxcStringSplit(const char *string) char **parts; char **result = NULL; - if (VIR_STRDUP(tmp, string) < 0) - return NULL; + tmp = g_strdup(string); /* Replace potential \t by a space */ for (i = 0; tmp[i]; i++) { @@ -136,8 +130,7 @@ static char ** lxcStringSplit(const char *string) if (VIR_EXPAND_N(result, ntokens, 1) < 0) goto error; - if (VIR_STRDUP(result[ntokens-2], parts[i]) < 0) - goto error; + result[ntokens - 2] = g_strdup(parts[i]); } VIR_FREE(tmp); @@ -166,11 +159,10 @@ lxcParseFstabLine(char *fstabLine) if (!parts[0] || !parts[1] || !parts[2] || !parts[3]) goto error; - if (VIR_STRDUP(fstab->src, parts[0]) < 0 || - VIR_STRDUP(fstab->dst, parts[1]) < 0 || - VIR_STRDUP(fstab->type, parts[2]) < 0 || - VIR_STRDUP(fstab->options, parts[3]) < 0) - goto error; + fstab->src = g_strdup(parts[0]); + fstab->dst = g_strdup(parts[1]); + fstab->type = g_strdup(parts[2]); + fstab->options = g_strdup(parts[3]); virStringListFree(parts); @@ -276,8 +268,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) if (virAsprintf(&dst, "/%s", fstab->dst) < 0) goto cleanup; } else { - if (VIR_STRDUP(dst, fstab->dst) < 0) - goto cleanup; + dst = g_strdup(fstab->dst); } /* Check that we don't add basic mounts */ @@ -367,8 +358,7 @@ lxcCreateNetDef(const char *type, else net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; - if (VIR_STRDUP(net->ifname_guest, name) < 0) - goto error; + net->ifname_guest = g_strdup(name); if (mac && virMacAddrParse(mac, &macAddr) == 0) net->mac = macAddr; @@ -376,17 +366,18 @@ lxcCreateNetDef(const char *type, if (STREQ(type, "veth")) { if (linkdev) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) - goto error; + net->data.bridge.brname = g_strdup(linkdev); } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; } } else if (STREQ(type, "macvlan")) { net->type = VIR_DOMAIN_NET_TYPE_DIRECT; - if (!linkdev || VIR_STRDUP(net->data.direct.linkdev, linkdev) < 0) + if (!linkdev) goto error; + net->data.direct.linkdev = g_strdup(linkdev); + if (!macvlanmode || STREQ(macvlanmode, "private")) net->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PRIVATE; else if (STREQ(macvlanmode, "vepa")) @@ -415,11 +406,8 @@ lxcCreateHostdevDef(int mode, int type, const char *data) hostdev->mode = mode; hostdev->source.caps.type = type; - if (type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET && - VIR_STRDUP(hostdev->source.caps.u.net.ifname, data) < 0) { - virDomainHostdevDefFree(hostdev); - hostdev = NULL; - } + if (type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) + hostdev->source.caps.u.net.ifname = g_strdup(data); return hostdev; } @@ -451,12 +439,9 @@ lxcAddNetworkRouteDefinition(const char *address, char *familyStr = NULL; char *zero = NULL; - if (VIR_STRDUP(zero, family == AF_INET ? VIR_SOCKET_ADDR_IPV4_ALL - : VIR_SOCKET_ADDR_IPV6_ALL) < 0) - goto error; + zero = g_strdup(family == AF_INET ? VIR_SOCKET_ADDR_IPV4_ALL : VIR_SOCKET_ADDR_IPV6_ALL); - if (VIR_STRDUP(familyStr, family == AF_INET ? "ipv4" : "ipv6") < 0) - goto error; + familyStr = g_strdup(family == AF_INET ? "ipv4" : "ipv6"); if (!(route = virNetDevIPRouteCreate(_("Domain interface"), familyStr, zero, NULL, address, 0, false, @@ -1123,8 +1108,7 @@ lxcParseConfigString(const char *config, VIR_FREE(value); } - if (VIR_STRDUP(vmdef->os.init, "/sbin/init") < 0) - goto error; + vmdef->os.init = g_strdup("/sbin/init"); if (virConfGetValueString(properties, "lxc.uts.name", &value) <= 0) { virResetLastError(); @@ -1134,11 +1118,10 @@ lxcParseConfigString(const char *config, goto error; } - if (VIR_STRDUP(vmdef->name, value) < 0) - goto error; + vmdef->name = g_strdup(value); - if (!vmdef->name && (VIR_STRDUP(vmdef->name, "unnamed") < 0)) - goto error; + if (!vmdef->name) + vmdef->name = g_strdup("unnamed"); if (lxcSetRootfs(vmdef, properties) < 0) goto error; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d9939f102d..450053d163 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -628,8 +628,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, (*veths)[i] = veth; - if (VIR_STRDUP(def->nets[i]->ifname_guest_actual, veth) < 0) - goto cleanup; + def->nets[i]->ifname_guest_actual = g_strdup(veth); /* Make sure all net definitions will have a name in the container */ if (!net->ifname_guest) { @@ -1156,9 +1155,8 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) root->type = VIR_DOMAIN_FS_TYPE_MOUNT; - if (VIR_STRDUP(root->src->path, "/") < 0 || - VIR_STRDUP(root->dst, "/") < 0) - goto error; + root->src->path = g_strdup("/"); + root->dst = g_strdup("/"); if (VIR_INSERT_ELEMENT(vm->def->fss, 0, @@ -1266,10 +1264,7 @@ int virLXCProcessStart(virConnectPtr conn, if (VIR_ALLOC(res) < 0) goto cleanup; - if (VIR_STRDUP(res->partition, "/machine") < 0) { - VIR_FREE(res); - goto cleanup; - } + res->partition = g_strdup("/machine"); vm->def->resource = res; } -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/node_device/node_device_driver.c | 32 ++++++----------- src/node_device/node_device_hal.c | 8 ++--- src/node_device/node_device_udev.c | 51 ++++++++++------------------ 3 files changed, 29 insertions(+), 62 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index f95eacf6a2..7ef55f45e9 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -130,8 +130,8 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) } p = strrchr(devpath, '/'); - if (p && VIR_STRDUP(def->driver, p + 1) < 0) - goto cleanup; + if (p) + def->driver = g_strdup(p + 1); ret = 0; cleanup: @@ -242,12 +242,8 @@ nodeDeviceLookupByName(virConnectPtr conn, if (virNodeDeviceLookupByNameEnsureACL(conn, def) < 0) goto cleanup; - if ((device = virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(device->parentName, def->parent) < 0) { - virObjectUnref(device); - device = NULL; - } - } + if ((device = virGetNodeDevice(conn, name))) + device->parentName = g_strdup(def->parent); cleanup: virNodeDeviceObjEndAPI(&obj); @@ -276,12 +272,8 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn, def) < 0) goto cleanup; - if ((device = virGetNodeDevice(conn, def->name))) { - if (VIR_STRDUP(device->parentName, def->parent) < 0) { - virObjectUnref(device); - device = NULL; - } - } + if ((device = virGetNodeDevice(conn, def->name))) + device->parentName = g_strdup(def->parent); cleanup: virNodeDeviceObjEndAPI(&obj); @@ -335,8 +327,7 @@ nodeDeviceGetParent(virNodeDevicePtr device) goto cleanup; if (def->parent) { - if (VIR_STRDUP(ret, def->parent) < 0) - goto cleanup; + ret = g_strdup(def->parent); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no parent for this device")); @@ -396,10 +387,8 @@ nodeDeviceListCaps(virNodeDevicePtr device, if (ncaps > maxnames) ncaps = maxnames; - for (i = 0; i < ncaps; i++) { - if (VIR_STRDUP(names[i], virNodeDevCapTypeToString(list[i])) < 0) - goto cleanup; - } + for (i = 0; i < ncaps; i++) + names[i] = g_strdup(virNodeDevCapTypeToString(list[i])); ret = ncaps; @@ -546,8 +535,7 @@ nodeDeviceDestroy(virNodeDevicePtr device) * event which would essentially free the existing @def (obj->def) and * replace it with something new, we need to grab the parent field * and then find the parent obj in order to manage the vport */ - if (VIR_STRDUP(parent, def->parent) < 0) - goto cleanup; + parent = g_strdup(def->parent); virNodeDeviceObjEndAPI(&obj); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 4b5d806fa6..688a0e0f06 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -461,14 +461,10 @@ dev_create(const char *udi) if (VIR_ALLOC(def) < 0) goto failure; - if (VIR_STRDUP(def->name, name) < 0) - goto failure; + def->name = g_strdup(name); if (get_str_prop(ctx, udi, "info.parent", &parent_key) == 0) { - if (VIR_STRDUP(def->parent, hal_name(parent_key)) < 0) { - VIR_FREE(parent_key); - goto failure; - } + def->parent = g_strdup(hal_name(parent_key)); VIR_FREE(parent_key); } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 84f69da8de..525e71f80c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -154,9 +154,7 @@ udevGetStringProperty(struct udev_device *udev_device, const char *property_key, char **value) { - if (VIR_STRDUP(*value, - udevGetDeviceProperty(udev_device, property_key)) < 0) - return -1; + *value = g_strdup(udevGetDeviceProperty(udev_device, property_key)); return 0; } @@ -221,8 +219,7 @@ udevGetStringSysfsAttr(struct udev_device *udev_device, const char *attr_name, char **value) { - if (VIR_STRDUP(*value, udevGetDeviceSysfsAttr(udev_device, attr_name)) < 0) - return -1; + *value = g_strdup(udevGetDeviceSysfsAttr(udev_device, attr_name)); virStringStripControlChars(*value); @@ -345,9 +342,8 @@ udevTranslatePCIIds(unsigned int vendor, NULL, NULL); - if (VIR_STRDUP(*vendor_string, vendor_name) < 0 || - VIR_STRDUP(*product_string, device_name) < 0) - return -1; + *vendor_string = g_strdup(vendor_name); + *product_string = g_strdup(device_name); return 0; } @@ -641,8 +637,7 @@ udevProcessSCSITarget(struct udev_device *device, sysname = udev_device_get_sysname(device); - if (VIR_STRDUP(scsi_target->name, sysname) < 0) - return -1; + scsi_target->name = g_strdup(sysname); virNodeDeviceGetSCSITargetCaps(def->sysfs_path, &def->caps->data.scsi_target); @@ -830,8 +825,7 @@ udevProcessCDROM(struct udev_device *device, * change it to cdrom to preserve compatibility with earlier * versions of libvirt. */ VIR_FREE(def->caps->data.storage.drive_type); - if (VIR_STRDUP(def->caps->data.storage.drive_type, "cdrom") < 0) - return -1; + def->caps->data.storage.drive_type = g_strdup("cdrom"); if (udevHasDeviceProperty(device, "ID_CDROM_MEDIA") && udevGetIntProperty(device, "ID_CDROM_MEDIA", &has_media, 0) < 0) @@ -892,8 +886,8 @@ udevKludgeStorageType(virNodeDeviceDefPtr def) def->sysfs_path); /* virtio disk */ - if (STRPREFIX(def->caps->data.storage.block, "/dev/vd") && - VIR_STRDUP(def->caps->data.storage.drive_type, "disk") > 0) { + if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { + def->caps->data.storage.drive_type = g_strdup("disk"); VIR_DEBUG("Found storage type '%s' for device " "with sysfs path '%s'", def->caps->data.storage.drive_type, @@ -920,8 +914,7 @@ udevProcessStorage(struct udev_device *device, goto cleanup; } - if (VIR_STRDUP(storage->block, devnode) < 0) - goto cleanup; + storage->block = g_strdup(devnode); if (udevGetStringProperty(device, "ID_BUS", &storage->bus) < 0) goto cleanup; @@ -972,8 +965,7 @@ udevProcessStorage(struct udev_device *device, } if (str) { - if (VIR_STRDUP(storage->drive_type, str) < 0) - goto cleanup; + storage->drive_type = g_strdup(str); } else { /* If udev doesn't have it, perhaps we can guess it. */ if (udevKludgeStorageType(def) != 0) @@ -1052,8 +1044,7 @@ udevProcessMediatedDevice(struct udev_device *dev, goto cleanup; } - if (VIR_STRDUP(data->type, last_component(canonicalpath)) < 0) - goto cleanup; + data->type = g_strdup(last_component(canonicalpath)); uuidstr = udev_device_get_sysname(dev); if ((iommugrp = virMediatedDeviceGetIOMMUGroupNum(uuidstr)) < 0) @@ -1111,8 +1102,7 @@ udevGetDeviceNodes(struct udev_device *device, devnode = udev_device_get_devnode(device); - if (VIR_STRDUP(def->devnode, devnode) < 0) - return -1; + def->devnode = g_strdup(devnode); udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) n++; @@ -1122,8 +1112,7 @@ udevGetDeviceNodes(struct udev_device *device, n = 0; udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) { - if (VIR_STRDUP(def->devlinks[n++], udev_list_entry_get_name(list_entry)) < 0) - return -1; + def->devlinks[n++] = g_strdup(udev_list_entry_get_name(list_entry)); } return 0; @@ -1295,14 +1284,10 @@ udevSetParent(struct udev_device *device, if ((obj = virNodeDeviceObjListFindBySysfsPath(driver->devs, parent_sysfs_path))) { objdef = virNodeDeviceObjGetDef(obj); - if (VIR_STRDUP(def->parent, objdef->name) < 0) { - virNodeDeviceObjEndAPI(&obj); - goto cleanup; - } + def->parent = g_strdup(objdef->name); virNodeDeviceObjEndAPI(&obj); - if (VIR_STRDUP(def->parent_sysfs_path, parent_sysfs_path) < 0) - goto cleanup; + def->parent_sysfs_path = g_strdup(parent_sysfs_path); } } while (def->parent == NULL && parent_device != NULL); @@ -1330,8 +1315,7 @@ udevAddOneDevice(struct udev_device *device) if (VIR_ALLOC(def) != 0) goto cleanup; - if (VIR_STRDUP(def->sysfs_path, udev_device_get_syspath(device)) < 0) - goto cleanup; + def->sysfs_path = g_strdup(udev_device_get_syspath(device)); if (udevGetStringProperty(device, "DRIVER", &def->driver) < 0) goto cleanup; @@ -1735,8 +1719,7 @@ udevSetupSystemDev(void) if (VIR_ALLOC(def) < 0) return -1; - if (VIR_STRDUP(def->name, "computer") < 0) - goto cleanup; + def->name = g_strdup("computer"); if (VIR_ALLOC(def->caps) != 0) goto cleanup; -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_agent.c | 51 +++++-------- src/qemu/qemu_alias.c | 9 +-- src/qemu/qemu_block.c | 46 +++++------- src/qemu/qemu_blockjob.c | 9 +-- src/qemu/qemu_capabilities.c | 85 +++++++++------------- src/qemu/qemu_cgroup.c | 5 +- src/qemu/qemu_checkpoint.c | 12 ++-- src/qemu/qemu_command.c | 15 ++-- src/qemu/qemu_conf.c | 55 +++++--------- src/qemu/qemu_dbus.c | 7 +- src/qemu/qemu_domain.c | 50 +++++-------- src/qemu/qemu_driver.c | 72 +++++++------------ src/qemu/qemu_firmware.c | 44 +++++------- src/qemu/qemu_hotplug.c | 9 +-- src/qemu/qemu_interface.c | 6 +- src/qemu/qemu_interop_config.c | 6 +- src/qemu/qemu_migration.c | 26 +++---- src/qemu/qemu_migration_cookie.c | 21 ++---- src/qemu/qemu_migration_params.c | 10 +-- src/qemu/qemu_monitor.c | 14 ++-- src/qemu/qemu_monitor_json.c | 120 +++++++++++-------------------- src/qemu/qemu_process.c | 57 ++++++--------- src/qemu/qemu_vhost_user.c | 6 +- 23 files changed, 260 insertions(+), 475 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index bd5b8035ca..4b914e6d3b 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1750,8 +1750,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, goto cleanup; } - if (VIR_STRDUP(*hostname, result) < 0) - goto cleanup; + *hostname = g_strdup(result); ret = 0; @@ -1911,22 +1910,21 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent) virDomainFSInfoPtr ret = NULL; size_t i; - if (VIR_ALLOC(ret) < 0 || - VIR_STRDUP(ret->mountpoint, agent->mountpoint) < 0 || - VIR_STRDUP(ret->name, agent->name) < 0 || - VIR_STRDUP(ret->fstype, agent->fstype) < 0) + if (VIR_ALLOC(ret) < 0) goto error; + ret->mountpoint = g_strdup(agent->mountpoint); + ret->name = g_strdup(agent->name); + ret->fstype = g_strdup(agent->fstype); + if (agent->disks && VIR_ALLOC_N(ret->devAlias, agent->ndisks) < 0) goto error; ret->ndevAlias = agent->ndisks; - for (i = 0; i < ret->ndevAlias; i++) { - if (VIR_STRDUP(ret->devAlias[i], agent->disks[i]->alias) < 0) - goto error; - } + for (i = 0; i < ret->ndevAlias; i++) + ret->devAlias[i] = g_strdup(agent->disks[i]->alias); return ret; @@ -1980,15 +1978,11 @@ qemuAgentGetFSInfoInternalDisk(virJSONValuePtr jsondisks, return -1; disk = fsinfo->disks[i]; - if ((val = virJSONValueObjectGetString(jsondisk, "serial"))) { - if (VIR_STRDUP(disk->serial, val) < 0) - return -1; - } + if ((val = virJSONValueObjectGetString(jsondisk, "serial"))) + disk->serial = g_strdup(val); - if ((val = virJSONValueObjectGetString(jsondisk, "dev"))) { - if (VIR_STRDUP(disk->devnode, val) < 0) - return -1; - } + if ((val = virJSONValueObjectGetString(jsondisk, "dev"))) + disk->devnode = g_strdup(val); #define GET_DISK_ADDR(jsonObject, var, name) \ do { \ @@ -2025,8 +2019,7 @@ qemuAgentGetFSInfoInternalDisk(virJSONValuePtr jsondisks, unit))) continue; - if (VIR_STRDUP(disk->alias, diskDef->dst) < 0) - return -1; + disk->alias = g_strdup(diskDef->dst); } return 0; @@ -2106,8 +2099,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } - if (VIR_STRDUP(info_ret[i]->mountpoint, result) < 0) - goto cleanup; + info_ret[i]->mountpoint = g_strdup(result); if (!(result = virJSONValueObjectGetString(entry, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2115,8 +2107,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } - if (VIR_STRDUP(info_ret[i]->name, result) < 0) - goto cleanup; + info_ret[i]->name = g_strdup(result); if (!(result = virJSONValueObjectGetString(entry, "type"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2124,8 +2115,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, goto cleanup; } - if (VIR_STRDUP(info_ret[i]->fstype, result) < 0) - goto cleanup; + info_ret[i]->fstype = g_strdup(result); /* 'used-bytes' and 'total-bytes' were added in qemu-ga 3.0 */ @@ -2404,12 +2394,10 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, iface = ifaces_ret[ifaces_count - 1]; iface->naddrs = 0; - if (VIR_STRDUP(iface->name, ifname_s) < 0) - goto error; + iface->name = g_strdup(ifname_s); hwaddr = virJSONValueObjectGetString(tmp_iface, "hardware-address"); - if (VIR_STRDUP(iface->hwaddr, hwaddr) < 0) - goto error; + iface->hwaddr = g_strdup(hwaddr); } /* Has to be freed for each interface. */ @@ -2471,8 +2459,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, " field for interface '%s'"), name); goto error; } - if (VIR_STRDUP(ip_addr->addr, addr) < 0) - goto error; + ip_addr->addr = g_strdup(addr); if (virJSONValueObjectGetNumberUint(ip_addr_obj, "prefix", &ip_addr->prefix) < 0) { diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index d4d8eb4252..f11099ce90 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -231,8 +231,7 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, case VIR_DOMAIN_DISK_BUS_IDE: case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SCSI: - if (VIR_STRDUP(diskPriv->qomName, disk->info.alias) < 0) - return -1; + diskPriv->qomName = g_strdup(disk->info.alias); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: @@ -543,8 +542,7 @@ qemuAssignDeviceWatchdogAlias(virDomainWatchdogDefPtr watchdog) if (watchdog->info.alias) return 0; - if (VIR_STRDUP(watchdog->info.alias, "watchdog0") < 0) - return -1; + watchdog->info.alias = g_strdup("watchdog0"); return 0; } @@ -579,8 +577,7 @@ qemuAssignDeviceVsockAlias(virDomainVsockDefPtr vsock) { if (vsock->info.alias) return 0; - if (VIR_STRDUP(vsock->info.alias, "vsock0") < 0) - return -1; + vsock->info.alias = g_strdup("vsock0"); return 0; } diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 515bcd3d59..c584d56e13 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -172,12 +172,11 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr next, if (VIR_ALLOC(data) < 0) return -1; - if (VIR_STRDUP(data->nodeformat, nodename) < 0 || - VIR_STRDUP(data->nodestorage, parentnodename) < 0 || - VIR_STRDUP(data->qemufilename, filename) < 0 || - VIR_STRDUP(data->drvformat, drvname) < 0 || - VIR_STRDUP(data->drvstorage, drvparent) < 0) - return -1; + data->nodeformat = g_strdup(nodename); + data->nodestorage = g_strdup(parentnodename); + data->qemufilename = g_strdup(filename); + data->drvformat = g_strdup(drvname); + data->drvstorage = g_strdup(drvparent); if (backing && qemuBlockNodeNameGetBackingChainBacking(backing, nodenamestable, @@ -302,9 +301,8 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, break; } else { - if (VIR_STRDUP(src->nodeformat, entry->nodeformat) < 0 || - VIR_STRDUP(src->nodestorage, entry->nodestorage) < 0) - goto cleanup; + src->nodeformat = g_strdup(entry->nodeformat); + src->nodestorage = g_strdup(entry->nodestorage); } entry = entry->backing; @@ -423,9 +421,7 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { uri->port = src->hosts->port; - if (VIR_STRDUP(uri->scheme, - virStorageNetProtocolTypeToString(src->protocol)) < 0) - return NULL; + uri->scheme = g_strdup(virStorageNetProtocolTypeToString(src->protocol)); } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -446,8 +442,7 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) } } - if (VIR_STRDUP(uri->server, src->hosts->name) < 0) - return NULL; + uri->server = g_strdup(src->hosts->name); return g_steal_pointer(&uri); } @@ -757,8 +752,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src, * } */ - if (VIR_STRDUP(target, src->path) < 0) - return NULL; + target = g_strdup(src->path); /* Separate the target and lun */ if ((lunStr = strchr(target, '/'))) { @@ -1685,23 +1679,17 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src, } if (src->pr && - !virStoragePRDefIsManaged(src->pr) && - VIR_STRDUP(data->prmgrAlias, src->pr->mgralias) < 0) - goto cleanup; + !virStoragePRDefIsManaged(src->pr)) + data->prmgrAlias = g_strdup(src->pr->mgralias); - if (VIR_STRDUP(data->tlsAlias, src->tlsAlias) < 0) - goto cleanup; + data->tlsAlias = g_strdup(src->tlsAlias); if (srcpriv) { - if (srcpriv->secinfo && - srcpriv->secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES && - VIR_STRDUP(data->authsecretAlias, srcpriv->secinfo->s.aes.alias) < 0) - goto cleanup; + if (srcpriv->secinfo && srcpriv->secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) + data->authsecretAlias = g_strdup(srcpriv->secinfo->s.aes.alias); - if (srcpriv->encinfo && - srcpriv->encinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES && - VIR_STRDUP(data->encryptsecretAlias, srcpriv->encinfo->s.aes.alias) < 0) - goto cleanup; + if (srcpriv->encinfo && srcpriv->encinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) + data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias); } ret = g_steal_pointer(&data); diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3506fa165b..6a7dd5a1d4 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -111,8 +111,7 @@ qemuBlockJobDataNew(qemuBlockJobType type, if (!(job = virObjectNew(qemuBlockJobDataClass))) return NULL; - if (VIR_STRDUP(job->name, name) < 0) - return NULL; + job->name = g_strdup(name); job->state = QEMU_BLOCKJOB_STATE_NEW; job->newstate = -1; @@ -483,8 +482,7 @@ qemuBlockJobRefreshJobs(virQEMUDriverPtr driver, * execute the finishing steps */ job->newstate = job->state; } else if (newstate == QEMU_BLOCKJOB_STATE_CONCLUDED) { - if (VIR_STRDUP(job->errmsg, jobinfo[i]->error) < 0) - goto cleanup; + job->errmsg = g_strdup(jobinfo[i]->error); if (job->errmsg) job->newstate = QEMU_BLOCKJOB_STATE_FAILED; @@ -1357,8 +1355,7 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobDataPtr job, if (STRNEQ_NULLABLE(job->name, jobinfo[i]->id)) continue; - if (VIR_STRDUP(job->errmsg, jobinfo[i]->error) < 0) - rc = -1; + job->errmsg = g_strdup(jobinfo[i]->error); if (job->errmsg) job->newstate = QEMU_BLOCKJOB_STATE_FAILED; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0377cea51a..e8d7cb84e2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -793,10 +793,8 @@ virQEMUCapsInitGuest(virCapsPtr caps, /* RHEL doesn't follow the usual naming for QEMU binaries and ships * a single binary named qemu-kvm outside of $PATH instead */ - if (virQEMUCapsGuestIsNative(hostarch, guestarch) && !binary) { - if (VIR_STRDUP(binary, "/usr/libexec/qemu-kvm") < 0) - return -1; - } + if (virQEMUCapsGuestIsNative(hostarch, guestarch) && !binary) + binary = g_strdup("/usr/libexec/qemu-kvm"); /* Ignore binary if extracting version info fails */ if (binary) { @@ -1582,11 +1580,12 @@ virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst, { g_autoptr(virSEVCapability) tmp = NULL; - if (VIR_ALLOC(tmp) < 0 || - VIR_STRDUP(tmp->pdh, src->pdh) < 0 || - VIR_STRDUP(tmp->cert_chain, src->cert_chain) < 0) + if (VIR_ALLOC(tmp) < 0) return -1; + tmp->pdh = g_strdup(src->pdh); + tmp->cert_chain = g_strdup(src->cert_chain); + tmp->cbitpos = src->cbitpos; tmp->reduced_phys_bits = src->reduced_phys_bits; @@ -1606,8 +1605,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->usedQMP = qemuCaps->usedQMP; ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting; - if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0) - goto error; + ret->binary = g_strdup(qemuCaps->binary); ret->ctime = qemuCaps->ctime; @@ -1617,11 +1615,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->kvmVersion = qemuCaps->kvmVersion; ret->microcodeVersion = qemuCaps->microcodeVersion; - if (VIR_STRDUP(ret->package, qemuCaps->package) < 0) - goto error; - - if (VIR_STRDUP(ret->kernelVersion, qemuCaps->kernelVersion) < 0) - goto error; + ret->package = g_strdup(qemuCaps->package); + ret->kernelVersion = g_strdup(qemuCaps->kernelVersion); ret->arch = qemuCaps->arch; @@ -1645,9 +1640,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto error; ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0; i < qemuCaps->nmachineTypes; i++) { - if (VIR_STRDUP(ret->machineTypes[i].name, qemuCaps->machineTypes[i].name) < 0 || - VIR_STRDUP(ret->machineTypes[i].alias, qemuCaps->machineTypes[i].alias) < 0) - goto error; + ret->machineTypes[i].name = g_strdup(qemuCaps->machineTypes[i].name); + ret->machineTypes[i].alias = g_strdup(qemuCaps->machineTypes[i].alias); ret->machineTypes[i].maxCpus = qemuCaps->machineTypes[i].maxCpus; ret->machineTypes[i].hotplugCpus = qemuCaps->machineTypes[i].hotplugCpus; ret->machineTypes[i].qemuDefault = qemuCaps->machineTypes[i].qemuDefault; @@ -1999,12 +1993,10 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, goto error; (*machines)[i] = mach; if (qemuCaps->machineTypes[i].alias) { - if (VIR_STRDUP(mach->name, qemuCaps->machineTypes[i].alias) < 0 || - VIR_STRDUP(mach->canonical, qemuCaps->machineTypes[i].name) < 0) - goto error; + mach->name = g_strdup(qemuCaps->machineTypes[i].alias); + mach->canonical = g_strdup(qemuCaps->machineTypes[i].name); } else { - if (VIR_STRDUP(mach->name, qemuCaps->machineTypes[i].name) < 0) - goto error; + mach->name = g_strdup(qemuCaps->machineTypes[i].name); } mach->maxCpus = qemuCaps->machineTypes[i].maxCpus; } @@ -2039,8 +2031,7 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, VIR_FREE(mach); goto error; } - if (VIR_STRDUP(mach->name, machine->canonical) < 0) - goto error; + mach->name = g_strdup(machine->canonical); mach->maxCpus = machine->maxCpus; i++; } @@ -2358,9 +2349,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, mach = &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]); - if (VIR_STRDUP(mach->alias, machines[i]->alias) < 0 || - VIR_STRDUP(mach->name, machines[i]->name) < 0) - goto cleanup; + mach->alias = g_strdup(machines[i]->alias); + mach->name = g_strdup(machines[i]->name); mach->maxCpus = machines[i]->maxCpus; mach->hotplugCpus = machines[i]->hotplugCpus; @@ -2467,8 +2457,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon, continue; VIR_FREE(cpus[i]->name); - if (VIR_STRDUP(cpus[i]->name, *name) < 0) - goto error; + cpus[i]->name = g_strdup(*name); } } } @@ -2550,9 +2539,11 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps, model = "host"; } - if (VIR_ALLOC(cpu) < 0 || VIR_STRDUP(cpu->model, model) < 0) + if (VIR_ALLOC(cpu) < 0) goto cleanup; + cpu->model = g_strdup(model); + /* Some x86_64 features defined in cpu_map.xml use spelling which differ * from the one preferred by QEMU. Static expansion would give us only the * preferred spelling. With new QEMU we always use the QEMU's canonical @@ -2661,9 +2652,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps, if (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO) continue; - if (VIR_STRDUP(list[n++], - virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name)) < 0) - goto cleanup; + list[n++] = g_strdup(virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name)); } *features = g_steal_pointer(&list); @@ -2672,7 +2661,6 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps, else ret = 0; - cleanup: virStringListFree(list); return ret; } @@ -3022,8 +3010,8 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, return 2; } - if (VIR_STRDUP(cpu->model, modelInfo->name) < 0 || - VIR_ALLOC_N(cpu->features, modelInfo->nprops) < 0) + cpu->model = g_strdup(modelInfo->name); + if (VIR_ALLOC_N(cpu->features, modelInfo->nprops) < 0) return -1; cpu->nfeatures_max = modelInfo->nprops; @@ -3037,8 +3025,7 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, if (prop->type != QEMU_MONITOR_CPU_PROPERTY_BOOLEAN) continue; - if (VIR_STRDUP(feature->name, name) < 0) - return -1; + feature->name = g_strdup(name); if (!prop->value.boolean || (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO)) @@ -4715,8 +4702,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, if (!(qemuCaps = virQEMUCapsNew())) goto error; - if (VIR_STRDUP(qemuCaps->binary, binary) < 0) - goto error; + qemuCaps->binary = g_strdup(binary); /* We would also want to check faccessat if we cared about ACLs, * but we don't. */ @@ -4749,8 +4735,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { qemuCaps->microcodeVersion = microcodeVersion; - if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0) - goto error; + qemuCaps->kernelVersion = g_strdup(kernelVersion); qemuCaps->kvmSupportsNesting = virQEMUCapsKVMSupportsNesting(); } @@ -4791,8 +4776,7 @@ virQEMUCapsLoadFile(const char *filename, if (!qemuCaps) return NULL; - if (VIR_STRDUP(qemuCaps->binary, binary) < 0) - goto error; + qemuCaps->binary = g_strdup(binary); if (virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename) < 0) goto error; @@ -4875,8 +4859,7 @@ virQEMUCapsCacheNew(const char *libDir, goto error; virFileCacheSetPriv(cache, priv); - if (VIR_STRDUP(priv->libDir, libDir) < 0) - goto error; + priv->libDir = g_strdup(libDir); priv->hostArch = virArchFromHost(); @@ -5192,9 +5175,7 @@ virQEMUCapsFillDomainLoaderCaps(virDomainCapsLoaderPtr capsLoader, if (j != capsLoader->values.nvalues) continue; - if (VIR_STRDUP(capsLoader->values.values[capsLoader->values.nvalues], - filename) < 0) - return -1; + capsLoader->values.values[capsLoader->values.nvalues] = g_strdup(filename); capsLoader->values.nvalues++; } @@ -5590,11 +5571,9 @@ virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(sev) < 0) return -1; - if (VIR_STRDUP(sev->pdh, cap->pdh) < 0) - return -1; + sev->pdh = g_strdup(cap->pdh); - if (VIR_STRDUP(sev->cert_chain, cap->cert_chain) < 0) - return -1; + sev->cert_chain = g_strdup(cap->cert_chain); sev->cbitpos = cap->cbitpos; sev->reduced_phys_bits = cap->reduced_phys_bits; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 5a58e77fa4..e49bb8fb7e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -933,10 +933,7 @@ qemuInitCgroup(virDomainObjPtr vm, if (VIR_ALLOC(res) < 0) goto cleanup; - if (VIR_STRDUP(res->partition, "/machine") < 0) { - VIR_FREE(res); - goto cleanup; - } + res->partition = g_strdup("/machine"); vm->def->resource = res; } diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4b4ad8bb83..4a618f5236 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -409,9 +409,8 @@ qemuCheckpointCreateXML(virDomainPtr domain, other = virDomainCheckpointGetCurrent(vm->checkpoints); if (other) { - if (!redefine && - VIR_STRDUP(chk->def->parent_name, other->def->name) < 0) - goto endjob; + if (!redefine) + chk->def->parent_name = g_strdup(other->def->name); } /* actually do the checkpoint */ @@ -513,11 +512,8 @@ qemuCheckpointReparentChildren(void *payload, VIR_FREE(moment->def->parent_name); - if (rep->parent->def && - VIR_STRDUP(moment->def->parent_name, rep->parent->def->name) < 0) { - rep->err = -1; - return 0; - } + if (rep->parent->def) + moment->def->parent_name = g_strdup(rep->parent->def->name); rep->err = qemuCheckpointWriteMetadata(rep->vm, moment, rep->caps, rep->xmlopt, rep->dir); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b579b994f3..f24013f9eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -799,8 +799,7 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, secinfo->s.plain.secret) < 0) return -1; } else { - if (VIR_STRDUP(uri->user, secinfo->s.plain.username) < 0) - return -1; + uri->user = g_strdup(secinfo->s.plain.username); } break; @@ -1135,8 +1134,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: - if (VIR_STRDUP(*source, src->path) < 0) - return -1; + *source = g_strdup(src->path); break; @@ -2053,8 +2051,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, * ourselves especially for cases when -blockdev will be used */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID)) { if (disk->serial) { - if (VIR_STRDUP(scsiVPDDeviceId, disk->serial) < 0) - goto error; + scsiVPDDeviceId = g_strdup(disk->serial); } else { if (!(scsiVPDDeviceId = qemuAliasDiskDriveFromDisk(disk))) goto error; @@ -3449,8 +3446,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { if (mem->nvdimmPath) { - if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) - return -1; + memPath = g_strdup(mem->nvdimmPath); if (!priv->memPrealloc) prealloc = true; } else if (useHugepage) { @@ -7044,8 +7040,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, return -1; } - if (VIR_STRDUP(cpu, default_model) < 0) - return -1; + cpu = g_strdup(default_model); } if (cpu) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 65cd959cf8..fae697a2ef 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -138,8 +138,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0) return NULL; - if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0) - return NULL; + cfg->configBaseDir = g_strdup(SYSCONFDIR "/libvirt"); if (virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR) < 0) @@ -242,15 +241,10 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) * This will then be used as a fallback if the service specific * directory doesn't exist (although we don't check if this exists). */ - if (VIR_STRDUP(cfg->defaultTLSx509certdir, - SYSCONFDIR "/pki/qemu") < 0) - return NULL; + cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "/pki/qemu"); - if (VIR_STRDUP(cfg->vncListen, VIR_LOOPBACK_IPV4_ADDR) < 0) - return NULL; - - if (VIR_STRDUP(cfg->spiceListen, VIR_LOOPBACK_IPV4_ADDR) < 0) - return NULL; + cfg->vncListen = g_strdup(VIR_LOOPBACK_IPV4_ADDR); + cfg->spiceListen = g_strdup(VIR_LOOPBACK_IPV4_ADDR); cfg->remotePortMin = QEMU_REMOTE_PORT_MIN; cfg->remotePortMax = QEMU_REMOTE_PORT_MAX; @@ -271,10 +265,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) return NULL; } - if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0 || - VIR_STRDUP(cfg->prHelperName, QEMU_PR_HELPER) < 0 || - VIR_STRDUP(cfg->slirpHelperName, QEMU_SLIRP_HELPER) < 0) - return NULL; + cfg->bridgeHelperName = g_strdup(QEMU_BRIDGE_HELPER); + cfg->prHelperName = g_strdup(QEMU_PR_HELPER); + cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->clearEmulatorCapabilities = true; @@ -386,10 +379,9 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, const char *path, bool deflt) { - if (VIR_STRDUP(hugetlbfs->mnt_dir, path) < 0 || - virFileGetHugepageSize(path, &hugetlbfs->size) < 0) { + hugetlbfs->mnt_dir = g_strdup(path); + if (virFileGetHugepageSize(path, &hugetlbfs->size) < 0) return -1; - } hugetlbfs->deflt = deflt; return 0; @@ -1151,10 +1143,7 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPtr cfg) if (!cfg->val## TLSx509certdir && \ !cfg->val## TLSx509secretUUID && \ cfg->defaultTLSx509secretUUID) { \ - if (VIR_STRDUP(cfg->val## TLSx509secretUUID, \ - cfg->defaultTLSx509secretUUID) < 0) { \ - return -1; \ - } \ + cfg->val## TLSx509secretUUID = g_strdup(cfg->defaultTLSx509secretUUID); \ } \ } while (0) @@ -1176,15 +1165,9 @@ virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPtr cfg) if (cfg->val ## TLSx509certdir) \ break; \ if (virFileExists(SYSCONFDIR "/pki/libvirt-"#val)) { \ - if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ - SYSCONFDIR "/pki/libvirt-"#val) < 0) { \ - return -1; \ - } \ + cfg->val ## TLSx509certdir = g_strdup(SYSCONFDIR "/pki/libvirt-"#val); \ } else { \ - if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ - cfg->defaultTLSx509certdir) < 0) { \ - return -1; \ - } \ + cfg->val ## TLSx509certdir = g_strdup(cfg->defaultTLSx509certdir); \ } \ } while (0) @@ -1276,9 +1259,8 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) virCapsHostSecModelPtr sm = &caps->host.secModels[i]; doi = qemuSecurityGetDOI(sec_managers[i]); model = qemuSecurityGetModel(sec_managers[i]); - if (VIR_STRDUP(sm->model, model) < 0 || - VIR_STRDUP(sm->doi, doi) < 0) - return NULL; + sm->model = g_strdup(model); + sm->doi = g_strdup(doi); for (j = 0; j < G_N_ELEMENTS(virtTypes); j++) { lbl = qemuSecurityGetBaseLabel(sec_managers[i], virtTypes[j]); @@ -1587,19 +1569,20 @@ qemuSharedDeviceEntryInsert(virQEMUDriverPtr driver, * recorded in the table. */ if (!qemuSharedDeviceEntryDomainExists(entry, name, NULL)) { - if (VIR_EXPAND_N(entry->domains, entry->ref, 1) < 0 || - VIR_STRDUP(entry->domains[entry->ref - 1], name) < 0) { + if (VIR_EXPAND_N(entry->domains, entry->ref, 1) < 0) { /* entry is owned by the hash table here */ entry = NULL; goto error; } + entry->domains[entry->ref - 1] = g_strdup(name); } } else { if (VIR_ALLOC(entry) < 0 || - VIR_ALLOC_N(entry->domains, 1) < 0 || - VIR_STRDUP(entry->domains[0], name) < 0) + VIR_ALLOC_N(entry->domains, 1) < 0) goto error; + entry->domains[0] = g_strdup(name); + entry->ref = 1; if (virHashAddEntry(driver->sharedDevices, key, entry) < 0) diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index f4205a74bb..faee122021 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -42,11 +42,8 @@ qemuDBusVMStateNew(const char *id, const char *addr) if (VIR_ALLOC(self) < 0) return NULL; - if (VIR_STRDUP(self->id, id) < 0) - return NULL; - - if (VIR_STRDUP(self->addr, addr) < 0) - return NULL; + self->id = g_strdup(id); + self->addr = g_strdup(addr); return g_steal_pointer(&self); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab13eebd39..9b201a8259 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1407,14 +1407,12 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr secinfo, return -1; secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN; - if (VIR_STRDUP(secinfo->s.plain.username, username) < 0) - goto cleanup; + secinfo->s.plain.username = g_strdup(username); ret = virSecretGetSecretString(conn, seclookupdef, usageType, &secinfo->s.plain.secret, &secinfo->s.plain.secretlen); - cleanup: virObjectUnref(conn); return ret; } @@ -1456,8 +1454,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, return -1; secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; - if (VIR_STRDUP(secinfo->s.aes.username, username) < 0) - goto cleanup; + secinfo->s.aes.username = g_strdup(username); if (!(secinfo->s.aes.alias = qemuDomainGetSecretAESAlias(srcalias, isLuks))) goto cleanup; @@ -1865,8 +1862,7 @@ qemuDomainSecretGraphicsPrepare(virQEMUDriverConfigPtr cfg, if (!cfg->vncTLS) return 0; - if (VIR_STRDUP(gfxPriv->tlsAlias, "vnc-tls-creds0") < 0) - return -1; + gfxPriv->tlsAlias = g_strdup("vnc-tls-creds0"); if (cfg->vncTLSx509secretUUID) { gfxPriv->secinfo = qemuDomainSecretInfoTLSNew(priv, gfxPriv->tlsAlias, @@ -4352,8 +4348,7 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) if (STRNEQ(canon, def->os.machine)) { char *tmp; - if (VIR_STRDUP(tmp, canon) < 0) - return -1; + tmp = g_strdup(canon); VIR_FREE(def->os.machine); def->os.machine = tmp; } @@ -10409,8 +10404,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk, else nodename = disk->src->nodeformat; - if (VIR_STRDUP(*backendAlias, nodename) < 0) - return -1; + *backendAlias = g_strdup(nodename); return 0; } @@ -12507,10 +12501,8 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src, src->tlsFromConfig = true; } - if (src->haveTLS == VIR_TRISTATE_BOOL_YES) { - if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) - return -1; - } + if (src->haveTLS == VIR_TRISTATE_BOOL_YES) + src->tlsCertdir = g_strdup(cfg->vxhsTLSx509certdir); return 0; } @@ -12536,8 +12528,7 @@ qemuProcessPrepareStorageSourceTLSNBD(virStorageSourcePtr src, return -1; } - if (VIR_STRDUP(src->tlsCertdir, cfg->nbdTLSx509certdir) < 0) - return -1; + src->tlsCertdir = g_strdup(cfg->nbdTLSx509certdir); } return 0; @@ -12876,15 +12867,14 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, toAlloc = 2; if (VIR_ALLOC_N(tmpPaths, toAlloc) < 0 || - VIR_ALLOC_N(tmpPerms, toAlloc) < 0 || - VIR_STRDUP(tmpPaths[0], tmpPath) < 0) + VIR_ALLOC_N(tmpPerms, toAlloc) < 0) goto cleanup; + tmpPaths[0] = g_strdup(tmpPath); tmpNpaths = toAlloc; tmpPerms[0] = perm; if (includeVFIO) { - if (VIR_STRDUP(tmpPaths[1], QEMU_DEV_VFIO) < 0) - goto cleanup; + tmpPaths[1] = g_strdup(QEMU_DEV_VFIO); tmpPerms[1] = VIR_CGROUP_DEVICE_RW; } } @@ -13174,8 +13164,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if (IS_RELATIVE_FILE_NAME(target)) { char *c = NULL, *tmp = NULL, *devTmp = NULL; - if (VIR_STRDUP(devTmp, device) < 0) - goto cleanup; + devTmp = g_strdup(device); if ((c = strrchr(devTmp, '/'))) *(c + 1) = '\0'; @@ -14152,8 +14141,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, if (IS_RELATIVE_FILE_NAME(target)) { char *c = NULL, *tmp = NULL, *fileTmp = NULL; - if (VIR_STRDUP(fileTmp, file) < 0) - goto cleanup; + fileTmp = g_strdup(file); if ((c = strrchr(fileTmp, '/'))) *(c + 1) = '\0'; @@ -14438,10 +14426,11 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, } /* qemu-pr-helper might require access to /dev/mapper/control. */ - if (src->pr && - (VIR_STRDUP(dmPath, QEMU_DEVICE_MAPPER_CONTROL_PATH) < 0 || - VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0)) - goto cleanup; + if (src->pr) { + dmPath = g_strdup(QEMU_DEVICE_MAPPER_CONTROL_PATH); + if (VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0) + goto cleanup; + } if (qemuDomainNamespaceMknodPaths(vm, paths, npaths) < 0) goto cleanup; @@ -15116,8 +15105,7 @@ qemuDomainPrepareStorageSourcePR(virStorageSourcePtr src, VIR_FREE(src->pr->path); if (!(src->pr->path = qemuDomainGetManagedPRSocketPath(priv))) return -1; - if (VIR_STRDUP(src->pr->mgralias, qemuDomainGetManagedPRAlias()) < 0) - return -1; + src->pr->mgralias = g_strdup(qemuDomainGetManagedPRAlias()); } else { if (!(src->pr->mgralias = qemuDomainGetUnmanagedPRAlias(parentalias))) return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 421a21818e..71947efa4e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1185,8 +1185,7 @@ qemuConnectURIProbe(char **uri) return 0; cfg = virQEMUDriverGetConfig(qemu_driver); - if (VIR_STRDUP(*uri, cfg->uri) < 0) - return -1; + *uri = g_strdup(cfg->uri); return 0; } @@ -7383,8 +7382,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, virMacAddr mac = net->mac; char *script = net->script; - if (VIR_STRDUP(model, virDomainNetGetModelString(net)) < 0) - goto cleanup; + model = g_strdup(virDomainNetGetModelString(net)); net->script = NULL; @@ -7761,9 +7759,8 @@ qemuDomainUndefineFlags(virDomainPtr dom, if (qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path) < 0) goto endjob; } else { - if (vm->def->os.loader && - VIR_STRDUP(nvram_path, vm->def->os.loader->nvram) < 0) - goto endjob; + if (vm->def->os.loader) + nvram_path = g_strdup(vm->def->os.loader->nvram); } if (nvram_path && virFileExists(nvram_path)) { @@ -14639,10 +14636,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, if (snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { VIR_FREE(defdisk->src->path); - if (VIR_STRDUP(defdisk->src->path, snapdisk->src->path) < 0) { - /* we cannot rollback here in a sane way */ - goto cleanup; - } + defdisk->src->path = g_strdup(snapdisk->src->path); defdisk->src->format = snapdisk->src->format; if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0) @@ -15968,9 +15962,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, current = virDomainSnapshotGetCurrent(vm->snapshots); if (current) { - if (!redefine && - VIR_STRDUP(snap->def->parent_name, current->def->name) < 0) - goto endjob; + if (!redefine) + snap->def->parent_name = g_strdup(current->def->name); } /* actually do the snapshot */ @@ -16902,11 +16895,8 @@ qemuDomainMomentReparentChildren(void *payload, VIR_FREE(moment->def->parent_name); - if (rep->parent->def && - VIR_STRDUP(moment->def->parent_name, rep->parent->def->name) < 0) { - rep->err = -1; - return 0; - } + if (rep->parent->def) + moment->def->parent_name = g_strdup(rep->parent->def->name); rep->err = rep->writeMetadata(rep->vm, moment, rep->caps, rep->xmlopt, rep->dir); @@ -18316,8 +18306,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, goto cleanup; dest->type = (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_DEV) ? VIR_STORAGE_TYPE_BLOCK : VIR_STORAGE_TYPE_FILE; - if (VIR_STRDUP(dest->path, base) < 0) - goto cleanup; + dest->path = g_strdup(base); if (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_RAW) dest->format = VIR_STORAGE_FILE_RAW; @@ -18896,9 +18885,8 @@ qemuDomainSetBlockIoTuneDefaults(virDomainBlockIoTuneInfoPtr newinfo, if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_SIZE_IOPS)) newinfo->size_iops_sec = oldinfo->size_iops_sec; - if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_GROUP_NAME) && - VIR_STRDUP(newinfo->group_name, oldinfo->group_name) < 0) - return -1; + if (!(set_fields & QEMU_BLOCK_IOTUNE_SET_GROUP_NAME)) + newinfo->group_name = g_strdup(oldinfo->group_name); /* The length field is handled a bit differently. If not defined/set, * QEMU will default these to 0 or 1 depending on whether something in @@ -19076,8 +19064,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, /* NB: Cannot use macro since this is a value.s not a value.ul */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) { - if (VIR_STRDUP(info.group_name, param->value.s) < 0) - goto endjob; + info.group_name = g_strdup(param->value.s); set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME; if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams, @@ -19374,8 +19361,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, /* Group name needs to be copied since qemuMonitorGetBlockIoThrottle * allocates it as well */ - if (VIR_STRDUP(reply.group_name, disk->blkdeviotune.group_name) < 0) - goto endjob; + reply.group_name = g_strdup(disk->blkdeviotune.group_name); } #define BLOCK_IOTUNE_ASSIGN(name, var) \ @@ -19493,8 +19479,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, if (n == nerrors) break; - if (VIR_STRDUP(errors[n].disk, disk->dst) < 0) - goto endjob; + errors[n].disk = g_strdup(disk->dst); errors[n].error = info->io_status; n++; } @@ -20521,8 +20506,7 @@ qemuDomainGetResctrlMonData(virQEMUDriverPtr driver, if (!(res->vcpus = virBitmapFormat(domresmon->vcpus))) goto error; - if (VIR_STRDUP(res->name, virResctrlMonitorGetID(monitor)) < 0) - goto error; + res->name = g_strdup(virResctrlMonitorGetID(monitor)); if (virResctrlMonitorGetStats(monitor, (const char **)features, &res->stats, &res->nstats) < 0) @@ -21667,19 +21651,16 @@ qemuGetDHCPInterfaces(virDomainPtr dom, if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) goto error; - if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto error; + iface->name = g_strdup(vm->def->nets[i]->ifname); - if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto error; + iface->hwaddr = g_strdup(macaddr); } for (j = 0; j < n_leases; j++) { virNetworkDHCPLeasePtr lease = leases[j]; virDomainIPAddressPtr ip_addr = &iface->addrs[j]; - if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) - goto error; + ip_addr->addr = g_strdup(lease->ipaddr); ip_addr->type = lease->type; ip_addr->prefix = lease->prefix; @@ -21739,18 +21720,15 @@ qemuARPGetInterfaces(virDomainObjPtr vm, if (VIR_ALLOC(iface) < 0) goto cleanup; - if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto cleanup; + iface->name = g_strdup(vm->def->nets[i]->ifname); - if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto cleanup; + iface->hwaddr = g_strdup(macaddr); if (VIR_ALLOC(iface->addrs) < 0) goto cleanup; iface->naddrs = 1; - if (VIR_STRDUP(iface->addrs->addr, entry.ipaddr) < 0) - goto cleanup; + iface->addrs->addr = g_strdup(entry.ipaddr); if (VIR_APPEND_ELEMENT(ifaces_ret, ifaces_count, iface) < 0) goto cleanup; @@ -21851,8 +21829,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, cfg = virQEMUDriverGetConfig(driver); - if (VIR_STRDUP(new_dom_name, new_name) < 0) - goto cleanup; + new_dom_name = g_strdup(new_name); if (!(new_dom_cfg_file = virDomainConfigFile(cfg->configDir, new_dom_name)) || @@ -22324,8 +22301,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, goto endjob; } - if (VIR_STRDUP(nodename, src->nodestorage) < 0) - goto endjob; + nodename = g_strdup(src->nodestorage); qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetBlockThreshold(priv->mon, nodename, threshold); diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index f614be6d14..670662fd4b 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -346,8 +346,7 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } - if (VIR_STRDUP(flash->filename, filename) < 0) - return -1; + flash->filename = g_strdup(filename); if (!(format = virJSONValueObjectGetString(doc, "format"))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -356,8 +355,7 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } - if (VIR_STRDUP(flash->format, format) < 0) - return -1; + flash->format = g_strdup(format); return 0; } @@ -408,8 +406,7 @@ qemuFirmwareMappingKernelParse(const char *path, path); } - if (VIR_STRDUP(kernel->filename, filename) < 0) - return -1; + kernel->filename = g_strdup(filename); return 0; } @@ -428,8 +425,7 @@ qemuFirmwareMappingMemoryParse(const char *path, path); } - if (VIR_STRDUP(memory->filename, filename) < 0) - return -1; + memory->filename = g_strdup(filename); return 0; } @@ -547,8 +543,7 @@ qemuFirmwareTargetParse(const char *path, virJSONValuePtr machine = virJSONValueArrayGet(machines, j); g_autofree char *machineStr = NULL; - if (VIR_STRDUP(machineStr, virJSONValueGetString(machine)) < 0) - goto cleanup; + machineStr = g_strdup(virJSONValueGetString(machine)); VIR_APPEND_ELEMENT_INPLACE(t->machines, t->nmachines, machineStr); } @@ -1051,9 +1046,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, } VIR_FREE(def->os.loader->path); - if (VIR_STRDUP(def->os.loader->path, - flash->executable.filename) < 0) - return -1; + def->os.loader->path = g_strdup(flash->executable.filename); if (STRNEQ(flash->nvram_template.format, "raw")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -1063,9 +1056,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, } VIR_FREE(def->os.loader->templt); - if (VIR_STRDUP(def->os.loader->templt, - flash->nvram_template.filename) < 0) - return -1; + def->os.loader->templt = g_strdup(flash->nvram_template.filename); if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) return -1; @@ -1077,8 +1068,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, case QEMU_FIRMWARE_DEVICE_KERNEL: VIR_FREE(def->os.kernel); - if (VIR_STRDUP(def->os.kernel, kernel->filename) < 0) - return -1; + def->os.kernel = g_strdup(kernel->filename); VIR_DEBUG("decided on kernel '%s'", def->os.kernel); @@ -1090,8 +1080,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, return -1; def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM; - if (VIR_STRDUP(def->os.loader->path, memory->filename) < 0) - return -1; + def->os.loader->path = g_strdup(memory->filename); VIR_DEBUG("decided on loader '%s'", def->os.loader->path); @@ -1400,12 +1389,15 @@ qemuFirmwareGetSupported(const char *machine, break; } - if (j == *nfws && - (VIR_ALLOC(tmp) < 0 || - VIR_STRDUP(tmp->name, fwpath) < 0 || - VIR_STRDUP(tmp->nvram, nvrampath) < 0 || - VIR_APPEND_ELEMENT(*fws, *nfws, tmp) < 0)) - return -1; + if (j == *nfws) { + if (VIR_ALLOC(tmp) < 0) + return -1; + + tmp->name = g_strdup(fwpath); + tmp->nvram = g_strdup(nvrampath); + if (VIR_APPEND_ELEMENT(*fws, *nfws, tmp) < 0) + return -1; + } } } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b42bbfd48..4da6457bdc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4243,8 +4243,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, if (blockdev) { - if (VIR_STRDUP(corAlias, diskPriv->nodeCopyOnRead) < 0) - goto cleanup; + corAlias = g_strdup(diskPriv->nodeCopyOnRead); if (diskPriv->blockjob) { /* the block job keeps reference to the disk chain */ @@ -4987,10 +4986,8 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, * save the alias to use when sending a DEVICE_REMOVED event after * all other teardown is complete */ - if ((info = virDomainDeviceGetInfo(dev)) && - VIR_STRDUP(alias, info->alias) < 0) { - return -1; - } + if ((info = virDomainDeviceGetInfo(dev))) + alias = g_strdup(info->alias); info = NULL; switch ((virDomainDeviceType)dev->type) { diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 6e3e634b30..70832e0c9a 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -457,8 +457,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_TAP_PREFIX "%d") < 0) - goto cleanup; + net->ifname = g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d"); /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname = true; } @@ -563,8 +562,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_TAP_PREFIX "%d") < 0) - goto cleanup; + net->ifname = g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d"); /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname = true; } diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 7193d31dfd..d05ff56221 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -55,8 +55,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) if (STRPREFIX(ent->d_name, ".")) continue; - if (VIR_STRDUP(filename, ent->d_name) < 0) - goto cleanup; + filename = g_strdup(ent->d_name); if (virAsprintf(&path, "%s/%s", dir, filename) < 0) goto cleanup; @@ -115,8 +114,7 @@ qemuInteropFetchConfigs(const char *name, * much sense to parse files in root's home directory. It * makes sense only for session daemon which runs under * regular user. */ - if (VIR_STRDUP(xdgConfig, getenv("XDG_CONFIG_HOME")) < 0) - return -1; + xdgConfig = g_strdup(getenv("XDG_CONFIG_HOME")); if (!xdgConfig) { g_autofree char *home = virGetUserDirectory(); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fed95a285a..471cb1c5a6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -192,8 +192,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, return 0; } - if (VIR_STRDUP(basePath, disk->src->path) < 0) - goto cleanup; + basePath = g_strdup(disk->src->path); if (!(volName = strrchr(basePath, '/'))) { virReportError(VIR_ERR_INVALID_ARG, @@ -808,8 +807,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, if (!(copysrc->backingStore = virStorageSourceNew())) return -1; - if (VIR_STRDUP(copysrc->path, diskAlias) < 0) - return -1; + copysrc->path = g_strdup(diskAlias); if (VIR_ALLOC_N(copysrc->hosts, 1) < 0) return -1; @@ -817,11 +815,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, copysrc->nhosts = 1; copysrc->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; copysrc->hosts->port = port; - if (VIR_STRDUP(copysrc->hosts->name, host) < 0) - return -1; + copysrc->hosts->name = g_strdup(host); - if (VIR_STRDUP(copysrc->tlsAlias, tlsAlias) < 0) - return -1; + copysrc->tlsAlias = g_strdup(tlsAlias); if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst) < 0 || virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst) < 0) @@ -2218,8 +2214,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, char *migrateFrom = NULL; if (tunnel) { - if (VIR_STRDUP(migrateFrom, "stdio") < 0) - goto cleanup; + migrateFrom = g_strdup("stdio"); } else { bool encloseAddress = false; bool hostIPv6Capable = false; @@ -2434,8 +2429,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; - if (VIR_STRDUP(priv->origname, origname) < 0) - goto cleanup; + priv->origname = g_strdup(origname); if (taint_hook) { /* Domain XML has been altered by a hook script. */ @@ -2780,8 +2774,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (virSocketAddrNumericFamily(migrateHost) == AF_INET6) encloseAddress = true; - if (VIR_STRDUP(hostname, migrateHost) < 0) - goto cleanup; + hostname = g_strdup(migrateHost); } else { if ((hostname = virGetHostname()) == NULL) goto cleanup; @@ -2902,10 +2895,7 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, if (dname) { name = def->name; - if (VIR_STRDUP(def->name, dname) < 0) { - virDomainDefFree(def); - def = NULL; - } + def->name = g_strdup(dname); } cleanup: diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 244ad4fdf3..f625c7086b 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -214,8 +214,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr driver, !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->spiceTLSx509certdir))) goto error; - if (VIR_STRDUP(mig->listen, listenAddr) < 0) - goto error; + mig->listen = g_strdup(listenAddr); virObjectUnref(cfg); return mig; @@ -293,8 +292,7 @@ qemuMigrationCookieNew(const virDomainDef *def, name = origname; else name = def->name; - if (VIR_STRDUP(mig->name, name) < 0) - goto error; + mig->name = g_strdup(name); memcpy(mig->uuid, def->uuid, VIR_UUID_BUFLEN); if (!(mig->localHostname = virGetHostname())) @@ -380,17 +378,13 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePtr mig, } if (virDomainObjGetState(dom, NULL) == VIR_DOMAIN_PAUSED) { - if (VIR_STRDUP(mig->lockState, priv->lockState) < 0) - return -1; + mig->lockState = g_strdup(priv->lockState); } else { if (virDomainLockProcessInquire(driver->lockManager, dom, &mig->lockState) < 0) return -1; } - if (VIR_STRDUP(mig->lockDriver, virLockManagerPluginGetName(driver->lockManager)) < 0) { - VIR_FREE(mig->lockState); - return -1; - } + mig->lockDriver = g_strdup(virLockManagerPluginGetName(driver->lockManager)); mig->flags |= QEMU_MIGRATION_COOKIE_LOCKSTATE; mig->flagsMandatory |= QEMU_MIGRATION_COOKIE_LOCKSTATE; @@ -498,9 +492,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, !(entry = virHashLookup(stats, disk->info.alias))) continue; - if (VIR_STRDUP(mig->nbd->disks[mig->nbd->ndisks].target, - disk->dst) < 0) - goto cleanup; + mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst); mig->nbd->disks[mig->nbd->ndisks].capacity = entry->capacity; mig->nbd->ndisks++; } @@ -1516,8 +1508,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, mig->persistent && STRNEQ(def->name, mig->persistent->name)) { VIR_FREE(mig->persistent->name); - if (VIR_STRDUP(mig->persistent->name, def->name) < 0) - goto error; + mig->persistent->name = g_strdup(def->name); } if (mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) { diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 65f533e451..dca12033c0 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -658,8 +658,7 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params) case QEMU_MIGRATION_PARAM_TYPE_STRING: if ((str = virJSONValueObjectGetString(params, name))) { - if (VIR_STRDUP(pv->value.s, str) < 0) - goto error; + pv->value.s = g_strdup(str); pv->set = true; } break; @@ -667,10 +666,6 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params) } return migParams; - - error: - qemuMigrationParamsFree(migParams); - return NULL; } @@ -875,8 +870,7 @@ qemuMigrationParamsSetString(qemuMigrationParamsPtr migParams, if (qemuMigrationParamsCheckType(param, QEMU_MIGRATION_PARAM_TYPE_STRING) < 0) return -1; - if (VIR_STRDUP(migParams->params[param].value.s, value) < 0) - return -1; + migParams->params[param].value.s = g_strdup(value); migParams->params[param].set = true; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 86d3800108..7891d7e4c1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2987,8 +2987,8 @@ qemuMonitorAddObject(qemuMonitorPtr mon, goto cleanup; } - if (alias && VIR_STRDUP(tmp, id) < 0) - goto cleanup; + if (alias) + tmp = g_strdup(id); ret = qemuMonitorJSONAddObject(mon, *props); *props = NULL; @@ -3635,15 +3635,13 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig) if (VIR_ALLOC_N(copy->props, orig->nprops) < 0) goto error; - if (VIR_STRDUP(copy->name, orig->name) < 0) - goto error; + copy->name = g_strdup(orig->name); copy->migratability = orig->migratability; copy->nprops = orig->nprops; for (i = 0; i < orig->nprops; i++) { - if (VIR_STRDUP(copy->props[i].name, orig->props[i].name) < 0) - goto error; + copy->props[i].name = g_strdup(orig->props[i].name); copy->props[i].migratable = orig->props[i].migratable; copy->props[i].type = orig->props[i].type; @@ -3653,9 +3651,7 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig) break; case QEMU_MONITOR_CPU_PROPERTY_STRING: - if (VIR_STRDUP(copy->props[i].value.string, - orig->props[i].value.string) < 0) - goto error; + copy->props[i].value.string = g_strdup(orig->props[i].value.string); break; case QEMU_MONITOR_CPU_PROPERTY_NUMBER: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 602a0380d7..58f84f1b96 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -823,8 +823,7 @@ qemuMonitorJSONGuestPanicExtractInfoS390(virJSONValuePtr data) ret->data.s390.psw_mask = psw_mask; ret->data.s390.psw_addr = psw_addr; - if (VIR_STRDUP(ret->data.s390.reason, reason) < 0) - goto error; + ret->data.s390.reason = g_strdup(reason); return ret; @@ -1586,8 +1585,7 @@ qemuMonitorJSONHumanCommand(qemuMonitorPtr mon, const char *data; data = virJSONValueGetString(obj); - if (VIR_STRDUP(*reply_str, NULLSTR_EMPTY(data)) < 0) - goto cleanup; + *reply_str = g_strdup(NULLSTR_EMPTY(data)); } ret = 0; @@ -1932,8 +1930,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data, cpus[i].qemu_id = cpuid; cpus[i].tid = thread; cpus[i].halted = halted; - if (VIR_STRDUP(cpus[i].qom_path, qom_path) < 0) - goto cleanup; + cpus[i].qom_path = g_strdup(qom_path); /* process optional architecture-specific data */ if (STREQ_NULLABLE(arch, "s390") || STREQ_NULLABLE(arch, "s390x")) @@ -2427,9 +2424,8 @@ qemuMonitorJSONBlockInfoAdd(virHashTablePtr table, *tmp = *info; tmp->nodename = NULL; - if (info->nodename && - VIR_STRDUP(tmp->nodename, info->nodename) < 0) - goto cleanup; + if (info->nodename) + tmp->nodename = g_strdup(info->nodename); if (virHashAddEntry(table, entryname, tmp) < 0) goto cleanup; @@ -3384,8 +3380,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, case QEMU_MONITOR_MIGRATION_STATUS_ERROR: if (error) { tmp = virJSONValueObjectGetString(ret, "error-desc"); - if (tmp && VIR_STRDUP(*error, tmp) < 0) - return -1; + if (tmp) + *error = g_strdup(tmp); } break; @@ -3921,8 +3917,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, "in query-rx-filter response")); goto cleanup; } - if (VIR_STRDUP(fil->name, tmp) < 0) - goto cleanup; + fil->name = g_strdup(tmp); if ((!(tmp = virJSONValueObjectGetString(entry, "main-mac"))) || virMacAddrParse(tmp, &fil->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4151,9 +4146,8 @@ qemuMonitorJSONExtractChardevInfo(virJSONValuePtr reply, if (VIR_ALLOC(entry) < 0) goto cleanup; - if (STRPREFIX(type, "pty:") && - VIR_STRDUP(entry->ptyPath, type + strlen("pty:")) < 0) - goto cleanup; + if (STRPREFIX(type, "pty:")) + entry->ptyPath = g_strdup(type + strlen("pty:")); if (virJSONValueObjectGetBoolean(chardev, "frontend-open", &connected) == 0) { if (connected) @@ -4544,8 +4538,7 @@ qemuMonitorJSONDiskNameLookupOne(virJSONValuePtr image, return qemuMonitorJSONDiskNameLookupOne(backing, top->backingStore, target); } - if (VIR_STRDUP(ret, virJSONValueObjectGetString(image, "filename")) < 0) - return NULL; + ret = g_strdup(virJSONValueObjectGetString(image, "filename")); /* Sanity check - the name qemu gave us should resolve to the same file tracked by our target description. */ if (virStorageSourceIsLocalStorage(target) && @@ -5196,9 +5189,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, GET_THROTTLE_STATS_OPTIONAL("iops_wr_max", write_iops_sec_max); GET_THROTTLE_STATS_OPTIONAL("iops_size", size_iops_sec); - if (VIR_STRDUP(reply->group_name, - virJSONValueObjectGetString(inserted, "group")) < 0) - goto cleanup; + reply->group_name = g_strdup(virJSONValueObjectGetString(inserted, "group")); GET_THROTTLE_STATS_OPTIONAL("bps_max_length", total_bytes_sec_max_length); GET_THROTTLE_STATS_OPTIONAL("bps_rd_max_length", read_bytes_sec_max_length); @@ -5418,8 +5409,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, _("query-version reply was missing 'package' version")); goto cleanup; } - if (VIR_STRDUP(*package, tmp) < 0) - goto cleanup; + *package = g_strdup(tmp); } ret = 0; @@ -5476,8 +5466,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(info->name, tmp) < 0) - goto cleanup; + info->name = g_strdup(tmp); if (virJSONValueObjectHasKey(child, "is-default") && virJSONValueObjectGetBoolean(child, "is-default", &info->isDefault) < 0) { @@ -5492,8 +5481,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, _("query-machines reply has malformed 'alias' data")); goto cleanup; } - if (VIR_STRDUP(info->alias, tmp) < 0) - goto cleanup; + info->alias = g_strdup(tmp); } if (virJSONValueObjectHasKey(child, "cpu-max") && virJSONValueObjectGetNumberUint(child, "cpu-max", &info->maxCpus) < 0) { @@ -5576,8 +5564,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(cpu->name, tmp) < 0) - goto cleanup; + cpu->name = g_strdup(tmp); if (virJSONValueObjectHasKey(child, "unavailable-features")) { virJSONValuePtr blockers; @@ -5614,8 +5601,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(cpu->blockers[j], virJSONValueGetString(blocker)) < 0) - goto cleanup; + cpu->blockers[j] = g_strdup(virJSONValueGetString(blocker)); } } } @@ -5653,8 +5639,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, switch ((virJSONType)virJSONValueGetType(value)) { case VIR_JSON_TYPE_STRING: - if (VIR_STRDUP(prop->value.string, virJSONValueGetString(value)) < 0) - return -1; + prop->value.string = g_strdup(virJSONValueGetString(value)); prop->type = QEMU_MONITOR_CPU_PROPERTY_STRING; break; @@ -5677,8 +5662,7 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, } machine_model->nprops++; - if (VIR_STRDUP(prop->name, key) < 0) - return -1; + prop->name = g_strdup(key); return 0; } @@ -5776,8 +5760,7 @@ qemuMonitorJSONParseCPUModel(const char *cpu_name, if (VIR_ALLOC(machine_model) < 0) goto cleanup; - if (VIR_STRDUP(machine_model->name, cpu_name) < 0) - goto cleanup; + machine_model->name = g_strdup(cpu_name); if (cpu_props) { size_t nprops = virJSONValueObjectKeysNumber(cpu_props); @@ -6001,8 +5984,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(commandlist[i], tmp) < 0) - goto cleanup; + commandlist[i] = g_strdup(tmp); } ret = n; @@ -6062,8 +6044,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(eventlist[i], tmp) < 0) - goto cleanup; + eventlist[i] = g_strdup(tmp); } ret = n; @@ -6179,8 +6160,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(paramlist[i], tmp) < 0) - goto cleanup; + paramlist[i] = g_strdup(tmp); } ret = n; @@ -6283,8 +6263,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(typelist[i], tmp) < 0) - goto cleanup; + typelist[i] = g_strdup(tmp); } ret = n; @@ -6347,8 +6326,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(info->name, tmp) < 0) - goto cleanup; + info->name = g_strdup(tmp); if (virJSONValueObjectHasKey(child, "type")) { if (!(tmp = virJSONValueObjectGetString(child, "type"))) { @@ -6356,8 +6334,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, _("qom-list reply has malformed 'type' data")); goto cleanup; } - if (VIR_STRDUP(info->type, tmp) < 0) - goto cleanup; + info->type = g_strdup(tmp); } } @@ -6435,8 +6412,8 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr mon, break; case QEMU_MONITOR_OBJECT_PROPERTY_STRING: tmp = virJSONValueGetString(data); - if (tmp && VIR_STRDUP(prop->val.str, tmp) < 0) - goto cleanup; + if (tmp) + prop->val.str = g_strdup(tmp); if (tmp) ret = 0; break; @@ -6505,8 +6482,7 @@ qemuMonitorJSONGetStringListProperty(qemuMonitorPtr mon, return -1; } - if (VIR_STRDUP(list[i], virJSONValueGetString(item)) < 0) - return -1; + list[i] = g_strdup(virJSONValueGetString(item)); } *strList = g_steal_pointer(&list); @@ -6617,8 +6593,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, goto cleanup; } - if (VIR_STRDUP(proplist[count++], tmp) < 0) - goto cleanup; + proplist[count++] = g_strdup(tmp); } ret = count; @@ -6780,8 +6755,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(list[i], name) < 1) - goto cleanup; + list[i] = g_strdup(name); } ret = n; @@ -7014,11 +6988,9 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon, if (VIR_ALLOC(capability) < 0) goto cleanup; - if (VIR_STRDUP(capability->pdh, pdh) < 0) - goto cleanup; + capability->pdh = g_strdup(pdh); - if (VIR_STRDUP(capability->cert_chain, cert_chain) < 0) - goto cleanup; + capability->cert_chain = g_strdup(cert_chain); capability->cbitpos = cbitpos; capability->reduced_phys_bits = reduced_phys_bits; @@ -7224,8 +7196,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, goto cleanup; } - if (VIR_STRDUP(list[i], tmp) < 0) - goto cleanup; + list[i] = g_strdup(tmp); } ret = n; @@ -7458,8 +7429,7 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, goto cleanup; } - if (VIR_STRDUP(chr->data.file.path, path) < 0) - goto cleanup; + chr->data.file.path = g_strdup(path); } ret = 0; @@ -8465,8 +8435,7 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValuePtr vcpu, return -1; } - if (VIR_STRDUP(entry->type, tmp) < 0) - return -1; + entry->type = g_strdup(tmp); if (virJSONValueObjectGetNumberUint(vcpu, "vcpus-count", &entry->vcpus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -8503,14 +8472,11 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValuePtr vcpu, /* qom path is not present unless the vCPU is online */ if ((tmp = virJSONValueObjectGetString(vcpu, "qom-path"))) { - if (VIR_STRDUP(entry->qom_path, tmp) < 0) - return -1; + entry->qom_path = g_strdup(tmp); /* alias is the part after last slash having a "vcpu" prefix */ - if ((tmp = strrchr(tmp, '/')) && STRPREFIX(tmp + 1, "vcpu")) { - if (VIR_STRDUP(entry->alias, tmp + 1) < 0) - return -1; - } + if ((tmp = strrchr(tmp, '/')) && STRPREFIX(tmp + 1, "vcpu")) + entry->alias = g_strdup(tmp + 1); } return 0; @@ -8921,8 +8887,7 @@ qemuMonitorJSONGetSEVMeasurement(qemuMonitorPtr mon) if (!(tmp = virJSONValueObjectGetString(data, "data"))) goto cleanup; - if (VIR_STRDUP(measurement, tmp) < 0) - goto cleanup; + measurement = g_strdup(tmp); cleanup: virJSONValueFree(cmd); @@ -9309,9 +9274,8 @@ qemuMonitorJSONGetJobInfoOne(virJSONValuePtr data) job->status = tmp; - if (VIR_STRDUP(job->id, id) < 0 || - VIR_STRDUP(job->error, errmsg) < 0) - return NULL; + job->id = g_strdup(id); + job->error = g_strdup(errmsg); ret = g_steal_pointer(&job); return ret; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 843e852591..7e0dc26658 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -967,8 +967,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNUSED, goto cleanup; processEvent->eventType = QEMU_PROCESS_EVENT_BLOCK_JOB; - if (VIR_STRDUP(data, diskAlias) < 0) - goto cleanup; + data = g_strdup(diskAlias); processEvent->data = data; processEvent->vm = virObjectRef(vm); processEvent->action = type; @@ -1076,16 +1075,14 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, if (VIR_ALLOC(localAddr) < 0) goto error; localAddr->family = localFamily; - if (VIR_STRDUP(localAddr->service, localService) < 0 || - VIR_STRDUP(localAddr->node, localNode) < 0) - goto error; + localAddr->service = g_strdup(localService); + localAddr->node = g_strdup(localNode); if (VIR_ALLOC(remoteAddr) < 0) goto error; remoteAddr->family = remoteFamily; - if (VIR_STRDUP(remoteAddr->service, remoteService) < 0 || - VIR_STRDUP(remoteAddr->node, remoteNode) < 0) - goto error; + remoteAddr->service = g_strdup(remoteService); + remoteAddr->node = g_strdup(remoteNode); if (VIR_ALLOC(subject) < 0) goto error; @@ -1093,17 +1090,15 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto error; subject->nidentity++; - if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "x509dname") < 0 || - VIR_STRDUP(subject->identities[subject->nidentity-1].name, x509dname) < 0) - goto error; + subject->identities[subject->nidentity - 1].type = g_strdup("x509dname"); + subject->identities[subject->nidentity - 1].name = g_strdup(x509dname); } if (saslUsername) { if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto error; subject->nidentity++; - if (VIR_STRDUP(subject->identities[subject->nidentity-1].type, "saslUsername") < 0 || - VIR_STRDUP(subject->identities[subject->nidentity-1].name, saslUsername) < 0) - goto error; + subject->identities[subject->nidentity - 1].type = g_strdup("saslUsername"); + subject->identities[subject->nidentity - 1].name = g_strdup(saslUsername); } virObjectLock(vm); @@ -1385,8 +1380,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon G_GNUC_UNUSED, goto error; processEvent->eventType = QEMU_PROCESS_EVENT_DEVICE_DELETED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data = g_strdup(devAlias); processEvent->data = data; processEvent->vm = virObjectRef(vm); @@ -1559,8 +1553,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mon G_GNUC_UNUSED, goto error; processEvent->eventType = QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data = g_strdup(devAlias); processEvent->data = data; processEvent->vm = virObjectRef(vm); @@ -1598,8 +1591,7 @@ qemuProcessHandleSerialChanged(qemuMonitorPtr mon G_GNUC_UNUSED, goto error; processEvent->eventType = QEMU_PROCESS_EVENT_SERIAL_CHANGED; - if (VIR_STRDUP(data, devAlias) < 0) - goto error; + data = g_strdup(devAlias); processEvent->data = data; processEvent->action = connected; processEvent->vm = virObjectRef(vm); @@ -1839,10 +1831,11 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon G_GNUC_UNUSED, VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%llx,interface_id=0x%llx", netdev, gid_status, subnet_prefix, interface_id); - if (VIR_ALLOC(info) < 0 || - VIR_STRDUP(info->netdev, netdev) < 0) + if (VIR_ALLOC(info) < 0) goto cleanup; + info->netdev = g_strdup(netdev); + info->gid_status = gid_status; info->subnet_prefix = subnet_prefix; info->interface_id = interface_id; @@ -2133,8 +2126,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, } VIR_FREE(chr->source->data.file.path); - if (VIR_STRDUP(chr->source->data.file.path, entry->ptyPath) < 0) - goto cleanup; + chr->source->data.file.path = g_strdup(entry->ptyPath); } } @@ -4586,8 +4578,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(inc) < 0) return NULL; - if (VIR_STRDUP(inc->address, listenAddress) < 0) - goto error; + inc->address = g_strdup(listenAddress); inc->launchURI = qemuMigrationDstGetURI(migrateFrom, fd); if (!inc->launchURI) @@ -4595,8 +4586,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_INCOMING_DEFER)) { inc->deferredURI = inc->launchURI; - if (VIR_STRDUP(inc->launchURI, "defer") < 0) - goto error; + inc->launchURI = g_strdup("defer"); } inc->fd = fd; @@ -4865,8 +4855,7 @@ qemuProcessGraphicsSetupNetworkAddress(virDomainGraphicsListenDefPtr glisten, /* TODO: reject configuration without network specified for network listen */ if (!glisten->network) { - if (VIR_STRDUP(glisten->address, listenAddr) < 0) - return -1; + glisten->address = g_strdup(listenAddr); return 0; } @@ -4933,8 +4922,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver, glisten->fromConfig = true; glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET; } else if (listenAddr) { - if (VIR_STRDUP(glisten->address, listenAddr) < 0) - goto cleanup; + glisten->address = g_strdup(listenAddr); glisten->fromConfig = true; } } @@ -8477,9 +8465,8 @@ qemuProcessQMPNew(const char *binary, if (VIR_ALLOC(proc) < 0) goto cleanup; - if (VIR_STRDUP(proc->binary, binary) < 0 || - VIR_STRDUP(proc->libDir, libDir) < 0) - goto cleanup; + proc->binary = g_strdup(binary); + proc->libDir = g_strdup(libDir); proc->runUid = runUid; proc->runGid = runGid; diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index dfef6f20a3..789d29ce43 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -172,8 +172,7 @@ qemuVhostUserBinaryParse(const char *path, VIR_DEBUG("vhost-user description path '%s' binary : %s", path, binary); - if (VIR_STRDUP(vu->binary, binary) < 0) - return -1; + vu->binary = g_strdup(binary); return 0; } @@ -389,8 +388,7 @@ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver, goto end; VIR_FREE(video->driver->vhost_user_binary); - if (VIR_STRDUP(video->driver->vhost_user_binary, vu->binary) < 0) - goto end; + video->driver->vhost_user_binary = g_strdup(vu->binary); break; } -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/rpc/gendispatch.pl | 20 ++++++-------------- src/rpc/virnetclient.c | 15 +++++---------- src/rpc/virnetlibsshsession.c | 19 ++++++------------- src/rpc/virnetmessage.c | 26 ++++++++++---------------- src/rpc/virnetserver.c | 3 +-- src/rpc/virnetserverclient.c | 3 +-- src/rpc/virnetsocket.c | 9 +++------ src/rpc/virnetsshsession.c | 30 ++++++++++-------------------- src/rpc/virnettlscontext.c | 21 +++++++-------------- 9 files changed, 49 insertions(+), 97 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 6d9838c398..fab4513fd1 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -773,10 +773,9 @@ elsif ($mode eq "server") { # SPECIAL: virConnectGetType returns a constant string that must # not be freed. Therefore, duplicate the string here. push(@vars_list, "const char *$1"); - push(@ret_list, "/* We have to VIR_STRDUP because remoteDispatchClientRequest will"); + push(@ret_list, "/* We have to g_strdup because remoteDispatchClientRequest will"); push(@ret_list, " * free this string after it's been serialised. */"); - push(@ret_list, "if (VIR_STRDUP(ret->type, type) < 0)"); - push(@ret_list, " goto cleanup;"); + push(@ret_list, "ret->type = g_strdup(type);"); } else { push(@vars_list, "char *$1"); push(@ret_list, "ret->$1 = $1;"); @@ -795,8 +794,7 @@ elsif ($mode eq "server") { "if (VIR_ALLOC($1_p) < 0)\n" . " goto cleanup;\n" . "\n" . - " if (VIR_STRDUP(*$1_p, $1) < 0)\n". - " goto cleanup;\n"); + " *$1_p = g_strdup($1);\n"); $single_ret_var = $1; $single_ret_by_ref = 0; @@ -1936,17 +1934,11 @@ elsif ($mode eq "client") { if ($single_ret_as_list) { print " /* This call is caller-frees (although that isn't clear from\n"; print " * the documentation). However xdr_free will free up both the\n"; - print " * names and the list of pointers, so we have to VIR_STRDUP the\n"; + print " * names and the list of pointers, so we have to g_strdup the\n"; print " * names here. */\n"; print " for (i = 0; i < ret.$single_ret_list_name.${single_ret_list_name}_len; ++i) {\n"; - print " if (VIR_STRDUP(${single_ret_list_name}[i],\n"; - print " ret.$single_ret_list_name.${single_ret_list_name}_val[i]) < 0) {\n"; - print " size_t j;\n"; - print " for (j = 0; j < i; j++)\n"; - print " VIR_FREE(${single_ret_list_name}[j]);\n"; - print "\n"; - print " goto cleanup;\n"; - print " }\n"; + print " ${single_ret_list_name}[i] = \n"; + print " g_strdup(ret.$single_ret_list_name.${single_ret_list_name}_val[i]);\n"; print " }\n"; print "\n"; } elsif ($modern_ret_as_list) { diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 1d846cd131..678e6f7815 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -316,8 +316,7 @@ static virNetClientPtr virNetClientNew(virNetSocketPtr sock, client->wakeupSendFD = wakeupFD[1]; wakeupFD[0] = wakeupFD[1] = -1; - if (VIR_STRDUP(client->hostname, hostname) < 0) - goto error; + client->hostname = g_strdup(hostname); PROBE(RPC_CLIENT_NEW, "client=%p sock=%p", @@ -454,8 +453,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host, /* Use default paths for known hosts an public keys if not provided */ if (knownHostsPath) { - if (VIR_STRDUP(knownhosts, knownHostsPath) < 0) - goto cleanup; + knownhosts = g_strdup(knownHostsPath); } else { confdir = virGetUserConfigDirectory(); if (confdir) { @@ -466,8 +464,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host, } if (privkeyPath) { - if (VIR_STRDUP(privkey, privkeyPath) < 0) - goto cleanup; + privkey = g_strdup(privkeyPath); } else { homedir = virGetUserDirectory(); if (homedir) { @@ -565,8 +562,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, /* Use default paths for known hosts an public keys if not provided */ if (knownHostsPath) { - if (VIR_STRDUP(knownhosts, knownHostsPath) < 0) - goto cleanup; + knownhosts = g_strdup(knownHostsPath); } else { confdir = virGetUserConfigDirectory(); if (confdir) { @@ -576,8 +572,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, } if (privkeyPath) { - if (VIR_STRDUP(privkey, privkeyPath) < 0) - goto cleanup; + privkey = g_strdup(privkeyPath); } else { homedir = virGetUserDirectory(); if (homedir) { diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index cd92329230..0b98236f38 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -1052,11 +1052,8 @@ virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSessionPtr sess, virObjectLock(sess); - if (VIR_STRDUP(file, keyfile) < 0 || - VIR_STRDUP(pass, password) < 0) { - ret = -1; - goto error; - } + file = g_strdup(keyfile); + pass = g_strdup(password); if (!(auth = virNetLibsshSessionAuthMethodNew(sess))) { ret = -1; @@ -1114,8 +1111,7 @@ virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess, VIR_FREE(sess->channelCommand); - if (VIR_STRDUP(sess->channelCommand, command) < 0) - ret = -1; + sess->channelCommand = g_strdup(command); virObjectUnlock(sess); return ret; @@ -1135,8 +1131,7 @@ virNetLibsshSessionSetHostKeyVerification(virNetLibsshSessionPtr sess, VIR_FREE(sess->hostname); - if (VIR_STRDUP(sess->hostname, hostname) < 0) - goto error; + sess->hostname = g_strdup(hostname); /* set the hostname */ if (ssh_options_set(sess->session, SSH_OPTIONS_HOST, sess->hostname) < 0) @@ -1156,8 +1151,7 @@ virNetLibsshSessionSetHostKeyVerification(virNetLibsshSessionPtr sess, goto error; VIR_FREE(sess->knownHostsFile); - if (VIR_STRDUP(sess->knownHostsFile, hostsfile) < 0) - goto error; + sess->knownHostsFile = g_strdup(hostsfile); } else { /* libssh does not support trying no known_host file at all: * hence use /dev/null here, without storing it as file */ @@ -1191,8 +1185,7 @@ virNetLibsshSessionPtr virNetLibsshSessionNew(const char *username) goto error; } - if (VIR_STRDUP(sess->username, username) < 0) - goto error; + sess->username = g_strdup(username); VIR_DEBUG("virNetLibsshSessionPtr: %p, ssh_session: %p", sess, sess->session); diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index bb6ef9a9ae..9d2a8a6d7d 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -523,28 +523,22 @@ void virNetMessageSaveError(virNetMessageErrorPtr rerr) if (verr) { rerr->code = verr->code; rerr->domain = verr->domain; - if (verr->message && VIR_ALLOC(rerr->message) == 0 && - VIR_STRDUP_QUIET(*rerr->message, verr->message) < 0) - VIR_FREE(rerr->message); + if (verr->message && VIR_ALLOC(rerr->message) == 0) + *rerr->message = g_strdup(verr->message); rerr->level = verr->level; - if (verr->str1 && VIR_ALLOC(rerr->str1) == 0 && - VIR_STRDUP_QUIET(*rerr->str1, verr->str1) < 0) - VIR_FREE(rerr->str1); - if (verr->str2 && VIR_ALLOC(rerr->str2) == 0 && - VIR_STRDUP_QUIET(*rerr->str2, verr->str2) < 0) - VIR_FREE(rerr->str2); - if (verr->str3 && VIR_ALLOC(rerr->str3) == 0 && - VIR_STRDUP_QUIET(*rerr->str3, verr->str3) < 0) - VIR_FREE(rerr->str3); + if (verr->str1 && VIR_ALLOC(rerr->str1) == 0) + *rerr->str1 = g_strdup(verr->str1); + if (verr->str2 && VIR_ALLOC(rerr->str2) == 0) + *rerr->str2 = g_strdup(verr->str2); + if (verr->str3 && VIR_ALLOC(rerr->str3) == 0) + *rerr->str3 = g_strdup(verr->str3); rerr->int1 = verr->int1; rerr->int2 = verr->int2; } else { rerr->code = VIR_ERR_INTERNAL_ERROR; rerr->domain = VIR_FROM_RPC; - if (VIR_ALLOC_QUIET(rerr->message) == 0 && - VIR_STRDUP_QUIET(*rerr->message, - _("Library function returned error but did not set virError")) < 0) - VIR_FREE(rerr->message); + if (VIR_ALLOC_QUIET(rerr->message) == 0) + *rerr->message = g_strdup(_("Library function returned error but did not set virError")); rerr->level = VIR_ERR_ERROR; } } diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index e229f57bab..042661ffa5 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -365,8 +365,7 @@ virNetServerPtr virNetServerNew(const char *name, srv))) goto error; - if (VIR_STRDUP(srv->name, name) < 0) - goto error; + srv->name = g_strdup(name); srv->next_client_id = next_client_id; srv->nclients_max = max_clients; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 8482c5c29c..67b3bf9531 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1665,8 +1665,7 @@ virNetServerClientGetInfo(virNetServerClientPtr client, goto cleanup; } - if (VIR_STRDUP(*sock_addr, addr) < 0) - goto cleanup; + *sock_addr = g_strdup(addr); if (!client->identity) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 15791ceb35..6574ee0d16 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -999,8 +999,7 @@ virNetSocketNewConnectLibSSH2(const char *host, if (virNetSSHSessionSetChannelCommand(sess, command) != 0) goto error; - if (VIR_STRDUP(authMethodsCopy, authMethods) < 0) - goto error; + authMethodsCopy = g_strdup(authMethods); authMethodNext = authMethodsCopy; @@ -1134,8 +1133,7 @@ virNetSocketNewConnectLibssh(const char *host, if (virNetLibsshSessionSetChannelCommand(sess, command) != 0) goto error; - if (VIR_STRDUP(authMethodsCopy, authMethods) < 0) - goto error; + authMethodsCopy = g_strdup(authMethods); authMethodNext = authMethodsCopy; @@ -1635,8 +1633,7 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock, goto cleanup; } - if (VIR_STRDUP(*context, seccon) < 0) - goto cleanup; + *context = g_strdup(seccon); ret = 0; cleanup: diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index de39ba31dc..931c7091cc 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -232,10 +232,7 @@ virNetSSHKbIntCb(const char *name G_GNUC_UNUSED, /* fill data structures for auth callback */ for (i = 0; i < num_prompts; i++) { char *prompt; - if (VIR_STRDUP(prompt, prompts[i].text) < 0) { - priv->authCbErr = VIR_NET_SSH_AUTHCB_OOM; - goto cleanup; - } + prompt = g_strdup(prompts[i].text); askcred[i].prompt = prompt; /* remove colon and trailing spaces from prompts, as default behavior @@ -1018,8 +1015,7 @@ virNetSSHSessionAuthAddPasswordAuth(virNetSSHSessionPtr sess, "ssh", NULL, sess->hostname))) goto error; } else { - if (VIR_STRDUP(user, username) < 0) - goto error; + user = g_strdup(username); } virObjectLock(sess); @@ -1055,8 +1051,7 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSessionPtr sess, virObjectLock(sess); - if (VIR_STRDUP(user, username) < 0) - goto error; + user = g_strdup(username); if (!(auth = virNetSSHSessionAuthMethodNew(sess))) goto error; @@ -1094,10 +1089,9 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSessionPtr sess, virObjectLock(sess); - if (VIR_STRDUP(user, username) < 0 || - VIR_STRDUP(file, keyfile) < 0 || - VIR_STRDUP(pass, password) < 0) - goto error; + user = g_strdup(username); + file = g_strdup(keyfile); + pass = g_strdup(password); if (!(auth = virNetSSHSessionAuthMethodNew(sess))) goto error; @@ -1135,8 +1129,7 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSessionPtr sess, virObjectLock(sess); - if (VIR_STRDUP(user, username) < 0) - goto error; + user = g_strdup(username); if (!(auth = virNetSSHSessionAuthMethodNew(sess))) goto error; @@ -1164,8 +1157,7 @@ virNetSSHSessionSetChannelCommand(virNetSSHSessionPtr sess, VIR_FREE(sess->channelCommand); - if (VIR_STRDUP(sess->channelCommand, command) < 0) - ret = -1; + sess->channelCommand = g_strdup(command); virObjectUnlock(sess); return ret; @@ -1188,8 +1180,7 @@ virNetSSHSessionSetHostKeyVerification(virNetSSHSessionPtr sess, VIR_FREE(sess->hostname); - if (VIR_STRDUP(sess->hostname, hostname) < 0) - goto error; + sess->hostname = g_strdup(hostname); /* load the known hosts file */ if (hostsfile) { @@ -1213,8 +1204,7 @@ virNetSSHSessionSetHostKeyVerification(virNetSSHSessionPtr sess, /* set filename only if writing to the known hosts file is requested */ if (!(flags & VIR_NET_SSH_HOSTKEY_FILE_READONLY)) { VIR_FREE(sess->knownHostsFile); - if (VIR_STRDUP(sess->knownHostsFile, hostsfile) < 0) - goto error; + sess->knownHostsFile = g_strdup(hostsfile); } } diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index e4fbe6e59a..2420ad8681 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -702,8 +702,7 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert, if (!(ctxt = virObjectLockableNew(virNetTLSContextClass))) return NULL; - if (VIR_STRDUP(ctxt->priority, priority) < 0) - goto error; + ctxt->priority = g_strdup(priority); err = gnutls_certificate_allocate_credentials(&ctxt->x509cred); if (err) { @@ -863,23 +862,19 @@ static int virNetTLSContextLocateCredentials(const char *pkipath, */ if (!*cacert) { VIR_DEBUG("Using default TLS CA certificate path"); - if (VIR_STRDUP(*cacert, LIBVIRT_CACERT) < 0) - goto error; + *cacert = g_strdup(LIBVIRT_CACERT); } if (!*cacrl) { VIR_DEBUG("Using default TLS CA revocation list path"); - if (VIR_STRDUP(*cacrl, LIBVIRT_CACRL) < 0) - goto error; + *cacrl = g_strdup(LIBVIRT_CACRL); } if (!*key && !*cert) { VIR_DEBUG("Using default TLS key/certificate path"); - if (VIR_STRDUP(*key, isServer ? LIBVIRT_SERVERKEY : LIBVIRT_CLIENTKEY) < 0) - goto error; + *key = g_strdup(isServer ? LIBVIRT_SERVERKEY : LIBVIRT_CLIENTKEY); - if (VIR_STRDUP(*cert, isServer ? LIBVIRT_SERVERCERT : LIBVIRT_CLIENTCERT) < 0) - goto error; + *cert = g_strdup(isServer ? LIBVIRT_SERVERCERT : LIBVIRT_CLIENTCERT); } VIR_FREE(user_pki_path); @@ -1058,8 +1053,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt, "[session]", gnutls_strerror(ret)); goto authfail; } - if (VIR_STRDUP(sess->x509dname, dname) < 0) - goto authfail; + sess->x509dname = g_strdup(dname); VIR_DEBUG("Peer DN is %s", dname); if (virNetTLSContextCheckCertDN(cert, "[session]", sess->hostname, dname, @@ -1195,8 +1189,7 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, if (!(sess = virObjectLockableNew(virNetTLSSessionClass))) return NULL; - if (VIR_STRDUP(sess->hostname, hostname) < 0) - goto error; + sess->hostname = g_strdup(hostname); if ((err = gnutls_init(&sess->session, ctxt->isServer ? GNUTLS_SERVER : GNUTLS_CLIENT)) != 0) { -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/storage/parthelper.c | 3 +- src/storage/storage_backend_disk.c | 19 ++++--------- src/storage/storage_backend_fs.c | 5 ++-- src/storage/storage_backend_gluster.c | 15 ++++------ src/storage/storage_backend_iscsi_direct.c | 3 +- src/storage/storage_backend_logical.c | 8 ++---- src/storage/storage_backend_mpath.c | 3 +- src/storage/storage_backend_rbd.c | 3 +- src/storage/storage_backend_sheepdog.c | 7 +++-- src/storage/storage_backend_zfs.c | 6 ++-- src/storage/storage_driver.c | 19 +++++-------- src/storage/storage_util.c | 32 +++++++--------------- 12 files changed, 43 insertions(+), 80 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 4a404ddfa6..f1a8cc01ea 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -91,8 +91,7 @@ int main(int argc, char **argv) partsep = "p"; else partsep = ""; - if (VIR_STRDUP_QUIET(canonical_path, path) < 0) - return 2; + canonical_path = g_strdup(path); } else { if (virFileResolveLink(path, &canonical_path) != 0) return 2; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 49590019c5..f37bcd2b15 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -75,13 +75,11 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, addVol = true; if (VIR_ALLOC(vol) < 0) return -1; - if (VIR_STRDUP(vol->name, partname) < 0) - goto error; + vol->name = g_strdup(partname); } if (vol->target.path == NULL) { - if (VIR_STRDUP(devpath, groups[0]) < 0) - goto error; + devpath = g_strdup(groups[0]); /* Now figure out the stable path * @@ -129,8 +127,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, if (vol->key == NULL) { /* XXX base off a unique key of the underlying disk */ - if (VIR_STRDUP(vol->key, vol->target.path) < 0) - goto error; + vol->key = g_strdup(vol->target.path); } if (vol->source.extents == NULL) { @@ -152,9 +149,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, goto error; } - if (VIR_STRDUP(vol->source.extents[0].path, - def->source.devices[0].path) < 0) - goto error; + vol->source.extents[0].path = g_strdup(def->source.devices[0].path); } /* set partition type */ @@ -602,8 +597,7 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, _("extended partition already exists")); return -1; } - if (VIR_STRDUP(*partFormat, partedFormat) < 0) - return -1; + *partFormat = g_strdup(partedFormat); } else { /* create primary partition as long as it is possible and after that check if an extended partition exists @@ -636,8 +630,7 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, } } } else { - if (VIR_STRDUP(*partFormat, "primary") < 0) - return -1; + *partFormat = g_strdup("primary"); } return 0; } diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index ad993c656f..02b824867a 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -81,9 +81,8 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, goto cleanup; src->nhost = 1; - if (VIR_STRDUP(src->hosts[0].name, state->host) < 0 || - VIR_STRDUP(src->dir, path) < 0) - goto cleanup; + src->hosts[0].name = g_strdup(state->host); + src->dir = g_strdup(path); src->format = VIR_STORAGE_POOL_NETFS_NFS; ret = 0; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 23fe0dc226..69de95a9ed 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -100,8 +100,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) if (VIR_ALLOC(ret) < 0) return NULL; - if (VIR_STRDUP(ret->volname, name) < 0) - goto error; + ret->volname = g_strdup(name); if (virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", trailing_slash ? "" : "/") < 0) goto error; @@ -110,10 +109,8 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) * extended to allow alternate transport */ if (VIR_ALLOC(ret->uri) < 0) goto error; - if (VIR_STRDUP(ret->uri->scheme, "gluster") < 0) - goto error; - if (VIR_STRDUP(ret->uri->server, def->source.hosts[0].name) < 0) - 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; ret->uri->port = def->source.hosts[0].port; @@ -196,8 +193,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, if (name) { VIR_FREE(vol->name); - if (VIR_STRDUP(vol->name, name) < 0) - return -1; + vol->name = g_strdup(name); } if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, @@ -218,8 +214,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, state->uri->path = tmp; /* the path is unique enough to serve as a volume key */ - if (VIR_STRDUP(vol->key, vol->target.path) < 0) - return -1; + vol->key = g_strdup(vol->target.path); return 0; } diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 7492566099..e8bf42d0d0 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -425,8 +425,7 @@ virISCSIDirectUpdateTargets(struct iscsi_context *iscsi, for (tmp_addr = addr; tmp_addr; tmp_addr = tmp_addr->next) { g_autofree char *target = NULL; - if (VIR_STRDUP(target, tmp_addr->target_name) < 0) - goto cleanup; + target = g_strdup(tmp_addr->target_name); if (VIR_APPEND_ELEMENT(tmp_targets, tmp_ntargets, target) < 0) goto cleanup; diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 80d2dfd0b4..208ca0792f 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -286,8 +286,7 @@ virStorageBackendLogicalMakeVol(char **const groups, is_new_vol = true; vol->type = VIR_STORAGE_VOL_BLOCK; - if (VIR_STRDUP(vol->name, groups[0]) < 0) - goto cleanup; + vol->name = g_strdup(groups[0]); } @@ -466,9 +465,8 @@ virStorageBackendLogicalFindPoolSourcesFunc(char **const groups, g_autofree char *pvname = NULL; g_autofree char *vgname = NULL; - if (VIR_STRDUP(pvname, groups[0]) < 0 || - VIR_STRDUP(vgname, groups[1]) < 0) - return -1; + pvname = g_strdup(groups[0]); + vgname = g_strdup(groups[1]); thisSource = NULL; for (i = 0; i < sourceList->nsources; i++) { diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 2d9ebf3ba3..fd3ee76371 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -65,8 +65,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, } /* XXX should use logical unit's UUID instead */ - if (VIR_STRDUP(vol->key, vol->target.path) < 0) - return -1; + vol->key = g_strdup(vol->target.path); if (virStoragePoolObjAddVol(pool, vol) < 0) return -1; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index e4154479c2..1c59c18b0d 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -660,8 +660,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) if (STREQ(name, "")) break; - if (VIR_STRDUP(namedup, name) < 0) - goto error; + namedup = g_strdup(name); if (VIR_APPEND_ELEMENT(names, nnames, namedup) < 0) goto error; diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 443c224222..e481eea816 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -118,9 +118,11 @@ virStorageBackendSheepdogAddVolume(virStoragePoolObjPtr pool, const char *diskIn return -1; } - if (VIR_ALLOC(vol) < 0 || VIR_STRDUP(vol->name, diskInfo) < 0) + if (VIR_ALLOC(vol) < 0) return -1; + vol->name = g_strdup(diskInfo); + vol->type = VIR_STORAGE_VOL_NETWORK; if (virStorageBackendSheepdogRefreshVol(pool, vol) < 0) @@ -229,8 +231,7 @@ virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr pool, return -1; VIR_FREE(vol->target.path); - if (VIR_STRDUP(vol->target.path, vol->name) < 0) - return -1; + vol->target.path = g_strdup(vol->name); return 0; } diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 75edab4b26..c3057fede6 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -132,8 +132,7 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, is_new_vol = true; volume->type = VIR_STORAGE_VOL_BLOCK; - if (VIR_STRDUP(volume->name, vol_name) < 0) - goto cleanup; + volume->name = g_strdup(vol_name); } if (!volume->key) @@ -313,8 +312,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, def->target.path, vol->name) < 0) return -1; - if (VIR_STRDUP(vol->key, vol->target.path) < 0) - goto cleanup; + vol->key = g_strdup(vol->target.path); volmode_needed = virStorageBackendZFSVolModeNeeded(); if (volmode_needed < 0) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ac215c7036..3b8332af01 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -272,13 +272,9 @@ storageStateInitialize(bool privileged, goto error; if (privileged) { - if (VIR_STRDUP(driver->configDir, - SYSCONFDIR "/libvirt/storage") < 0 || - VIR_STRDUP(driver->autostartDir, - SYSCONFDIR "/libvirt/storage/autostart") < 0 || - VIR_STRDUP(driver->stateDir, - RUNSTATEDIR "/libvirt/storage") < 0) - goto error; + driver->configDir = g_strdup(SYSCONFDIR "/libvirt/storage"); + driver->autostartDir = g_strdup(SYSCONFDIR "/libvirt/storage/autostart"); + driver->stateDir = g_strdup(RUNSTATEDIR "/libvirt/storage"); } else { configdir = virGetUserConfigDirectory(); rundir = virGetUserRuntimeDirectory(); @@ -2442,12 +2438,11 @@ storageVolUpload(virStorageVolPtr vol, * interaction and we can just lookup the backend in the callback * routine in order to call the refresh API. */ - if (VIR_ALLOC(cbdata) < 0 || - VIR_STRDUP(cbdata->pool_name, def->name) < 0) - goto cleanup; - if (voldef->type == VIR_STORAGE_VOL_PLOOP && - VIR_STRDUP(cbdata->vol_path, voldef->target.path) < 0) + if (VIR_ALLOC(cbdata) < 0) goto cleanup; + cbdata->pool_name = g_strdup(def->name); + if (voldef->type == VIR_STORAGE_VOL_PLOOP) + cbdata->vol_path = g_strdup(voldef->target.path); virStoragePoolObjIncrAsyncjobs(obj); voldef->in_use++; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 692b3e7a9d..7b934b61e0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1874,10 +1874,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, return -1; } } else { - if (VIR_STRDUP(target->perms->label, filecon) < 0) { - freecon(filecon); - return -1; - } + target->perms->label = g_strdup(filecon); freecon(filecon); } } @@ -2758,8 +2755,7 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) unsigned int dir_create_flags; g_autofree char *parent = NULL; - if (VIR_STRDUP(parent, def->target.path) < 0) - return -1; + parent = g_strdup(def->target.path); if (!(p = strrchr(parent, '/'))) { virReportError(VIR_ERR_INVALID_ARG, _("path '%s' is not absolute"), @@ -2865,8 +2861,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host, src->format = VIR_STORAGE_POOL_NETFS_GLUSTERFS; src->dir = g_steal_pointer(&volname); } else if (pooltype == VIR_STORAGE_POOL_GLUSTER) { - if (VIR_STRDUP(src->dir, "/") < 0) - goto cleanup; + src->dir = g_strdup("/"); src->name = g_steal_pointer(&volname); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2878,8 +2873,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host, goto cleanup; src->nhost = 1; - if (VIR_STRDUP(src->hosts[0].name, host) < 0) - goto cleanup; + src->hosts[0].name = g_strdup(host); } ret = nnodes; @@ -3547,16 +3541,14 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) if (VIR_ALLOC(vol) < 0) goto cleanup; - if (VIR_STRDUP(vol->name, ent->d_name) < 0) - goto cleanup; + 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; - if (VIR_STRDUP(vol->key, vol->target.path) < 0) - goto cleanup; + vol->key = g_strdup(vol->target.path); if ((err = virStorageBackendRefreshVolTargetUpdate(vol)) < 0) { if (err == -2) { @@ -3615,8 +3607,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) def->target.perms.uid = target->perms->uid; def->target.perms.gid = target->perms->gid; VIR_FREE(def->target.perms.label); - if (VIR_STRDUP(def->target.perms.label, target->perms->label) < 0) - goto cleanup; + def->target.perms.label = g_strdup(target->perms->label); ret = 0; cleanup: @@ -3769,8 +3760,7 @@ getNewStyleBlockDevice(const char *lun_path, goto cleanup; while ((direrr = virDirRead(block_dir, &block_dirent, block_path)) > 0) { - if (VIR_STRDUP(*block_device, block_dirent->d_name) < 0) - goto cleanup; + *block_device = g_strdup(block_dirent->d_name); VIR_DEBUG("Block device is '%s'", *block_device); @@ -3805,8 +3795,7 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, goto cleanup; } else { blockp++; - if (VIR_STRDUP(*block_device, blockp) < 0) - goto cleanup; + *block_device = g_strdup(blockp); VIR_DEBUG("Block device is '%s'", *block_device); } @@ -4096,8 +4085,7 @@ virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool) return NULL; } } else { - if (VIR_STRDUP(src, def->source.devices[0].path) < 0) - return NULL; + src = g_strdup(def->source.devices[0].path); } return src; } -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/util/virstorageencryption.c | 11 +- src/util/virstoragefile.c | 188 ++++++++++++-------------------- 2 files changed, 72 insertions(+), 127 deletions(-) diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c index 14d7dc26e2..74836d4a00 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -101,12 +101,11 @@ virStorageEncryptionInfoDefCopy(const virStorageEncryptionInfoDef *src, virStorageEncryptionInfoDefPtr dst) { dst->cipher_size = src->cipher_size; - if (VIR_STRDUP(dst->cipher_name, src->cipher_name) < 0 || - VIR_STRDUP(dst->cipher_mode, src->cipher_mode) < 0 || - VIR_STRDUP(dst->cipher_hash, src->cipher_hash) < 0 || - VIR_STRDUP(dst->ivgen_name, src->ivgen_name) < 0 || - VIR_STRDUP(dst->ivgen_hash, src->ivgen_hash) < 0) - return -1; + dst->cipher_name = g_strdup(src->cipher_name); + dst->cipher_mode = g_strdup(src->cipher_mode); + dst->cipher_hash = g_strdup(src->cipher_hash); + dst->ivgen_name = g_strdup(src->ivgen_name); + dst->ivgen_hash = g_strdup(src->ivgen_hash); return 0; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c13ed9fee5..be2b5479bb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -644,8 +644,7 @@ vmdk4GetBackingStore(char **res, goto cleanup; } *end = '\0'; - if (VIR_STRDUP(*res, start) < 0) - goto cleanup; + *res = g_strdup(start); ret = BACKING_STORE_OK; @@ -1068,9 +1067,8 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta, } VIR_FREE(meta->compat); - if (meta->format == VIR_STORAGE_FILE_QCOW2 && meta->features && - VIR_STRDUP(meta->compat, "1.1") < 0) - return -1; + if (meta->format == VIR_STORAGE_FILE_QCOW2 && meta->features) + meta->compat = g_strdup("1.1"); return 0; } @@ -1138,8 +1136,7 @@ virStorageFileMetadataNew(const char *path, def->format = format; def->type = VIR_STORAGE_TYPE_FILE; - if (VIR_STRDUP(def->path, path) < 0) - return NULL; + def->path = g_strdup(path); ret = g_steal_pointer(&def); return ret; @@ -1290,8 +1287,7 @@ virStorageFileChainGetBroken(virStorageSourcePtr chain, /* Break when we hit end of chain; report error if we detected * a missing backing file, infinite loop, or other error */ if (!tmp->backingStore && tmp->backingStoreRaw) { - if (VIR_STRDUP(*brokenFile, tmp->backingStoreRaw) < 0) - return -1; + *brokenFile = g_strdup(tmp->backingStoreRaw); return 0; } @@ -1591,9 +1587,8 @@ virStorageFileParseBackingStoreStr(const char *str, return -1; } - if (target && - VIR_STRDUP(*target, strings[0]) < 0) - return -1; + if (target) + *target = g_strdup(strings[0]); *chainIndex = idx; return 0; @@ -1820,11 +1815,8 @@ virStorageNetHostDefCopy(size_t nhosts, dst->transport = src->transport; dst->port = src->port; - if (VIR_STRDUP(dst->name, src->name) < 0) - goto error; - - if (VIR_STRDUP(dst->socket, src->socket) < 0) - goto error; + dst->name = g_strdup(src->name); + dst->socket = g_strdup(src->socket); } return ret; @@ -1857,11 +1849,9 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) if (VIR_ALLOC(authdef) < 0) return NULL; - if (VIR_STRDUP(authdef->username, src->username) < 0) - return NULL; + authdef->username = g_strdup(src->username); /* Not present for storage pool, but used for disk source */ - if (VIR_STRDUP(authdef->secrettype, src->secrettype) < 0) - return NULL; + authdef->secrettype = g_strdup(src->secrettype); authdef->authType = src->authType; if (virSecretLookupDefCopy(&authdef->seclookupdef, &src->seclookupdef) < 0) @@ -2109,13 +2099,11 @@ virStoragePRDefCopy(virStoragePRDefPtr src) copy->managed = src->managed; - if (VIR_STRDUP(copy->path, src->path) < 0 || - VIR_STRDUP(copy->mgralias, src->mgralias) < 0) - goto cleanup; + copy->path = g_strdup(src->path); + copy->mgralias = g_strdup(src->mgralias); ret = g_steal_pointer(©); - cleanup: virStoragePRDefFree(copy); return ret; } @@ -2201,14 +2189,9 @@ virStoragePermsCopy(const virStoragePerms *src) ret->uid = src->uid; ret->gid = src->gid; - if (VIR_STRDUP(ret->label, src->label) < 0) - goto error; + ret->label = g_strdup(src->label); return ret; - - error: - virStoragePermsFree(ret); - return NULL; } @@ -2225,15 +2208,10 @@ virStorageSourcePoolDefCopy(const virStorageSourcePoolDef *src) ret->actualtype = src->actualtype; ret->mode = src->mode; - if (VIR_STRDUP(ret->pool, src->pool) < 0 || - VIR_STRDUP(ret->volume, src->volume) < 0) - goto error; + ret->pool = g_strdup(src->pool); + ret->volume = g_strdup(src->volume); return ret; - - error: - virStorageSourcePoolDefFree(ret); - return NULL; } @@ -2279,19 +2257,18 @@ virStorageSourceCopy(const virStorageSource *src, /* storage driver metadata are not copied */ def->drv = NULL; - if (VIR_STRDUP(def->path, src->path) < 0 || - VIR_STRDUP(def->volume, src->volume) < 0 || - VIR_STRDUP(def->relPath, src->relPath) < 0 || - VIR_STRDUP(def->backingStoreRaw, src->backingStoreRaw) < 0 || - VIR_STRDUP(def->externalDataStoreRaw, src->externalDataStoreRaw) < 0 || - VIR_STRDUP(def->snapshot, src->snapshot) < 0 || - VIR_STRDUP(def->configFile, src->configFile) < 0 || - VIR_STRDUP(def->nodeformat, src->nodeformat) < 0 || - VIR_STRDUP(def->nodestorage, src->nodestorage) < 0 || - VIR_STRDUP(def->compat, src->compat) < 0 || - VIR_STRDUP(def->tlsAlias, src->tlsAlias) < 0 || - VIR_STRDUP(def->tlsCertdir, src->tlsCertdir) < 0) - return NULL; + def->path = g_strdup(src->path); + def->volume = g_strdup(src->volume); + def->relPath = g_strdup(src->relPath); + def->backingStoreRaw = g_strdup(src->backingStoreRaw); + def->externalDataStoreRaw = g_strdup(src->externalDataStoreRaw); + def->snapshot = g_strdup(src->snapshot); + def->configFile = g_strdup(src->configFile); + def->nodeformat = g_strdup(src->nodeformat); + def->nodestorage = g_strdup(src->nodestorage); + def->compat = g_strdup(src->compat); + def->tlsAlias = g_strdup(src->tlsAlias); + def->tlsCertdir = g_strdup(src->tlsCertdir); if (src->nhosts) { if (!(def->hosts = virStorageNetHostDefCopy(src->nhosts, src->hosts))) @@ -2635,8 +2612,7 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, return NULL; /* store relative name */ - if (VIR_STRDUP(def->relPath, rel) < 0) - return NULL; + def->relPath = g_strdup(rel); if (!(dirname = mdir_name(parent->path))) { virReportOOMError(); @@ -2664,8 +2640,7 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, def->nhosts = parent->nhosts; } - if (VIR_STRDUP(def->volume, parent->volume) < 0) - return NULL; + def->volume = g_strdup(parent->volume); } else { /* set the type to _FILE, the caller shall update it to the actual type */ def->type = VIR_STORAGE_TYPE_FILE; @@ -2716,10 +2691,8 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src, } /* handle socket stored as a query */ - if (uri->query) { - if (VIR_STRDUP(src->hosts->socket, STRSKIP(uri->query, "socket=")) < 0) - return -1; - } + if (uri->query) + src->hosts->socket = g_strdup(STRSKIP(uri->query, "socket=")); /* uri->path is NULL if the URI does not contain slash after host: * transport://host:port */ @@ -2737,8 +2710,7 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src, path[0] == '\0') path = NULL; - if (VIR_STRDUP(src->path, path) < 0) - return -1; + src->path = g_strdup(path); if (src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { char *tmp; @@ -2759,16 +2731,14 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src, src->volume = src->path; - if (VIR_STRDUP(src->path, tmp + 1) < 0) - return -1; + src->path = g_strdup(tmp + 1); tmp[0] = '\0'; } src->hosts->port = uri->port; - if (VIR_STRDUP(src->hosts->name, uri->server) < 0) - return -1; + src->hosts->name = g_strdup(uri->server); /* Libvirt doesn't handle inline authentication. Make the caller aware. */ if (uri->user) @@ -2835,28 +2805,24 @@ virStorageSourceParseRBDColonString(const char *rbdstr, if (STRPREFIX(rbdstr, "rbd:")) rbdstr += strlen("rbd:"); - if (VIR_STRDUP(src->path, rbdstr) < 0) - return -1; + src->path = g_strdup(rbdstr); p = strchr(src->path, ':'); if (p) { - if (VIR_STRDUP(options, p + 1) < 0) - return -1; + options = g_strdup(p + 1); *p = '\0'; } /* snapshot name */ if ((p = strchr(src->path, '@'))) { - if (VIR_STRDUP(src->snapshot, p + 1) < 0) - return -1; + src->snapshot = g_strdup(p + 1); *p = '\0'; } /* pool vs. image name */ if ((p = strchr(src->path, '/'))) { src->volume = g_steal_pointer(&src->path); - if (VIR_STRDUP(src->path, p + 1) < 0) - return -1; + src->path = g_strdup(p + 1); *p = '\0'; } @@ -2891,12 +2857,9 @@ virStorageSourceParseRBDColonString(const char *rbdstr, if (VIR_ALLOC(authdef) < 0) return -1; - if (VIR_STRDUP(authdef->username, p + strlen("id=")) < 0) - return -1; + authdef->username = g_strdup(p + strlen("id=")); - if (VIR_STRDUP(authdef->secrettype, - virSecretUsageTypeToString(VIR_SECRET_USAGE_TYPE_CEPH)) < 0) - return -1; + authdef->secrettype = g_strdup(virSecretUsageTypeToString(VIR_SECRET_USAGE_TYPE_CEPH)); src->auth = g_steal_pointer(&authdef); src->authInherited = true; @@ -2926,9 +2889,8 @@ virStorageSourceParseRBDColonString(const char *rbdstr, } } - if (STRPREFIX(p, "conf=") && - VIR_STRDUP(src->configFile, p + strlen("conf=")) < 0) - return -1; + if (STRPREFIX(p, "conf=")) + src->configFile = g_strdup(p + strlen("conf=")); p = next; } @@ -2971,12 +2933,10 @@ virStorageSourceParseNBDColonString(const char *nbdstr, return -1; } - if (VIR_STRDUP(src->hosts->socket, backing[2]) < 0) - return -1; + src->hosts->socket = g_strdup(backing[2]); } else { - if (VIR_STRDUP(src->hosts->name, backing[1]) < 0) - return -1; + src->hosts->name = g_strdup(backing[1]); if (!backing[2]) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2991,8 +2951,7 @@ virStorageSourceParseNBDColonString(const char *nbdstr, if ((exportname = strstr(nbdstr, "exportname="))) { exportname += strlen("exportname="); - if (VIR_STRDUP(src->path, exportname) < 0) - return -1; + src->path = g_strdup(exportname); } return 0; @@ -3080,8 +3039,7 @@ virStorageSourceParseBackingJSONPath(virStorageSourcePtr src, return -1; } - if (VIR_STRDUP(src->path, path) < 0) - return -1; + src->path = g_strdup(path); src->type = type; return 0; @@ -3153,9 +3111,9 @@ virStorageSourceParseBackingJSONInetSocketAddress(virStorageNetHostDefPtr host, } host->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + host->name = g_strdup(hostname); - if (VIR_STRDUP(host->name, hostname) < 0 || - virStringParsePort(port, &host->port) < 0) + if (virStringParsePort(port, &host->port) < 0) return -1; return 0; @@ -3202,8 +3160,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host, return -1; } - if (VIR_STRDUP(host->socket, socket) < 0) - return -1; + host->socket = g_strdup(socket); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("backing store protocol '%s' is not yet supported"), @@ -3242,9 +3199,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src, src->type = VIR_STORAGE_TYPE_NETWORK; src->protocol = VIR_STORAGE_NET_PROTOCOL_GLUSTER; - if (VIR_STRDUP(src->volume, volume) < 0 || - VIR_STRDUP(src->path, path) < 0) - return -1; + src->volume = g_strdup(volume); + src->path = g_strdup(path); nservers = virJSONValueArraySize(server); if (nservers == 0) { @@ -3317,8 +3273,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src, return -1; } - if (VIR_STRDUP(src->hosts->name, portal) < 0) - return -1; + src->hosts->name = g_strdup(portal); if ((port = strrchr(src->hosts->name, ':')) && !strchr(port, ']')) { @@ -3361,8 +3316,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src, src->type = VIR_STORAGE_TYPE_NETWORK; src->protocol = VIR_STORAGE_NET_PROTOCOL_NBD; - if (VIR_STRDUP(src->path, export) < 0) - return -1; + src->path = g_strdup(export); if (VIR_ALLOC_N(src->hosts, 1) < 0) return -1; @@ -3374,12 +3328,10 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src, } else { if (path) { src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_UNIX; - if (VIR_STRDUP(src->hosts[0].socket, path) < 0) - return -1; + src->hosts[0].socket = g_strdup(path); } else { src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP; - if (VIR_STRDUP(src->hosts[0].name, host) < 0) - return -1; + src->hosts[0].name = g_strdup(host); if (virStringParsePort(port, &src->hosts[0].port) < 0) return -1; @@ -3419,8 +3371,7 @@ virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src, return -1; } - if (VIR_STRDUP(src->path, vdi) < 0) - return -1; + src->path = g_strdup(vdi); if (VIR_ALLOC(src->hosts) < 0) return -1; @@ -3454,8 +3405,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src, src->type = VIR_STORAGE_TYPE_NETWORK; src->protocol = VIR_STORAGE_NET_PROTOCOL_SSH; - if (VIR_STRDUP(src->path, path) < 0) - return -1; + src->path = g_strdup(path); if (VIR_ALLOC_N(src->hosts, 1) < 0) return -1; @@ -3467,9 +3417,9 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src, return -1; } else { src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + src->hosts[0].name = g_strdup(host); - if (VIR_STRDUP(src->hosts[0].name, host) < 0 || - virStringParsePort(port, &src->hosts[0].port) < 0) + if (virStringParsePort(port, &src->hosts[0].port) < 0) return -1; } @@ -3506,11 +3456,10 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src, return -1; } - if (VIR_STRDUP(src->volume, pool) < 0 || - VIR_STRDUP(src->path, image) < 0 || - VIR_STRDUP(src->snapshot, snapshot) < 0 || - VIR_STRDUP(src->configFile, conf) < 0) - goto cleanup; + src->volume = g_strdup(pool); + src->path = g_strdup(image); + src->snapshot = g_strdup(snapshot); + src->configFile = g_strdup(conf); if (servers) { nservers = virJSONValueArraySize(servers); @@ -3562,8 +3511,7 @@ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src, src->type = VIR_STORAGE_TYPE_NETWORK; src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; - if (VIR_STRDUP(src->path, vdisk_id) < 0) - return -1; + src->path = g_strdup(vdisk_id); if (VIR_ALLOC_N(src->hosts, 1) < 0) return -1; @@ -3691,8 +3639,7 @@ virStorageSourceNewFromBackingAbsolute(const char *path, if (virStorageIsFile(path)) { def->type = VIR_STORAGE_TYPE_FILE; - if (VIR_STRDUP(def->path, path) < 0) - return -1; + def->path = g_strdup(path); } else { def->type = VIR_STORAGE_TYPE_NETWORK; @@ -4213,8 +4160,7 @@ virStorageFileRemoveLastPathComponent(const char *path) { char *ret; - if (VIR_STRDUP(ret, NULLSTR_EMPTY(path)) < 0) - return NULL; + ret = g_strdup(NULLSTR_EMPTY(path)); virFileRemoveLastComponent(ret); -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/util/virarptable.c | 6 ++--- src/util/virauth.c | 12 +++------ src/util/virauthconfig.c | 6 ++--- src/util/vircommand.c | 44 ++++++++------------------------ src/util/virconf.c | 30 +++++----------------- src/util/virdbus.c | 9 +++---- src/util/virdnsmasq.c | 13 +++------- src/util/virerror.c | 12 +++------ src/util/virfcp.c | 3 +-- src/util/virfdstream.c | 10 +++----- src/util/virfile.c | 40 ++++++++++------------------- src/util/virfilecache.c | 6 ++--- src/util/virfirewall.c | 3 +-- src/util/virfirmware.c | 10 +++----- src/util/virhostdev.c | 3 +-- src/util/virhostmem.c | 3 +-- src/util/viriscsi.c | 6 ++--- src/util/virjson.c | 13 +++------- src/util/virlease.c | 3 +-- src/util/virlockspace.c | 19 ++++---------- src/util/virlog.c | 11 +++----- src/util/virmdev.c | 9 +++---- src/util/virnetdevmacvlan.c | 12 +++------ src/util/virnetdevopenvswitch.c | 3 +-- src/util/virnetdevtap.c | 6 ++--- src/util/virnetdevvportprofile.c | 5 +--- src/util/virobject.c | 3 +-- src/util/virpci.c | 26 ++++++------------- src/util/virportallocator.c | 8 +----- src/util/virresctrl.c | 6 ++--- src/util/virrotatingfile.c | 9 +++---- src/util/virscsi.c | 5 ++-- src/util/virscsivhost.c | 13 +++------- src/util/virseclabel.c | 19 ++++++-------- src/util/virsecret.c | 3 +-- src/util/virsocketaddr.c | 6 ++--- src/util/virstring.c | 14 +++++----- src/util/virsysinfo.c | 6 ++--- src/util/virsystemd.c | 3 +-- src/util/virtypedparam-public.c | 6 ++--- src/util/virtypedparam.c | 22 +++++----------- src/util/viruri.c | 22 ++++++---------- src/util/virusb.c | 6 ++--- src/util/virutil.c | 25 +++++++++--------- src/util/virxml.c | 3 +-- 45 files changed, 162 insertions(+), 340 deletions(-) diff --git a/src/util/virarptable.c b/src/util/virarptable.c index cc676a0200..265f60d645 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -127,8 +127,7 @@ virArpTableGet(void) virAddr.data.inet4.sin_addr = *(struct in_addr *)addr; ipstr = virSocketAddrFormat(&virAddr); - if (VIR_STRDUP(table->t[num].ipaddr, ipstr) < 0) - goto cleanup; + table->t[num].ipaddr = g_strdup(ipstr); } if (tb[NDA_LLADDR]) { @@ -140,8 +139,7 @@ virArpTableGet(void) virMacAddrFormat(&macaddr, ifmac); - if (VIR_STRDUP(table->t[num].mac, ifmac) < 0) - goto cleanup; + table->t[num].mac = g_strdup(ifmac); num++; } diff --git a/src/util/virauth.c b/src/util/virauth.c index 979cb5773e..ddb46cc498 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -51,8 +51,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (authenv) { VIR_DEBUG("Using path from env '%s'", authenv); - if (VIR_STRDUP(*path, authenv) < 0) - return -1; + *path = g_strdup(authenv); return 0; } @@ -61,8 +60,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (STREQ_NULLABLE(uri->params[i].name, "authfile") && uri->params[i].value) { VIR_DEBUG("Using path from URI '%s'", uri->params[i].value); - if (VIR_STRDUP(*path, uri->params[i].value) < 0) - return -1; + *path = g_strdup(uri->params[i].value); return 0; } } @@ -80,8 +78,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, VIR_FREE(*path); - if (VIR_STRDUP(*path, SYSCONFDIR "/libvirt/auth.conf") < 0) - return -1; + *path = g_strdup(SYSCONFDIR "/libvirt/auth.conf"); VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) @@ -129,8 +126,7 @@ virAuthGetCredential(const char *servicename, &tmp) < 0) return -1; - if (VIR_STRDUP(*value, tmp) < 0) - return -1; + *value = g_strdup(tmp); return 0; } diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 9e55852cd4..6a9001f2d8 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -44,8 +44,7 @@ virAuthConfigPtr virAuthConfigNew(const char *path) if (VIR_ALLOC(auth) < 0) goto error; - if (VIR_STRDUP(auth->path, path) < 0) - goto error; + auth->path = g_strdup(path); if (!(auth->keyfile = virKeyFileNew())) goto error; @@ -70,8 +69,7 @@ virAuthConfigPtr virAuthConfigNewData(const char *path, if (VIR_ALLOC(auth) < 0) goto error; - if (VIR_STRDUP(auth->path, path) < 0) - goto error; + auth->path = g_strdup(path); if (!(auth->keyfile = virKeyFileNew())) goto error; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 93b3dd218f..223a2a824e 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1061,8 +1061,7 @@ virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) return; VIR_FREE(cmd->pidfile); - if (VIR_STRDUP_QUIET(cmd->pidfile, pidfile) < 0) - cmd->has_error = ENOMEM; + cmd->pidfile = g_strdup(pidfile); } @@ -1194,8 +1193,7 @@ virCommandSetSELinuxLabel(virCommandPtr cmd, #if defined(WITH_SECDRIVER_SELINUX) VIR_FREE(cmd->seLinuxLabel); - if (VIR_STRDUP_QUIET(cmd->seLinuxLabel, label) < 0) - cmd->has_error = ENOMEM; + cmd->seLinuxLabel = g_strdup(label); #endif return; } @@ -1219,8 +1217,7 @@ virCommandSetAppArmorProfile(virCommandPtr cmd, #if defined(WITH_SECDRIVER_APPARMOR) VIR_FREE(cmd->appArmorProfile); - if (VIR_STRDUP_QUIET(cmd->appArmorProfile, profile) < 0) - cmd->has_error = ENOMEM; + cmd->appArmorProfile = g_strdup(profile); #endif return; } @@ -1369,10 +1366,7 @@ virCommandAddEnvString(virCommandPtr cmd, const char *str) if (!cmd || cmd->has_error) return; - if (VIR_STRDUP_QUIET(env, str) < 0) { - cmd->has_error = ENOMEM; - return; - } + env = g_strdup(str); virCommandAddEnv(cmd, env); } @@ -1501,10 +1495,7 @@ virCommandAddArg(virCommandPtr cmd, const char *val) return; } - if (VIR_STRDUP_QUIET(arg, val) < 0) { - cmd->has_error = ENOMEM; - return; - } + arg = g_strdup(val); /* Arg plus trailing NULL. */ if (VIR_RESIZE_N(cmd->args, cmd->maxargs, cmd->nargs, 1 + 1) < 0) { @@ -1542,12 +1533,8 @@ virCommandAddArgBuffer(virCommandPtr cmd, virBufferPtr buf) } cmd->args[cmd->nargs] = virBufferContentAndReset(buf); - if (!cmd->args[cmd->nargs]) { - if (VIR_STRDUP_QUIET(cmd->args[cmd->nargs], "") < 0) { - cmd->has_error = ENOMEM; - return; - } - } + if (!cmd->args[cmd->nargs]) + cmd->args[cmd->nargs] = g_strdup(""); cmd->nargs++; } @@ -1638,10 +1625,7 @@ virCommandAddArgSet(virCommandPtr cmd, const char *const*vals) while (vals[narg] != NULL) { char *arg; - if (VIR_STRDUP_QUIET(arg, vals[narg++]) < 0) { - cmd->has_error = ENOMEM; - return; - } + arg = g_strdup(vals[narg++]); cmd->args[cmd->nargs++] = arg; } } @@ -1678,11 +1662,7 @@ virCommandAddArgList(virCommandPtr cmd, ...) char *arg = va_arg(list, char *); if (!arg) break; - if (VIR_STRDUP_QUIET(arg, arg) < 0) { - cmd->has_error = ENOMEM; - va_end(list); - return; - } + arg = g_strdup(arg); cmd->args[cmd->nargs++] = arg; } va_end(list); @@ -1707,8 +1687,7 @@ virCommandSetWorkingDirectory(virCommandPtr cmd, const char *pwd) cmd->has_error = -1; VIR_DEBUG("cannot set directory twice"); } else { - if (VIR_STRDUP_QUIET(cmd->pwd, pwd) < 0) - cmd->has_error = ENOMEM; + cmd->pwd = g_strdup(pwd); } } @@ -1869,8 +1848,7 @@ virCommandSetInputBuffer(virCommandPtr cmd, const char *inbuf) return; } - if (VIR_STRDUP_QUIET(cmd->inbuf, inbuf) < 0) - cmd->has_error = ENOMEM; + cmd->inbuf = g_strdup(inbuf); } diff --git a/src/util/virconf.c b/src/util/virconf.c index 6f7bf3be8e..3b678015f5 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -187,10 +187,7 @@ virConfCreate(const char *filename, unsigned int flags) if (!ret) return NULL; - if (VIR_STRDUP(ret->filename, filename) < 0) { - VIR_FREE(ret); - return NULL; - } + ret->filename = g_strdup(filename); ret->flags = flags; return ret; @@ -905,8 +902,7 @@ int virConfGetValueString(virConfPtr conf, } VIR_FREE(*value); - if (VIR_STRDUP(*value, cval->str) < 0) - return -1; + *value = g_strdup(cval->str); return 1; } @@ -964,24 +960,16 @@ int virConfGetValueStringList(virConfPtr conf, if (VIR_ALLOC_N(*values, len + 1) < 0) return -1; - for (len = 0, eval = cval->list; eval; len++, eval = eval->next) { - if (VIR_STRDUP((*values)[len], eval->str) < 0) { - virStringListFree(*values); - *values = NULL; - return -1; - } - } + for (len = 0, eval = cval->list; eval; len++, eval = eval->next) + (*values)[len] = g_strdup(eval->str); break; case VIR_CONF_STRING: if (compatString) { if (VIR_ALLOC_N(*values, cval->str ? 2 : 1) < 0) return -1; - if (cval->str && - VIR_STRDUP((*values)[0], cval->str) < 0) { - VIR_FREE(*values); - return -1; - } + if (cval->str) + (*values)[0] = g_strdup(cval->str); break; } G_GNUC_FALLTHROUGH; @@ -1383,11 +1371,7 @@ virConfSetValue(virConfPtr conf, return -1; } cur->comment = NULL; - if (VIR_STRDUP(cur->name, setting) < 0) { - virConfFreeValue(value); - VIR_FREE(cur); - return -1; - } + cur->name = g_strdup(setting); cur->value = value; if (prev) { cur->next = prev->next; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index f54c917c03..89c9cb3e24 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1010,8 +1010,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, } char *s; dbus_message_iter_get_basic(iter, &s); - if (VIR_STRDUP(*x, s) < 0) - goto cleanup; + *x = g_strdup(s); VIR_DEBUG("Read basic type 'char *' varg 'char **'" "' val '%s'", *x); } while (0); @@ -1573,10 +1572,8 @@ virDBusCall(DBusConnection *conn, error->level = VIR_ERR_ERROR; error->code = VIR_ERR_DBUS_SERVICE; error->domain = VIR_FROM_DBUS; - if (VIR_STRDUP(error->message, localerror.message) < 0) - goto cleanup; - if (VIR_STRDUP(error->str1, localerror.name) < 0) - goto cleanup; + error->message = g_strdup(localerror.message); + error->str1 = g_strdup(localerror.name); ret = 0; } else { virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member, diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 9aeb7b120d..f22250a07e 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -112,8 +112,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_ALLOC(addnhostsfile->hosts[idx].hostnames) < 0) goto error; - if (VIR_STRDUP(addnhostsfile->hosts[idx].ip, ipstr) < 0) - goto error; + addnhostsfile->hosts[idx].ip = g_strdup(ipstr); addnhostsfile->hosts[idx].nhostnames = 0; addnhostsfile->nhosts++; @@ -122,9 +121,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_REALLOC_N(addnhostsfile->hosts[idx].hostnames, addnhostsfile->hosts[idx].nhostnames + 1) < 0) goto error; - if (VIR_STRDUP(addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames], - name) < 0) - goto error; + addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames] = g_strdup(name); VIR_FREE(ipstr); @@ -467,8 +464,7 @@ dnsmasqContextNew(const char *network_name, if (VIR_ALLOC(ctx) < 0) return NULL; - if (VIR_STRDUP(ctx->config_dir, config_dir) < 0) - goto error; + ctx->config_dir = g_strdup(config_dir); if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; @@ -786,8 +782,7 @@ dnsmasqCapsNewEmpty(const char *binaryPath) return NULL; if (!(caps->flags = virBitmapNew(DNSMASQ_CAPS_LAST))) goto error; - if (VIR_STRDUP(caps->binaryPath, binaryPath ? binaryPath : DNSMASQ) < 0) - goto error; + caps->binaryPath = g_strdup(binaryPath ? binaryPath : DNSMASQ); return caps; error: diff --git a/src/util/virerror.c b/src/util/virerror.c index 512b2bc7fe..f0ef7e337c 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -207,14 +207,10 @@ virCopyError(virErrorPtr from, to->code = from->code; to->domain = from->domain; to->level = from->level; - if (VIR_STRDUP_QUIET(to->message, from->message) < 0) - ret = -1; - if (VIR_STRDUP_QUIET(to->str1, from->str1) < 0) - ret = -1; - if (VIR_STRDUP_QUIET(to->str2, from->str2) < 0) - ret = -1; - if (VIR_STRDUP_QUIET(to->str3, from->str3) < 0) - ret = -1; + to->message = g_strdup(from->message); + to->str1 = g_strdup(from->str1); + to->str2 = g_strdup(from->str2); + to->str3 = g_strdup(from->str3); to->int1 = from->int1; to->int2 = from->int2; /* diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 2315b517bd..80773c7c5d 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -62,8 +62,7 @@ virFCReadRportValue(const char *rport, if ((p = strchr(buf, '\n'))) *p = '\0'; - if (VIR_STRDUP(*result, buf) < 0) - return -1; + *result = g_strdup(buf); return 0; } diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 693f1619b3..719185d992 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -1302,17 +1302,15 @@ virFDStreamOpenFileInternal(virStreamPtr st, if ((oflags & O_ACCMODE) == O_RDONLY) { threadData->fdin = fd; threadData->fdout = pipefds[1]; - if (VIR_STRDUP(threadData->fdinname, path) < 0 || - VIR_STRDUP(threadData->fdoutname, "pipe") < 0) - goto error; + threadData->fdinname = g_strdup(path); + threadData->fdoutname = g_strdup("pipe"); tmpfd = pipefds[0]; threadData->doRead = true; } else { threadData->fdin = pipefds[0]; threadData->fdout = fd; - if (VIR_STRDUP(threadData->fdinname, "pipe") < 0 || - VIR_STRDUP(threadData->fdoutname, path) < 0) - goto error; + threadData->fdinname = g_strdup("pipe"); + threadData->fdoutname = g_strdup(path); tmpfd = pipefds[1]; threadData->doRead = false; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 6a26d4838c..c4d544be73 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1578,8 +1578,10 @@ virFileResolveLinkHelper(const char *linkpath, if (lstat(linkpath, &st) < 0) return -1; - if (!S_ISLNK(st.st_mode)) - return VIR_STRDUP_QUIET(*resultpath, linkpath) < 0 ? -1 : 0; + if (!S_ISLNK(st.st_mode)) { + *resultpath = g_strdup(linkpath); + return 0; + } } *resultpath = virFileCanonicalizePath(linkpath); @@ -1684,9 +1686,7 @@ virFindFileInPath(const char *file) origpath = getenv("PATH"); if (!origpath) origpath = "/bin:/usr/bin"; - - if (VIR_STRDUP_QUIET(path, origpath) <= 0) - return NULL; + path = g_strdup(origpath); /* for each path segment, append the file to search for and test for * it. return it if found. @@ -2023,8 +2023,7 @@ virFileGetMountSubtreeImpl(const char *mtabpath, if (VIR_EXPAND_N(mounts, nmounts, nmounts ? 1 : 2) < 0) goto cleanup; - if (VIR_STRDUP(mounts[nmounts - 2], mntent.mnt_dir) < 0) - goto cleanup; + mounts[nmounts - 2] = g_strdup(mntent.mnt_dir); } if (mounts) @@ -3070,10 +3069,7 @@ virFileMakePathWithMode(const char *path, { g_autofree char *tmp = NULL; - if (VIR_STRDUP(tmp, path) < 0) { - errno = ENOMEM; - return -1; - } + tmp = g_strdup(path); return virFileMakePathHelper(tmp, mode); } @@ -3087,10 +3083,7 @@ virFileMakeParentPath(const char *path) VIR_DEBUG("path=%s", path); - if (VIR_STRDUP(tmp, path) < 0) { - errno = ENOMEM; - return -1; - } + tmp = g_strdup(path); if ((p = strrchr(tmp, '/')) == NULL) { errno = EINVAL; @@ -3293,8 +3286,7 @@ int virFileAbsPath(const char *path, char **abspath) { if (path[0] == '/') { - if (VIR_STRDUP(*abspath, path) < 0) - return -1; + *abspath = g_strdup(path); } else { g_autofree char *buf = getcwd(NULL, 0); @@ -3317,8 +3309,7 @@ virFileSanitizePath(const char *path) char *cleanpath; int idx = 0; - if (VIR_STRDUP(cleanpath, path) < 0) - return NULL; + cleanpath = g_strdup(path); /* don't sanitize URIs - rfc3986 states that two slashes may lead to a * different resource, thus removing them would possibly change the path */ @@ -3504,9 +3495,8 @@ virFileIsSharedFixFUSE(const char *path, maxMatching = len; VIR_FREE(mntType); VIR_FREE(mntDir); - if (VIR_STRDUP(mntDir, mb.mnt_dir) < 0 || - VIR_STRDUP(mntType, mb.mnt_type) < 0) - goto cleanup; + mntDir = g_strdup(mb.mnt_dir); + mntType = g_strdup(mb.mnt_type); } } @@ -3540,8 +3530,7 @@ virFileIsSharedFSType(const char *path, int statfs_ret; long long f_type = 0; - if (VIR_STRDUP(dirpath, path) < 0) - return -1; + dirpath = g_strdup(path); statfs_ret = statfs(dirpath, &sb); @@ -3712,8 +3701,7 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, tmp = &fs[nfs - 1]; - if (VIR_STRDUP(tmp->mnt_dir, mb.mnt_dir) < 0) - goto cleanup; + tmp->mnt_dir = g_strdup(mb.mnt_dir); if (virFileGetHugepageSize(tmp->mnt_dir, &tmp->size) < 0) goto cleanup; diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index 3a99dc210b..8ab37bae4a 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -245,11 +245,9 @@ virFileCacheNew(const char *dir, if (!(cache->table = virHashCreate(10, virObjectFreeHashData))) goto cleanup; - if (VIR_STRDUP(cache->dir, dir) < 0) - goto cleanup; + cache->dir = g_strdup(dir); - if (VIR_STRDUP(cache->suffix, suffix) < 0) - goto cleanup; + cache->suffix = g_strdup(suffix); cache->handlers = *handlers; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index c2e88ec382..fc2c7248cb 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -323,8 +323,7 @@ void virFirewallFree(virFirewallPtr firewall) rule->argsLen, 1) < 0) \ goto no_memory; \ \ - if (VIR_STRDUP(rule->args[rule->argsLen++], str) < 0) \ - goto no_memory; \ + rule->args[rule->argsLen++] = g_strdup(str); \ } while (0) static virFirewallRulePtr diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c index b4747bd346..9a0610c647 100644 --- a/src/util/virfirmware.c +++ b/src/util/virfirmware.c @@ -79,9 +79,8 @@ virFirmwareParse(const char *str, virFirmwarePtr firmware) goto cleanup; } - if (VIR_STRDUP(firmware->name, token[0]) < 0 || - VIR_STRDUP(firmware->nvram, token[1]) < 0) - goto cleanup; + firmware->name = g_strdup(token[0]); + firmware->nvram = g_strdup(token[1]); ret = 0; cleanup: @@ -122,9 +121,8 @@ virFirmwareParseList(const char *list, if (VIR_ALLOC(fws[j]) < 0) goto cleanup; - if (VIR_STRDUP(fws[j]->name, token[2 * j]) < 0 || - VIR_STRDUP(fws[j]->nvram, token[2 * j + 1]) < 0) - goto cleanup; + fws[j]->name = g_strdup(token[2 * j]); + fws[j]->nvram = g_strdup(token[2 * j + 1]); } } diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 6b29bb1a73..6633b48805 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -169,8 +169,7 @@ virHostdevManagerNew(void) return NULL; if (privileged) { - if (VIR_STRDUP(hostdevMgr->stateDir, HOSTDEV_STATE_DIR) < 0) - return NULL; + hostdevMgr->stateDir = g_strdup(HOSTDEV_STATE_DIR); if (virFileMakePath(hostdevMgr->stateDir) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 938e2fa6b3..c1dfc1225c 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -268,8 +268,7 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { - if (VIR_STRDUP(meminfo_path, MEMINFO_PATH) < 0) - return -1; + meminfo_path = g_strdup(MEMINFO_PATH); } else { if ((max_node = virNumaGetMaxNode()) < 0) return -1; diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 1b143ec61f..ba90c41763 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -176,8 +176,7 @@ virStorageBackendIQNFound(const char *initiatoriqn, current = next + 1; } - if (VIR_STRDUP(iqn, current) < 0) - goto cleanup; + iqn = g_strdup(current); if (STREQ(iqn, initiatoriqn)) { *ifacename = g_steal_pointer(&iface); @@ -373,8 +372,7 @@ virISCSIGetTargets(char **const groups, struct virISCSITargetList *list = data; g_autofree char *target = NULL; - if (VIR_STRDUP(target, groups[1]) < 0) - return -1; + target = g_strdup(groups[1]); if (VIR_APPEND_ELEMENT(list->targets, list->ntargets, target) < 0) return -1; diff --git a/src/util/virjson.c b/src/util/virjson.c index d3e6c9e41d..eb6207f13f 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -450,10 +450,7 @@ virJSONValueNewString(const char *data) return NULL; val->type = VIR_JSON_TYPE_STRING; - if (VIR_STRDUP(val->data.string, data) < 0) { - VIR_FREE(val); - return NULL; - } + val->data.string = g_strdup(data); return val; } @@ -490,10 +487,7 @@ virJSONValueNewNumber(const char *data) return NULL; val->type = VIR_JSON_TYPE_NUMBER; - if (VIR_STRDUP(val->data.number, data) < 0) { - VIR_FREE(val); - return NULL; - } + val->data.number = g_strdup(data); return val; } @@ -626,8 +620,7 @@ virJSONValueObjectInsert(virJSONValuePtr object, return -1; } - if (VIR_STRDUP(pair.key, key) < 0) - return -1; + pair.key = g_strdup(key); if (prepend) { ret = VIR_INSERT_ELEMENT(object->data.object.pairs, 0, diff --git a/src/util/virlease.c b/src/util/virlease.c index 3d851eb808..e0f81539be 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -221,8 +221,7 @@ virLeaseNew(virJSONValuePtr *lease_ret, return 0; if (exptime_tmp) { - if (VIR_STRDUP(exptime, exptime_tmp) < 0) - return -1; + exptime = g_strdup(exptime_tmp); /* Removed extraneous trailing space in DNSMASQ_LEASE_EXPIRES * (dnsmasq < 2.52) */ diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index d383746183..b0f73c2a8a 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -127,8 +127,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, res->fd = -1; res->flags = flags; - if (VIR_STRDUP(res->name, resname) < 0) - goto error; + res->name = g_strdup(resname); if (!(res->path = virLockSpaceGetResourcePath(lockspace, resname))) goto error; @@ -255,8 +254,7 @@ virLockSpacePtr virLockSpaceNew(const char *directory) return NULL; } - if (VIR_STRDUP(lockspace->dir, directory) < 0) - goto error; + lockspace->dir = g_strdup(directory); if (!(lockspace->resources = virHashCreate(VIR_LOCKSPACE_TABLE_SIZE, virLockSpaceResourceDataFree))) @@ -313,8 +311,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) if (virJSONValueObjectHasKey(object, "directory")) { const char *dir = virJSONValueObjectGetString(object, "directory"); - if (VIR_STRDUP(lockspace->dir, dir) < 0) - goto error; + lockspace->dir = g_strdup(dir); } if (!(resources = virJSONValueObjectGet(object, "resources"))) { @@ -347,10 +344,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) virLockSpaceResourceFree(res); goto error; } - if (VIR_STRDUP(res->name, tmp) < 0) { - virLockSpaceResourceFree(res); - goto error; - } + res->name = g_strdup(tmp); if (!(tmp = virJSONValueObjectGetString(child, "path"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -358,10 +352,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) virLockSpaceResourceFree(res); goto error; } - if (VIR_STRDUP(res->path, tmp) < 0) { - virLockSpaceResourceFree(res); - goto error; - } + res->path = g_strdup(tmp); if (virJSONValueObjectGetNumberInt(child, "fd", &res->fd) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing resource fd in JSON document")); diff --git a/src/util/virlog.c b/src/util/virlog.c index 2ce094f6aa..27843363e7 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -840,8 +840,7 @@ virLogNewOutputToSyslog(virLogPriority priority, * rather than copying @ident, syslog uses caller's reference instead */ VIR_FREE(current_ident); - if (VIR_STRDUP(current_ident, ident) < 0) - return NULL; + current_ident = g_strdup(ident); openlog(current_ident, 0, 0); } @@ -1331,8 +1330,7 @@ virLogOutputNew(virLogOutputFunc f, return NULL; } - if (VIR_STRDUP(ndup, name) < 0) - return NULL; + ndup = g_strdup(name); } if (VIR_ALLOC(ret) < 0) { @@ -1466,10 +1464,7 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) * holding the lock so it's safe to call openlog and change the message * tag */ - if (VIR_STRDUP_QUIET(tmp, outputs[id]->name) < 0) { - virLogUnlock(); - return -1; - } + tmp = g_strdup(outputs[id]->name); VIR_FREE(current_ident); current_ident = tmp; openlog(current_ident, 0, 0); diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7e70ceb658..9f8cb95423 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -271,10 +271,8 @@ virMediatedDeviceSetUsedBy(virMediatedDevicePtr dev, { VIR_FREE(dev->used_by_drvname); VIR_FREE(dev->used_by_domname); - if (VIR_STRDUP(dev->used_by_drvname, drvname) < 0) - return -1; - if (VIR_STRDUP(dev->used_by_domname, domname) < 0) - return -1; + dev->used_by_drvname = g_strdup(drvname); + dev->used_by_domname = g_strdup(domname); return 0; } @@ -509,8 +507,7 @@ virMediatedDeviceTypeReadAttrs(const char *sysfspath, if (VIR_ALLOC(tmp) < 0) return -1; - if (VIR_STRDUP(tmp->id, last_component(sysfspath)) < 0) - return -1; + tmp->id = g_strdup(last_component(sysfspath)); /* @name sysfs attribute is optional, so getting ENOENT is fine */ MDEV_GET_SYSFS_ATTR("name", &tmp->name, virFileReadValueString, true); diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 4c388b6c55..2ccd83d1bb 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -836,14 +836,12 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, if (virtPortProfile && virNetlinkEventServiceIsRunning(NETLINK_ROUTE)) { if (VIR_ALLOC(calld) < 0) goto error; - if (VIR_STRDUP(calld->cr_ifname, ifname) < 0) - goto error; + calld->cr_ifname = g_strdup(ifname); if (VIR_ALLOC(calld->virtPortProfile) < 0) goto error; memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); virMacAddrSet(&calld->macaddress, macaddress); - if (VIR_STRDUP(calld->linkdev, linkdev) < 0) - goto error; + calld->linkdev = g_strdup(linkdev); memcpy(calld->vmuuid, vmuuid, sizeof(calld->vmuuid)); calld->vmOp = vmOp; @@ -1044,11 +1042,9 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, vnet_hdr) < 0) goto disassociate_exit; - if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) - goto disassociate_exit; + *ifnameResult = g_strdup(ifnameCreated); } else { - if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) - goto disassociate_exit; + *ifnameResult = g_strdup(ifnameCreated); } if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE || diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 6e13c0f684..1d2bbf9dd7 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -529,8 +529,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, goto cleanup; } - if (VIR_STRDUP(*ifname, tmpIfname) < 0) - goto cleanup; + *ifname = g_strdup(tmpIfname); ret = 1; cleanup: diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 8ca4626a90..fe4f55f8fc 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -73,7 +73,8 @@ virNetDevTapGetName(int tapfd G_GNUC_UNUSED, char **ifname G_GNUC_UNUSED) return -1; } - return VIR_STRDUP(*ifname, ifr.ifr_name) < 0 ? -1 : 0; + *ifname = g_strdup(ifr.ifr_name); + return 0; #else return -1; #endif @@ -282,8 +283,7 @@ int virNetDevTapCreate(char **ifname, /* In case we are looping more than once, set other * TAPs to have the same name */ VIR_FREE(*ifname); - if (VIR_STRDUP(*ifname, ifr.ifr_name) < 0) - goto cleanup; + *ifname = g_strdup(ifr.ifr_name); } if ((flags & VIR_NETDEV_TAP_CREATE_PERSIST) && diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index b001aea3ec..6442c2a2cf 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1145,10 +1145,7 @@ virNetDevVPortProfileOp8021Qbh(const char *ifname, goto cleanup; } } else { - if (VIR_STRDUP(physfndev, ifname) < 0) { - rc = -1; - goto cleanup; - } + physfndev = g_strdup(ifname); } rc = virNetDevGetIndex(physfndev, &ifindex); diff --git a/src/util/virobject.c b/src/util/virobject.c index c5363308d8..812b013e72 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -188,8 +188,7 @@ virClassNew(virClassPtr parent, _("too many object classes defined")); goto error; } - if (VIR_STRDUP(klass->name, name) < 0) - goto error; + klass->name = g_strdup(name); klass->objectSize = objectSize; klass->dispose = dispose; diff --git a/src/util/virpci.c b/src/util/virpci.c index 59a93a5e81..f9e39e79d8 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -265,8 +265,7 @@ virPCIDeviceGetDriverPathAndName(virPCIDevicePtr dev, char **path, char **name) } /* path = "/sys/bus/pci/drivers/${drivername}" */ - if (VIR_STRDUP(*name, last_component(*path)) < 0) - goto cleanup; + *name = g_strdup(last_component(*path)); /* name = "${drivername}" */ ret = 0; @@ -1435,17 +1434,11 @@ virPCIDeviceCopy(virPCIDevicePtr dev) *copy = *dev; copy->path = NULL; copy->used_by_drvname = copy->used_by_domname = NULL; - if (VIR_STRDUP(copy->name, dev->name) < 0 || - VIR_STRDUP(copy->path, dev->path) < 0 || - VIR_STRDUP(copy->used_by_drvname, dev->used_by_drvname) < 0 || - VIR_STRDUP(copy->used_by_domname, dev->used_by_domname) < 0) { - goto error; - } + copy->name = g_strdup(dev->name); + copy->path = g_strdup(dev->path); + copy->used_by_drvname = g_strdup(dev->used_by_drvname); + copy->used_by_domname = g_strdup(dev->used_by_domname); return copy; - - error: - virPCIDeviceFree(copy); - return NULL; } @@ -1561,10 +1554,8 @@ virPCIDeviceSetUsedBy(virPCIDevicePtr dev, { VIR_FREE(dev->used_by_drvname); VIR_FREE(dev->used_by_domname); - if (VIR_STRDUP(dev->used_by_drvname, drv_name) < 0) - return -1; - if (VIR_STRDUP(dev->used_by_domname, dom_name) < 0) - return -1; + dev->used_by_drvname = g_strdup(drv_name); + dev->used_by_domname = g_strdup(dom_name); return 0; } @@ -2503,8 +2494,7 @@ virPCIGetNetName(const char *device_link_sysfs_path, continue; } - if (VIR_STRDUP(*netname, entry->d_name) < 0) - goto cleanup; + *netname = g_strdup(entry->d_name); ret = 0; break; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 1ffd446f40..494bf9107a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -111,15 +111,9 @@ virPortAllocatorRangeNew(const char *name, range->start = start; range->end = end; - - if (VIR_STRDUP(range->name, name) < 0) - goto error; + range->name = g_strdup(name); return range; - - error: - virPortAllocatorRangeFree(range); - return NULL; } void diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index e52408ed06..29ea52a16f 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2339,8 +2339,7 @@ virResctrlAllocDeterminePath(virResctrlAllocPtr alloc, /* If the allocation is empty, then the path will be SYSFS_RESCTRL_PATH */ if (virResctrlAllocIsEmpty(alloc)) { - if (VIR_STRDUP(alloc->path, SYSFS_RESCTRL_PATH) < 0) - return -1; + alloc->path = g_strdup(SYSFS_RESCTRL_PATH); return 0; } @@ -2563,8 +2562,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitorPtr monitor, if (!virResctrlAllocIsEmpty(monitor->alloc) && STREQ_NULLABLE(monitor->id, monitor->alloc->id)) { - if (VIR_STRDUP(monitor->path, monitor->alloc->path) < 0) - return -1; + monitor->path = g_strdup(monitor->alloc->path); return 0; } diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 1171d3b153..82a677b743 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -170,8 +170,7 @@ virRotatingFileReaderEntryNew(const char *path) entry->inode = sb.st_ino; } - if (VIR_STRDUP(entry->path, path) < 0) - goto error; + entry->path = g_strdup(path); return entry; @@ -243,8 +242,7 @@ virRotatingFileWriterNew(const char *path, if (VIR_ALLOC(file) < 0) goto error; - if (VIR_STRDUP(file->basepath, path) < 0) - goto error; + file->basepath = g_strdup(path); if (maxbackup > VIR_MAX_MAX_BACKUP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -389,8 +387,7 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) for (i = file->maxbackup; i > 0; i--) { if (i == 1) { - if (VIR_STRDUP(thispath, file->basepath) < 0) - goto cleanup; + thispath = g_strdup(file->basepath); } else { if (virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2) < 0) goto cleanup; diff --git a/src/util/virscsi.c b/src/util/virscsi.c index af8692eb5b..705571f8ec 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -277,9 +277,8 @@ virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, if (VIR_ALLOC(copy) < 0) return -1; - if (VIR_STRDUP(copy->drvname, drvname) < 0 || - VIR_STRDUP(copy->domname, domname) < 0) - return -1; + copy->drvname = g_strdup(drvname); + copy->domname = g_strdup(domname); if (VIR_APPEND_ELEMENT(dev->used_by, dev->n_used_by, copy) < 0) return -1; diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 0bcd8902a4..5f523636be 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -205,10 +205,8 @@ virSCSIVHostDeviceSetUsedBy(virSCSIVHostDevicePtr dev, { VIR_FREE(dev->used_by_drvname); VIR_FREE(dev->used_by_domname); - if (VIR_STRDUP(dev->used_by_drvname, drvname) < 0) - return -1; - if (VIR_STRDUP(dev->used_by_domname, domname) < 0) - return -1; + dev->used_by_drvname = g_strdup(drvname); + dev->used_by_domname = g_strdup(domname); return 0; } @@ -256,12 +254,7 @@ virSCSIVHostDeviceNew(const char *name) if (VIR_ALLOC(dev) < 0) return NULL; - if (VIR_STRDUP(dev->name, name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->name buffer overflow: %s"), - name); - return NULL; - } + dev->name = g_strdup(name); if (virAsprintf(&dev->path, "%s/%s", SYSFS_VHOST_SCSI_DEVICES, name) < 0) diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index 02a834223d..a2b5ebf6b7 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -58,12 +58,13 @@ virSecurityLabelDefNew(const char *model) { virSecurityLabelDefPtr seclabel = NULL; - if (VIR_ALLOC(seclabel) < 0 || - VIR_STRDUP(seclabel->model, model) < 0) { + if (VIR_ALLOC(seclabel) < 0) { virSecurityLabelDefFree(seclabel); return NULL; } + seclabel->model = g_strdup(model); + seclabel->relabel = true; return seclabel; @@ -74,12 +75,13 @@ virSecurityDeviceLabelDefNew(const char *model) { virSecurityDeviceLabelDefPtr seclabel = NULL; - if (VIR_ALLOC(seclabel) < 0 || - VIR_STRDUP(seclabel->model, model) < 0) { + if (VIR_ALLOC(seclabel) < 0) { virSecurityDeviceLabelDefFree(seclabel); seclabel = NULL; } + seclabel->model = g_strdup(model); + return seclabel; } @@ -95,13 +97,8 @@ virSecurityDeviceLabelDefCopy(const virSecurityDeviceLabelDef *src) ret->relabel = src->relabel; ret->labelskip = src->labelskip; - if (VIR_STRDUP(ret->model, src->model) < 0 || - VIR_STRDUP(ret->label, src->label) < 0) - goto error; + ret->model = g_strdup(src->model); + ret->label = g_strdup(src->label); return ret; - - error: - virSecurityDeviceLabelDefFree(ret); - return NULL; } diff --git a/src/util/virsecret.c b/src/util/virsecret.c index 7844a76a56..174ce544c0 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -55,8 +55,7 @@ virSecretLookupDefCopy(virSecretLookupTypeDefPtr dst, if (dst->type == VIR_SECRET_LOOKUP_TYPE_UUID) { memcpy(dst->u.uuid, src->u.uuid, VIR_UUID_BUFLEN); } else if (dst->type == VIR_SECRET_LOOKUP_TYPE_USAGE) { - if (VIR_STRDUP(dst->u.usage, src->u.usage) < 0) - return -1; + dst->u.usage = g_strdup(src->u.usage); } return 0; } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 91e2a8d558..efe942b44c 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -481,8 +481,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, separator ? separator : ":") < 0) return NULL; } else { - if (VIR_STRDUP(addrstr, VIR_LOOPBACK_IPV4_ADDR) < 0) - return NULL; + addrstr = g_strdup(VIR_LOOPBACK_IPV4_ADDR); } return addrstr; } @@ -515,8 +514,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, return NULL; } } else { - if (VIR_STRDUP(addrstr, host) < 0) - return NULL; + addrstr = g_strdup(host); } return addrstr; diff --git a/src/util/virstring.c b/src/util/virstring.c index fcae16c8fe..1494eab132 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -102,8 +102,7 @@ virStringSplitCount(const char *string, if (VIR_RESIZE_N(tokens, maxtokens, ntokens, 1) < 0) goto error; - if (VIR_STRDUP(tokens[ntokens], remainder) < 0) - goto error; + tokens[ntokens] = g_strdup(remainder); ntokens++; } @@ -182,10 +181,11 @@ virStringListAdd(char ***strings, { size_t i = virStringListLength((const char **) *strings); - if (VIR_EXPAND_N(*strings, i, 2) < 0 || - VIR_STRDUP((*strings)[i - 2], item) < 0) + if (VIR_EXPAND_N(*strings, i, 2) < 0) return -1; + (*strings)[i - 2] = g_strdup(item); + return 0; } @@ -286,10 +286,8 @@ virStringListCopy(char ***dst, if (VIR_ALLOC_N(copy, virStringListLength(src) + 1) < 0) goto error; - for (i = 0; src[i]; i++) { - if (VIR_STRDUP(copy[i], src[i]) < 0) - goto error; - } + for (i = 0; src[i]; i++) + copy[i] = g_strdup(src[i]); *dst = copy; return 0; diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index af26e0bab9..0a622dbbf9 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -420,8 +420,7 @@ virSysinfoParseARMProcessor(const char *base, virSysinfoDefPtr ret) cur, eol - cur) < 0) goto error; - if (VIR_STRDUP(processor->processor_type, processor_type) < 0) - goto error; + processor->processor_type = g_strdup(processor_type); base = cur; } @@ -558,8 +557,7 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) goto error; processor = &ret->processor[ret->nprocessor - 1]; - if (VIR_STRDUP(processor->processor_manufacturer, manufacturer) < 0) - goto error; + processor->processor_manufacturer = g_strdup(manufacturer); if (!virSysinfoParseS390Delimited(procline, "version", &processor->processor_version, '=', ',') || diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index c2e4c3df51..2ff0341b11 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -308,8 +308,7 @@ int virSystemdCreateMachine(const char *name, if (!(slicename = virSystemdMakeSliceName(partition))) goto cleanup; } else { - if (VIR_STRDUP(slicename, "") < 0) - goto cleanup; + slicename = g_strdup(""); } /* diff --git a/src/util/virtypedparam-public.c b/src/util/virtypedparam-public.c index eaa9f433e7..0ddb618dbf 100644 --- a/src/util/virtypedparam-public.c +++ b/src/util/virtypedparam-public.c @@ -104,8 +104,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, } break; case VIR_TYPED_PARAM_STRING: - if (VIR_STRDUP(param->value.s, val) < 0) - return -1; + param->value.s = g_strdup(val); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -736,8 +735,7 @@ virTypedParamsAddString(virTypedParameterPtr *params, goto error; *maxparams = max; - if (VIR_STRDUP(str, value) < 0) - goto error; + str = g_strdup(value); if (virTypedParameterAssign(*params + n, name, VIR_TYPED_PARAM_STRING, str) < 0) { diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index db440611dc..f50d926860 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -234,8 +234,7 @@ virTypedParameterAssignValueVArgs(virTypedParameterPtr param, break; case VIR_TYPED_PARAM_STRING: if (copystr) { - if (VIR_STRDUP(param->value.s, va_arg(ap, char *)) < 0) - return -1; + param->value.s = g_strdup(va_arg(ap, char *)); } else { param->value.s = va_arg(ap, char *); } @@ -337,8 +336,7 @@ virTypedParamsReplaceString(virTypedParameterPtr *params, param = *params + n - 1; } - if (VIR_STRDUP(str, value) < 0) - goto error; + str = g_strdup(value); if (virTypedParameterAssign(param, name, VIR_TYPED_PARAM_STRING, str) < 0) { @@ -374,11 +372,7 @@ virTypedParamsCopy(virTypedParameterPtr *dst, ignore_value(virStrcpyStatic((*dst)[i].field, src[i].field)); (*dst)[i].type = src[i].type; if (src[i].type == VIR_TYPED_PARAM_STRING) { - if (VIR_STRDUP((*dst)[i].value.s, src[i].value.s) < 0) { - virTypedParamsFree(*dst, i - 1); - *dst = NULL; - return -1; - } + (*dst)[i].value.s = g_strdup(src[i].value.s); } else { (*dst)[i].value = src[i].value; } @@ -613,9 +607,7 @@ virTypedParamsDeserialize(virTypedParameterRemotePtr remote_params, remote_param->value.remote_typed_param_value.b; break; case VIR_TYPED_PARAM_STRING: - if (VIR_STRDUP(param->value.s, - remote_param->value.remote_typed_param_value.s) < 0) - goto cleanup; + param->value.s = g_strdup(remote_param->value.remote_typed_param_value.s); break; default: virReportError(VIR_ERR_RPC, _("unknown parameter type: %d"), @@ -699,8 +691,7 @@ virTypedParamsSerialize(virTypedParameterPtr params, /* This will be either freed by virNetServerDispatchCall or call(), * depending on the calling side, i.e. server or client */ - if (VIR_STRDUP(val->field, param->field) < 0) - goto cleanup; + val->field = g_strdup(param->field); val->value.type = param->type; switch (param->type) { case VIR_TYPED_PARAM_INT: @@ -722,8 +713,7 @@ virTypedParamsSerialize(virTypedParameterPtr params, val->value.remote_typed_param_value.b = param->value.b; break; case VIR_TYPED_PARAM_STRING: - if (VIR_STRDUP(val->value.remote_typed_param_value.s, param->value.s) < 0) - goto cleanup; + val->value.remote_typed_param_value.s = g_strdup(param->value.s); break; default: virReportError(VIR_ERR_RPC, _("unknown parameter type: %d"), diff --git a/src/util/viruri.c b/src/util/viruri.c index af2e828c28..3532fa5576 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -41,8 +41,8 @@ virURIParamAppend(virURIPtr uri, char *pname = NULL; char *pvalue = NULL; - if (VIR_STRDUP(pname, name) < 0 || VIR_STRDUP(pvalue, value) < 0) - goto error; + pname = g_strdup(name); + pvalue = g_strdup(value); if (VIR_RESIZE_N(uri->params, uri->paramsAlloc, uri->paramsCount, 1) < 0) goto error; @@ -167,10 +167,8 @@ virURIParse(const char *uri) if (VIR_ALLOC(ret) < 0) goto error; - if (VIR_STRDUP(ret->scheme, xmluri->scheme) < 0) - goto error; - if (VIR_STRDUP(ret->server, xmluri->server) < 0) - goto error; + ret->scheme = g_strdup(xmluri->scheme); + ret->server = g_strdup(xmluri->server); /* xmluri->port value is not defined if server was * not given. Modern versions libxml2 fill port * differently to old versions in this case, so @@ -181,14 +179,10 @@ virURIParse(const char *uri) ret->port = 0; else ret->port = xmluri->port; - if (VIR_STRDUP(ret->path, xmluri->path) < 0) - goto error; - if (VIR_STRDUP(ret->query, xmluri->query_raw) < 0) - goto error; - if (VIR_STRDUP(ret->fragment, xmluri->fragment) < 0) - goto error; - if (VIR_STRDUP(ret->user, xmluri->user) < 0) - goto error; + ret->path = g_strdup(xmluri->path); + ret->query = g_strdup(xmluri->query_raw); + ret->fragment = g_strdup(xmluri->fragment); + ret->user = g_strdup(xmluri->user); /* Strip square bracket from an IPv6 address. * The function modifies the string in-place. Even after such diff --git a/src/util/virusb.c b/src/util/virusb.c index 036a7caf79..5a9f369ac1 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -379,10 +379,8 @@ virUSBDeviceSetUsedBy(virUSBDevicePtr dev, { VIR_FREE(dev->used_by_drvname); VIR_FREE(dev->used_by_domname); - if (VIR_STRDUP(dev->used_by_drvname, drv_name) < 0) - return -1; - if (VIR_STRDUP(dev->used_by_domname, dom_name) < 0) - return -1; + dev->used_by_drvname = g_strdup(drv_name); + dev->used_by_domname = g_strdup(dom_name); return 0; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 63071e2fa6..f2528e257c 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -646,14 +646,14 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo goto cleanup; } - if (name && VIR_STRDUP(*name, pw->pw_name) < 0) - goto cleanup; + if (name) + *name = g_strdup(pw->pw_name); if (group) *group = pw->pw_gid; - if (dir && VIR_STRDUP(*dir, pw->pw_dir) < 0) - goto cleanup; - if (shell && VIR_STRDUP(*shell, pw->pw_shell) < 0) - goto cleanup; + if (dir) + *dir = g_strdup(pw->pw_dir); + if (shell) + *shell = g_strdup(pw->pw_shell); ret = 0; cleanup: @@ -1094,8 +1094,8 @@ virGetWin32SpecialFolder(int csidl, char **path) *path = NULL; if (SHGetSpecialFolderLocation(NULL, csidl, &pidl) == S_OK) { - if (SHGetPathFromIDList(pidl, buf) && VIR_STRDUP(*path, buf) < 0) - ret = -1; + if (SHGetPathFromIDList(pidl, buf)) + *path = g_strdup(buf); CoTaskMemFree(pidl); } return ret; @@ -1123,7 +1123,8 @@ virGetWin32DirectoryRoot(char **path) strcpy(windowsdir, "C:\\"); } - return VIR_STRDUP(*path, windowsdir) < 0 ? -1 : 0; + *path = g_strdup(windowsdir); + return 0; } @@ -1159,8 +1160,7 @@ virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) /* USERPROFILE is probably the closest equivalent to $HOME? */ dir = getenv("USERPROFILE"); - if (VIR_STRDUP(ret, dir) < 0) - return NULL; + ret = g_strdup(dir); if (!ret && virGetWin32SpecialFolder(CSIDL_PROFILE, &ret) < 0) @@ -1687,8 +1687,7 @@ virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) char *owner = NULL; char *group = NULL; - if (VIR_STRDUP(tmp_label, label) < 0) - goto cleanup; + tmp_label = g_strdup(label); /* Split label */ sep = strchr(tmp_label, ':'); diff --git a/src/util/virxml.c b/src/util/virxml.c index 209c83b6cc..f4c9bc89e5 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1260,8 +1260,7 @@ virXMLValidatorInit(const char *schemafile) if (VIR_ALLOC(validator) < 0) return NULL; - if (VIR_STRDUP(validator->schemafile, schemafile) < 0) - goto error; + validator->schemafile = g_strdup(schemafile); if (!(validator->rngParser = xmlRelaxNGNewParserCtxt(validator->schemafile))) { -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- tests/bhyvexml2argvmock.c | 6 +-- tests/commandtest.c | 5 +-- tests/cputest.c | 4 +- tests/domaincapstest.c | 13 +++--- tests/nssmock.c | 3 +- tests/openvzutilstest.c | 5 ++- tests/qemublocktest.c | 3 +- tests/qemudomaincheckpointxml2xmltest.c | 9 ++-- tests/qemufirmwaretest.c | 3 +- tests/qemuhotplugtest.c | 8 +--- tests/qemumemlocktest.c | 5 +-- tests/qemumonitorjsontest.c | 3 +- tests/qemumonitortestutils.c | 32 ++++++-------- tests/qemusecuritymock.c | 6 +-- tests/qemuvhostusertest.c | 3 +- tests/qemuxml2argvtest.c | 55 ++++++++----------------- tests/qemuxml2xmltest.c | 5 +-- tests/scsihosttest.c | 5 +-- tests/securityselinuxlabeltest.c | 8 +--- tests/securityselinuxtest.c | 13 +++--- tests/storagebackendsheepdogtest.c | 6 +-- tests/testutils.c | 3 +- tests/testutilsqemu.c | 31 +++++--------- tests/vboxsnapshotxmltest.c | 4 +- tests/viralloctest.c | 3 +- tests/vircgrouptest.c | 5 +-- tests/virfilecachetest.c | 7 +--- tests/virfirewalltest.c | 8 ++-- tests/virhostdevtest.c | 8 +--- tests/virnetmessagetest.c | 11 ++--- tests/virpcimock.c | 19 +++++---- tests/virpcitest.c | 5 +-- tests/virscsitest.c | 5 +-- tests/virstoragetest.c | 6 +-- tests/virstringtest.c | 9 ++-- tests/virtestmock.c | 3 +- tests/virusbmock.c | 4 +- tests/vmx2xmltest.c | 3 +- tests/xml2vmxtest.c | 3 +- 39 files changed, 115 insertions(+), 222 deletions(-) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 717ceb4847..b0d38187f9 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -34,8 +34,7 @@ int virNetDevTapCreateInBridgePort(const char *brname G_GNUC_UNUSED, unsigned int fakeflags G_GNUC_UNUSED) { VIR_FREE(*ifname); - if (VIR_STRDUP(*ifname, "vnet0") < 0) - return -1; + *ifname = g_strdup("vnet0"); return 0; } @@ -43,8 +42,7 @@ char *virNetDevTapGetRealDeviceName(char *name G_GNUC_UNUSED) { char *fakename; - if (VIR_STRDUP(fakename, "faketapdev") < 0) - return NULL; + fakename = g_strdup("faketapdev"); return fakename; } diff --git a/tests/commandtest.c b/tests/commandtest.c index e79baa2946..6ff2039ab1 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -686,10 +686,7 @@ static int test17(const void *unused G_GNUC_UNUSED) goto cleanup; } VIR_FREE(outbuf); - if (VIR_STRDUP(outbuf, "should not be leaked") < 0) { - puts("test framework failure"); - goto cleanup; - } + outbuf = g_strdup("should not be leaked"); virCommandSetErrorBuffer(cmd, &errbuf); if (errbuf != NULL) { diff --git a/tests/cputest.c b/tests/cputest.c index ab68c3b4af..83b494857f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -492,9 +492,11 @@ cpuTestMakeQEMUCaps(const struct data *data) if (!(testMon = qemuMonitorTestNewFromFile(json, driver.xmlopt, true))) goto error; - if (VIR_ALLOC(cpu) < 0 || VIR_STRDUP(cpu->model, "host") < 0) + if (VIR_ALLOC(cpu) < 0) goto cleanup; + cpu->model = g_strdup("host"); + if (ARCH_IS_S390(data->arch)) fail_no_props = false; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 07bc99cc03..61bc019671 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -36,11 +36,11 @@ fillStringValues(virDomainCapsStringValuesPtr values, ...) va_start(list, values); while ((str = va_arg(list, const char *))) { - if (VIR_REALLOC_N(values->values, values->nvalues + 1) < 0 || - VIR_STRDUP(values->values[values->nvalues], str) < 0) { + if (VIR_REALLOC_N(values->values, values->nvalues + 1) < 0) { ret = -1; break; } + values->values[values->nvalues] = g_strdup(str); values->nvalues++; } va_end(list); @@ -95,9 +95,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, if (machine) { VIR_FREE(domCaps->machine); - if (VIR_STRDUP(domCaps->machine, - virQEMUCapsGetCanonicalMachine(qemuCaps, machine)) < 0) - goto cleanup; + domCaps->machine = g_strdup(virQEMUCapsGetCanonicalMachine(qemuCaps, machine)); } if (!domCaps->machine) @@ -153,9 +151,8 @@ fillXenCaps(virDomainCapsPtr domCaps) if (VIR_ALLOC(firmwares[0]) < 0 || VIR_ALLOC(firmwares[1]) < 0) goto cleanup; - if (VIR_STRDUP(firmwares[0]->name, "/usr/lib/xen/boot/hvmloader") < 0 || - VIR_STRDUP(firmwares[1]->name, "/usr/lib/xen/boot/ovmf.bin") < 0) - goto cleanup; + firmwares[0]->name = g_strdup("/usr/lib/xen/boot/hvmloader"); + firmwares[1]->name = g_strdup("/usr/lib/xen/boot/ovmf.bin"); if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0) goto cleanup; diff --git a/tests/nssmock.c b/tests/nssmock.c index 230044275a..ea4b26ffab 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -62,8 +62,7 @@ getrealpath(char **newpath, return -1; } } else { - if (VIR_STRDUP_QUIET(*newpath, path) < 0) - return -1; + *newpath = g_strdup(path); } return 0; diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 1fcd4d2caa..c15ce9a47b 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -99,10 +99,11 @@ testReadNetworkConf(const void *data G_GNUC_UNUSED) " </devices>\n" "</domain>\n"; - if (!(def = virDomainDefNew()) || - VIR_STRDUP(def->os.init, "/sbin/init") < 0) + if (!(def = virDomainDefNew())) goto cleanup; + def->os.init = g_strdup("/sbin/init"); + def->virtType = VIR_DOMAIN_VIRT_OPENVZ; def->os.type = VIR_DOMAIN_OSTYPE_EXE; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0f073682ca..a8d2f57c6e 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -161,8 +161,7 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr src) return -1; srcpriv->secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; - if (VIR_STRDUP(srcpriv->secinfo->s.aes.username, src->auth->username) < 0) - return -1; + srcpriv->secinfo->s.aes.username = g_strdup(src->auth->username); if (virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", NULLSTR(src->nodestorage)) < 0) diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index f6eb1f69b2..4540f15ddd 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -63,8 +63,7 @@ testCompareXMLToXMLFiles(const char *inxml, if (flags & TEST_PARENT) { if (def->parent.parent_name) return -1; - if (VIR_STRDUP(def->parent.parent_name, "1525111885") < 0) - return -1; + def->parent.parent_name = g_strdup("1525111885"); } if (flags & TEST_VDA_BITMAP) { virDomainCheckpointDiskDefPtr disk; @@ -76,13 +75,11 @@ testCompareXMLToXMLFiles(const char *inxml, return -1; if (!disk->name) { disk->type = VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP; - if (VIR_STRDUP(disk->name, "vda") < 0) - return -1; + disk->name = g_strdup("vda"); } else if (STRNEQ(disk->name, "vda")) { return -1; } - if (VIR_STRDUP(disk->bitmap, def->parent.name) < 0) - return -1; + disk->bitmap = g_strdup(def->parent.name); } if (flags & TEST_SIZE) { def->disks[0].size = 1048576; diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 9287ea554b..ad7ed7a384 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -70,8 +70,7 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) }; const size_t nexpected = G_N_ELEMENTS(expected); - if (VIR_STRDUP(fakehome, abs_srcdir "/qemufirmwaredata/home/user/.config") < 0) - return -1; + fakehome = g_strdup(abs_srcdir "/qemufirmwaredata/home/user/.config"); setenv("XDG_CONFIG_HOME", fakehome, 1); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index d3da08875a..4ff2b38c83 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -597,10 +597,7 @@ mymain(void) struct testQemuHotplugCpuParams cpudata; char *fakerootdir; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); @@ -622,8 +619,7 @@ mymain(void) VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); /* some dummy values from 'config file' */ - if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) - return EXIT_FAILURE; + driver.config->spicePassword = g_strdup("123456"); if (!(driver.domainEventState = virObjectEventStateNew())) return EXIT_FAILURE; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index c9484ac9cb..490e2ef11f 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -61,10 +61,7 @@ mymain(void) char *fakerootdir; virQEMUCapsPtr qemuCaps = NULL; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f754e4d94b..c0eee921cf 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2165,8 +2165,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *opaque) return -1; expectedInfo = (virDomainBlockIoTuneInfo) {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, NULL, 15, 16, 17, 18, 19, 20}; - if (VIR_STRDUP(expectedInfo.group_name, "group14") < 0) - return -1; + expectedInfo.group_name = g_strdup("group14"); if (qemuMonitorTestAddItem(test, "query-block", queryBlockReply) < 0 || qemuMonitorTestAddItemParams(test, "block_set_io_throttle", diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 6b3aa97e39..fb76bf185d 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -604,11 +604,8 @@ qemuMonitorTestAddItem(qemuMonitorTestPtr test, if (VIR_ALLOC(data) < 0) return -1; - if (VIR_STRDUP(data->command_name, command_name) < 0 || - VIR_STRDUP(data->response, response) < 0) { - qemuMonitorTestHandlerDataFree(data); - return -1; - } + data->command_name = g_strdup(command_name); + data->response = g_strdup(response); return qemuMonitorTestAddHandler(test, qemuMonitorTestProcessCommandDefault, @@ -692,9 +689,8 @@ qemuMonitorTestAddItemVerbatim(qemuMonitorTestPtr test, if (VIR_ALLOC(data) < 0) return -1; - if (VIR_STRDUP(data->response, response) < 0 || - VIR_STRDUP(data->cmderr, cmderr) < 0) - goto error; + data->response = g_strdup(response); + data->cmderr = g_strdup(cmderr); data->command_name = virJSONStringReformat(command, false); if (!data->command_name) @@ -868,9 +864,8 @@ qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, if (VIR_ALLOC(data) < 0) goto error; - if (VIR_STRDUP(data->command_name, cmdname) < 0 || - VIR_STRDUP(data->response, response) < 0) - goto error; + data->command_name = g_strdup(cmdname); + data->response = g_strdup(response); while ((argname = va_arg(args, char *))) { size_t i; @@ -885,9 +880,8 @@ qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, if (VIR_EXPAND_N(data->args, data->nargs, 1)) goto error; - if (VIR_STRDUP(data->args[i].argname, argname) < 0 || - VIR_STRDUP(data->args[i].argval, argval) < 0) - goto error; + data->args[i].argname = g_strdup(argname); + data->args[i].argval = g_strdup(argval); } va_end(args); @@ -984,10 +978,9 @@ qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test, if (VIR_ALLOC(data) < 0) goto error; - if (VIR_STRDUP(data->command_name, cmdname) < 0 || - VIR_STRDUP(data->response, response) < 0 || - VIR_STRDUP(data->expectArgs, cmdargs) < 0) - goto error; + data->command_name = g_strdup(cmdname); + data->response = g_strdup(response); + data->expectArgs = g_strdup(cmdargs); if (apostrophe) { char *tmp = data->expectArgs; @@ -1065,8 +1058,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, return NULL; } - if (VIR_STRDUP(tmpdir_template, "/tmp/libvirt_XXXXXX") < 0) - goto error; + tmpdir_template = g_strdup("/tmp/libvirt_XXXXXX"); if (!(test->tmpdir = mkdtemp(tmpdir_template))) { virReportSystemError(errno, "%s", diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 8b857b0cc1..50435bbd02 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -146,8 +146,7 @@ virFileGetXAttrQuiet(const char *path, goto cleanup; } - if (VIR_STRDUP(*value, val) < 0) - goto cleanup; + *value = g_strdup(val); ret = 0; cleanup: @@ -194,8 +193,7 @@ int virFileSetXAttr(const char *path, char *val; key = get_key(path, name); - if (VIR_STRDUP(val, value) < 0) - return -1; + val = g_strdup(value); virMutexLock(&m); init_syms(); diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 0ee96d9ecc..3e1890a88f 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -68,8 +68,7 @@ testVUPrecedence(const void *opaque G_GNUC_UNUSED) }; const size_t nexpected = G_N_ELEMENTS(expected); - if (VIR_STRDUP(fakehome, abs_srcdir "/qemuvhostuserdata/home/user/.config") < 0) - return -1; + fakehome = g_strdup(abs_srcdir "/qemuvhostuserdata/home/user/.config"); setenv("XDG_CONFIG_HOME", fakehome, 1); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7bbc44451d..122e14b071 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -43,8 +43,7 @@ fakeSecretGetValue(virSecretPtr obj G_GNUC_UNUSED, unsigned int internalFlags G_GNUC_UNUSED) { char *secret; - if (VIR_STRDUP(secret, "AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A") < 0) - return NULL; + secret = g_strdup("AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A"); *value_size = strlen(secret); return (unsigned char *) secret; } @@ -517,9 +516,7 @@ testCompareXMLToArgv(const void *data) switch (vm->def->tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: VIR_FREE(vm->def->tpm->data.emulator.source.data.file.path); - if (VIR_STRDUP(vm->def->tpm->data.emulator.source.data.file.path, - "/dev/test") < 0) - goto cleanup; + vm->def->tpm->data.emulator.source.data.file.path = g_strdup("/dev/test"); vm->def->tpm->data.emulator.source.type = VIR_DOMAIN_CHR_TYPE_FILE; break; case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: @@ -620,10 +617,7 @@ mymain(void) char *fakerootdir; virHashTablePtr capslatest = NULL; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); @@ -648,43 +642,33 @@ mymain(void) driver.privileged = true; VIR_FREE(driver.config->defaultTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->defaultTLSx509certdir, "/etc/pki/qemu") < 0) - return EXIT_FAILURE; + driver.config->defaultTLSx509certdir = g_strdup("/etc/pki/qemu"); VIR_FREE(driver.config->vncTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->vncTLSx509certdir, "/etc/pki/libvirt-vnc") < 0) - return EXIT_FAILURE; + driver.config->vncTLSx509certdir = g_strdup("/etc/pki/libvirt-vnc"); VIR_FREE(driver.config->spiceTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->spiceTLSx509certdir, "/etc/pki/libvirt-spice") < 0) - return EXIT_FAILURE; + driver.config->spiceTLSx509certdir = g_strdup("/etc/pki/libvirt-spice"); VIR_FREE(driver.config->chardevTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0) - return EXIT_FAILURE; + driver.config->chardevTLSx509certdir = g_strdup("/etc/pki/libvirt-chardev"); VIR_FREE(driver.config->vxhsTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->vxhsTLSx509certdir, "/etc/pki/libvirt-vxhs/dummy,path") < 0) - return EXIT_FAILURE; + driver.config->vxhsTLSx509certdir = g_strdup("/etc/pki/libvirt-vxhs/dummy,path"); VIR_FREE(driver.config->nbdTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->nbdTLSx509certdir, "/etc/pki/libvirt-nbd/dummy,path") < 0) - return EXIT_FAILURE; + driver.config->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd/dummy,path"); VIR_FREE(driver.config->hugetlbfs); if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0) return EXIT_FAILURE; driver.config->nhugetlbfs = 2; - if (VIR_STRDUP(driver.config->hugetlbfs[0].mnt_dir, "/dev/hugepages2M") < 0 || - VIR_STRDUP(driver.config->hugetlbfs[1].mnt_dir, "/dev/hugepages1G") < 0) - return EXIT_FAILURE; + driver.config->hugetlbfs[0].mnt_dir = g_strdup("/dev/hugepages2M"); + driver.config->hugetlbfs[1].mnt_dir = g_strdup("/dev/hugepages1G"); driver.config->hugetlbfs[0].size = 2048; driver.config->hugetlbfs[0].deflt = true; driver.config->hugetlbfs[1].size = 1048576; driver.config->spiceTLS = 1; - if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) - return EXIT_FAILURE; + driver.config->spicePassword = g_strdup("123456"); VIR_FREE(driver.config->memoryBackingDir); - if (VIR_STRDUP_QUIET(driver.config->memoryBackingDir, "/var/lib/libvirt/qemu/ram") < 0) - return EXIT_FAILURE; + driver.config->memoryBackingDir = g_strdup("/var/lib/libvirt/qemu/ram"); VIR_FREE(driver.config->nvramDir); - if (VIR_STRDUP(driver.config->nvramDir, "/var/lib/libvirt/qemu/nvram") < 0) - return EXIT_FAILURE; + driver.config->nvramDir = g_strdup("/var/lib/libvirt/qemu/nvram"); capslatest = testQemuGetLatestCaps(); if (!capslatest) @@ -1222,9 +1206,7 @@ mymain(void) DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0"); DO_TEST_CAPS_LATEST("graphics-vnc-tls"); - if (VIR_STRDUP_QUIET(driver.config->vncTLSx509secretUUID, - "6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea") < 0) - return EXIT_FAILURE; + driver.config->vncTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); DO_TEST_CAPS_LATEST("graphics-vnc-tls-secret"); VIR_FREE(driver.config->vncTLSx509secretUUID); driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0; @@ -1407,11 +1389,8 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); VIR_FREE(driver.config->chardevTLSx509certdir); - if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0) - return EXIT_FAILURE; - if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509secretUUID, - "6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea") < 0) - return EXIT_FAILURE; + driver.config->chardevTLSx509certdir = g_strdup("/etc/pki/libvirt-chardev"); + driver.config->chardevTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); DO_TEST("serial-tcp-tlsx509-secret-chardev", QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_DEVICE_ISA_SERIAL, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4c7ba98367..e7c029a74d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -157,10 +157,7 @@ mymain(void) if (!capslatest) return EXIT_FAILURE; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index c1a7e2d603..35c7d93376 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -253,10 +253,7 @@ mymain(void) char *fakerootdir = NULL; char *fakesysfsdir = NULL; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 6f9b5c0e70..9156403c51 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -144,10 +144,7 @@ testSELinuxLoadFileList(const char *testname, abs_builddir, line) < 0) goto cleanup; if (*tmp != '\0' && *tmp != '\n') { - if (VIR_STRDUP(context, tmp) < 0) { - VIR_FREE(file); - goto cleanup; - } + context = g_strdup(tmp); tmp = strchr(context, '\n'); if (tmp) @@ -270,8 +267,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) if (errno == ENODATA) { /* nothing to do */ } else if (errno == EOPNOTSUPP) { - if (VIR_STRDUP(ctx, "EOPNOTSUPP") < 0) - return -1; + ctx = g_strdup("EOPNOTSUPP"); } else { virReportSystemError(errno, "Cannot read label on %s", diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 5dccb708d8..6c8314de6b 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -77,17 +77,14 @@ testBuildDomainDef(bool dynamic, if (VIR_ALLOC(secdef) < 0) goto error; - if (VIR_STRDUP(secdef->model, "selinux") < 0) - goto error; + secdef->model = g_strdup("selinux"); secdef->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC; - if (label && - VIR_STRDUP(secdef->label, label) < 0) - goto error; + if (label) + secdef->label = g_strdup(label); - if (baselabel && - VIR_STRDUP(secdef->baselabel, baselabel) < 0) - goto error; + if (baselabel) + secdef->baselabel = g_strdup(baselabel); def->seclabels[0] = secdef; def->nseclabels++; diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 6504881920..a5403e7136 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -63,8 +63,7 @@ test_node_info_parser(const void *opaque) if (!(pool = virStoragePoolDefParseFile(data->poolxml))) return -1; - if (VIR_STRDUP(output, test.output) < 0) - return -1; + output = g_strdup(test.output); if (virStorageBackendSheepdogParseNodeInfo(pool, output) != test.expected_return) @@ -95,8 +94,7 @@ test_vdi_list_parser(const void *opaque) if (!(vol = virStorageVolDefParseFile(pool, data->volxml, 0))) return -1; - if (VIR_STRDUP(output, test.output) < 0) - return -1; + output = g_strdup(test.output); if (virStorageBackendSheepdogParseVdiList(vol, output) != test.expected_return) diff --git a/tests/testutils.c b/tests/testutils.c index 1c89d503d9..a141abc91b 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -816,8 +816,7 @@ virTestSetEnvPath(void) virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0) goto cleanup; } else { - if (VIR_STRDUP(new_path, abs_builddir) < 0) - goto cleanup; + new_path = g_strdup(abs_builddir); } if (new_path && diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e6eca5cb2e..0faa9cb84a 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -74,8 +74,7 @@ static virCapsGuestMachinePtr *testQemuAllocNewerMachines(int *nmachines) "pc-0.11", "pc", "pc-0.10", "isapc" }; - if (VIR_STRDUP(canonical, x86_machines[0]) < 0) - return NULL; + canonical = g_strdup(x86_machines[0]); machines = virCapabilitiesAllocMachines(x86_machines, G_N_ELEMENTS(x86_machines)); @@ -503,9 +502,8 @@ virCapsPtr testQemuCapsInit(void) goto cleanup; caps->host.nsecModels = 1; - if (VIR_STRDUP(caps->host.secModels[0].model, "none") < 0 || - VIR_STRDUP(caps->host.secModels[0].doi, "0") < 0) - goto cleanup; + caps->host.secModels[0].model = g_strdup("none"); + caps->host.secModels[0].doi = g_strdup("0"); if (!(cpuDefault = virCPUDefCopy(&cpuDefaultData)) || !(cpuHaswell = virCPUDefCopy(&cpuHaswellData)) || @@ -710,29 +708,22 @@ int qemuTestDriverInit(virQEMUDriver *driver) /* Overwrite some default paths so it's consistent for tests. */ VIR_FREE(driver->config->libDir); VIR_FREE(driver->config->channelTargetDir); - if (VIR_STRDUP(driver->config->libDir, "/tmp/lib") < 0 || - VIR_STRDUP(driver->config->channelTargetDir, "/tmp/channel") < 0) - goto error; + driver->config->libDir = g_strdup("/tmp/lib"); + driver->config->channelTargetDir = g_strdup("/tmp/channel"); if (!mkdtemp(statedir)) { virFilePrintf(stderr, "Cannot create fake stateDir"); goto error; } - if (VIR_STRDUP(driver->config->stateDir, statedir) < 0) { - rmdir(statedir); - goto error; - } + driver->config->stateDir = g_strdup(statedir); if (!mkdtemp(configdir)) { virFilePrintf(stderr, "Cannot create fake configDir"); goto error; } - if (VIR_STRDUP(driver->config->configDir, configdir) < 0) { - rmdir(configdir); - goto error; - } + driver->config->configDir = g_strdup(configdir); driver->caps = testQemuCapsInit(); if (!driver->caps) @@ -827,10 +818,9 @@ testQemuGetLatestCapsForArch(const char *arch, while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { VIR_FREE(tmp); - if ((rc = VIR_STRDUP(tmp, STRSKIP(ent->d_name, "caps_"))) < 0) - goto cleanup; + tmp = g_strdup(STRSKIP(ent->d_name, "caps_")); - if (rc == 0) + if (!tmp) continue; if (!virStringStripSuffix(tmp, fullsuffix)) @@ -1051,8 +1041,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info, bool stripmachinealiases = false; if (STREQ(capsver, "latest")) { - if (VIR_STRDUP(capsfile, virHashLookup(capslatest, capsarch)) < 0) - goto cleanup; + capsfile = g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases = true; } else if (virAsprintf(&capsfile, "%s/caps_%s.%s.xml", TEST_QEMU_CAPS_PATH, capsver, capsarch) < 0) { diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index c70d7ab100..3d6171e266 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -58,9 +58,7 @@ testCompareXMLtoXMLFiles(const char *xml) int ret = -1; virVBoxSnapshotConfMachinePtr machine = NULL; - if (VIR_STRDUP(pathResult, - abs_builddir "/vboxsnapshotxmldata/testResult.vbox") < 0) - return -1; + pathResult = g_strdup(abs_builddir "/vboxsnapshotxmldata/testResult.vbox"); if (virFileMakePath(abs_builddir "/vboxsnapshotxmldata") < 0) goto cleanup; diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 75e639675b..c52483998b 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -409,8 +409,7 @@ testDispose(const void *opaque G_GNUC_UNUSED) VIR_DISPOSE_N(nums, nnums); - if (VIR_STRDUP(str, "test") < 0) - return -1; + str = g_strdup("test"); VIR_DISPOSE_STRING(str); diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index cecb15ae5b..cec07580ac 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -992,10 +992,7 @@ initFakeFS(const char *mode, { char *fakerootdir; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index e3c6401934..6d280b3bec 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -71,14 +71,9 @@ testFileCacheObjNew(const char *data) if (!(obj = virObjectNew(testFileCacheObjClass))) return NULL; - if (VIR_STRDUP(obj->data, data) < 0) - goto error; + obj->data = g_strdup(data); return obj; - - error: - virObjectUnref(obj); - return NULL; } diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 824e9f46c2..a5323a4256 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -961,19 +961,17 @@ testFirewallQueryHook(const char *const*args, const char *input G_GNUC_UNUSED, char **output, char **error G_GNUC_UNUSED, - int *status, + int *status G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-L")) { - if (VIR_STRDUP(*output, TEST_FILTER_TABLE_LIST) < 0) - *status = 127; + *output = g_strdup(TEST_FILTER_TABLE_LIST); } else if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-t") && STREQ(args[2], "nat") && STREQ(args[3], "-L")) { - if (VIR_STRDUP(*output, TEST_NAT_TABLE_LIST) < 0) - *status = 127; + *output = g_strdup(TEST_NAT_TABLE_LIST); } } diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 8e21d3eae4..1f3f730433 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -117,8 +117,7 @@ myInit(void) goto cleanup; if ((mgr->activeSCSIHostdevs = virSCSIDeviceListNew()) == NULL) goto cleanup; - if (VIR_STRDUP(mgr->stateDir, TEST_STATE_DIR) < 0) - goto cleanup; + mgr->stateDir = g_strdup(TEST_STATE_DIR); if (virFileMakePath(mgr->stateDir) < 0) goto cleanup; @@ -501,10 +500,7 @@ mymain(void) int ret = 0; g_autofree char *fakerootdir = NULL; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { fprintf(stderr, "Cannot create fakerootdir"); diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 53544abbdb..b0a01e8b9d 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -228,15 +228,16 @@ static int testMessagePayloadEncode(const void *args G_GNUC_UNUSED) err.level = VIR_ERR_ERROR; if (VIR_ALLOC(err.message) < 0 || - VIR_STRDUP(*err.message, "Hello World") < 0 || VIR_ALLOC(err.str1) < 0 || - VIR_STRDUP(*err.str1, "One") < 0 || VIR_ALLOC(err.str2) < 0 || - VIR_STRDUP(*err.str2, "Two") < 0 || - VIR_ALLOC(err.str3) < 0 || - VIR_STRDUP(*err.str3, "Three") < 0) + VIR_ALLOC(err.str3) < 0) goto cleanup; + *err.message = g_strdup("Hello World"); + *err.str1 = g_strdup("One"); + *err.str2 = g_strdup("Two"); + *err.str3 = g_strdup("Three"); + err.int1 = 1; err.int2 = 2; diff --git a/tests/virpcimock.c b/tests/virpcimock.c index ba4256e2fb..d7dc0b00f0 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -289,8 +289,7 @@ getrealpath(char **newpath, return -1; } } else { - if (VIR_STRDUP_QUIET(*newpath, path) < 0) - return -1; + *newpath = g_strdup(path); } return 0; @@ -324,12 +323,12 @@ add_fd(int fd, const char *path) fd, path, cb.fd, cb.path); } - if (VIR_REALLOC_N_QUIET(callbacks, nCallbacks + 1) < 0 || - VIR_STRDUP_QUIET(callbacks[nCallbacks].path, path) < 0) { + if (VIR_REALLOC_N_QUIET(callbacks, nCallbacks + 1) < 0) { errno = ENOMEM; goto cleanup; } + callbacks[nCallbacks].path = g_strdup(path); callbacks[nCallbacks++].fd = fd; ret = 0; cleanup: @@ -477,10 +476,11 @@ pci_device_new_from_stub(const struct pciDevice *data) struct stat sb; bool configSrcExists = false; - if (!(devid = pci_address_format(&data->addr)) || - VIR_STRDUP_QUIET(id, devid) < 0) + if (!(devid = pci_address_format(&data->addr))) ABORT_OOM(); + id = g_strdup(devid); + /* Replace ':' with '-' to create the config filename from the * device ID. The device ID cannot be used directly as filename * because it contains ':' and Windows does not allow ':' in @@ -724,9 +724,10 @@ pci_driver_new(const char *name, ...) int vendor, device; g_autofree char *driverpath = NULL; - if (VIR_ALLOC_QUIET(driver) < 0 || - VIR_STRDUP_QUIET(driver->name, name) < 0 || - !(driverpath = pci_driver_get_path(driver, NULL, true))) + if (VIR_ALLOC_QUIET(driver) < 0) + ABORT_OOM(); + driver->name = g_strdup(name); + if (!(driverpath = pci_driver_get_path(driver, NULL, true))) ABORT_OOM(); if (virFileMakePath(driverpath) < 0) diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 4078dc4c69..de2ffc7d41 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -328,10 +328,7 @@ mymain(void) int ret = 0; char *fakerootdir; - if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) { - VIR_TEST_DEBUG("Out of memory"); - abort(); - } + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); if (!mkdtemp(fakerootdir)) { VIR_TEST_DEBUG("Cannot create fakerootdir"); diff --git a/tests/virscsitest.c b/tests/virscsitest.c index d4019e82f7..99374cc80c 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -222,10 +222,7 @@ mymain(void) VIR_FREE(virscsi_prefix); - if (VIR_STRDUP(virscsi_prefix, tmpdir) < 0) { - ret = -1; - goto cleanup; - } + virscsi_prefix = g_strdup(tmpdir); if (virTestRun("test1", test1, NULL) < 0) ret = -1; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 5d3edbc854..8f1d93fa5a 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -102,8 +102,7 @@ testStorageFileGetMetadata(const char *path, } } - if (VIR_STRDUP(def->path, path) < 0) - return NULL; + def->path = g_strdup(path); if (virStorageFileGetMetadata(def, uid, gid, false) < 0) return NULL; @@ -480,8 +479,7 @@ testPathCanonicalizeReadlink(const char *path, for (i = 0; i < G_N_ELEMENTS(testPathCanonicalizeSymlinks); i++) { if (STREQ(path, testPathCanonicalizeSymlinks[i][0])) { - if (VIR_STRDUP(*linkpath, testPathCanonicalizeSymlinks[i][1]) < 0) - return -1; + *linkpath = g_strdup(testPathCanonicalizeSymlinks[i][1]); return 0; } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 5d010f7f59..1e408f2757 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -718,8 +718,7 @@ static int testStripIPv6Brackets(const void *args) int ret = -1; char *res = NULL; - if (VIR_STRDUP(res, data->string) < 0) - goto cleanup; + res = g_strdup(data->string); virStringStripIPv6Brackets(res); @@ -742,8 +741,7 @@ static int testStripControlChars(const void *args) int ret = -1; char *res = NULL; - if (VIR_STRDUP(res, data->string) < 0) - goto cleanup; + res = g_strdup(data->string); virStringStripControlChars(res); @@ -772,8 +770,7 @@ static int testFilterChars(const void *args) int ret = -1; char *res = NULL; - if (VIR_STRDUP(res, data->string) < 0) - goto cleanup; + res = g_strdup(data->string); virStringFilterChars(res, data->valid); diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 9fe774836b..e0f9c6c2a1 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -122,8 +122,7 @@ checkPath(const char *path, } else { /* Yeah, our worst nightmares just became true. Path does * not exist. Cut off the last component and retry. */ - if (VIR_STRDUP_QUIET(crippledPath, relPath ? relPath : path) < 0) - goto error; + crippledPath = g_strdup(relPath ? relPath : path); virFileRemoveLastComponent(crippledPath); diff --git a/tests/virusbmock.c b/tests/virusbmock.c index f35ad407ad..cace140725 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -56,8 +56,8 @@ static char *get_fake_path(const char *real_path) if ((p = STRSKIP(real_path, USB_SYSFS)) && virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p) < 0) goto error; - else if (!p && VIR_STRDUP_QUIET(path, real_path) < 0) - goto error; + else if (!p) + path = g_strdup(real_path); return path; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 4c5d41aee5..706fec7bac 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -142,8 +142,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) if (STRPREFIX(fileName, "/vmfs/volumes/")) { /* Found absolute path referencing a file inside a datastore */ - if (VIR_STRDUP(copyOfFileName, fileName) < 0) - goto cleanup; + copyOfFileName = g_strdup(fileName); /* Expected format: '/vmfs/volumes/<datastore>/<path>' */ if ((tmp = STRSKIP(copyOfFileName, "/vmfs/volumes/")) == NULL || diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 0cfdb1facf..42ab4ed929 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -153,8 +153,7 @@ testFormatVMXFileName(const char *src, void *opaque G_GNUC_UNUSED) if (STRPREFIX(src, "[")) { /* Found potential datastore path */ - if (VIR_STRDUP(copyOfDatastorePath, src) < 0) - goto cleanup; + copyOfDatastorePath = g_strdup(src); /* Expected format: '[<datastore>] <path>' where <path> is optional */ if ((tmp = STRSKIP(copyOfDatastorePath, "[")) == NULL || *tmp == ']' || -- 2.21.0

Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/admin/admin_server_dispatch.c | 3 +-- src/hyperv/hyperv_driver.c | 13 ++++--------- src/hyperv/hyperv_util.c | 3 +-- src/libvirt-admin.c | 18 ++++++------------ src/libvirt.c | 16 +++++----------- src/openvz/openvz_conf.c | 14 ++++---------- src/openvz/openvz_driver.c | 12 ++++-------- src/phyp/phyp_driver.c | 25 ++++++++----------------- src/vmware/vmware_conf.c | 11 +++-------- src/vmware/vmware_driver.c | 6 ++---- src/vmx/vmx.c | 14 +++++++------- src/vz/vz_driver.c | 3 +-- src/vz/vz_sdk.c | 29 +++++++++-------------------- 13 files changed, 55 insertions(+), 112 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index e56da3ba9f..0956084301 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -139,8 +139,7 @@ static int G_GNUC_WARN_UNUSED_RESULT make_nonnull_server(admin_nonnull_server *srv_dst, virNetServerPtr srv_src) { - if (VIR_STRDUP(srv_dst->name, virNetServerGetName(srv_src)) < 0) - return -1; + srv_dst->name = g_strdup(virNetServerGetName(srv_src)); return 0; } diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d69542b500..542253b8b8 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -149,8 +149,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, /* Request credentials */ if (conn->uri->user != NULL) { - if (VIR_STRDUP(username, conn->uri->user) < 0) - goto cleanup; + username = g_strdup(conn->uri->user); } else { if (!(username = virAuthGetUsername(conn, auth, "hyperv", "administrator", @@ -846,13 +845,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) return NULL; } - if (VIR_STRDUP(def->name, computerSystem->data.common->ElementName) < 0) - goto cleanup; + def->name = g_strdup(computerSystem->data.common->ElementName); if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) { - if (VIR_STRDUP(def->description, - virtualSystemSettingData->data.v1->Notes) < 0) - goto cleanup; + def->description = g_strdup(virtualSystemSettingData->data.v1->Notes); } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 && virtualSystemSettingData->data.v2->Notes.data != NULL) { char **notes = (char **)virtualSystemSettingData->data.v2->Notes.data; @@ -935,8 +931,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn for (computerSystem = computerSystemList; computerSystem != NULL; computerSystem = computerSystem->next) { - if (VIR_STRDUP(names[count], computerSystem->data.common->ElementName) < 0) - goto cleanup; + names[count] = g_strdup(computerSystem->data.common->ElementName); ++count; diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 3b84713426..2425d6a0c6 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -54,8 +54,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) if (STRCASEEQ(queryParam->name, "transport")) { VIR_FREE((*parsedUri)->transport); - if (VIR_STRDUP((*parsedUri)->transport, queryParam->value) < 0) - goto cleanup; + (*parsedUri)->transport = g_strdup(queryParam->value); if (STRNEQ((*parsedUri)->transport, "http") && STRNEQ((*parsedUri)->transport, "https")) { diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 93c73615e3..9a18ea0f8b 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -112,8 +112,7 @@ getSocketPath(virURIPtr uri) if (STREQ(param->name, "socket")) { VIR_FREE(sock_path); - if (VIR_STRDUP(sock_path, param->value) < 0) - goto error; + sock_path = g_strdup(param->value); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown URI parameter '%s'"), param->name); @@ -140,8 +139,7 @@ getSocketPath(virURIPtr uri) } if (legacy) { - if (VIR_STRDUP(sockbase, "libvirt-admin-sock") < 0) - goto error; + sockbase = g_strdup("libvirt-admin-sock"); } else { if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0) goto error; @@ -177,8 +175,7 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr) { const char *defname = getenv("LIBVIRT_ADMIN_DEFAULT_URI"); if (defname && *defname) { - if (VIR_STRDUP(*uristr, defname) < 0) - return -1; + *uristr = g_strdup(defname); VIR_DEBUG("Using LIBVIRT_ADMIN_DEFAULT_URI '%s'", *uristr); } else { if (virConfGetValueString(conf, "uri_default", uristr) < 0) @@ -194,11 +191,9 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr) * 'libvirtd:///session' depending on the process's EUID. */ if (geteuid() == 0) { - if (VIR_STRDUP(*uristr, "libvirtd:///system") < 0) - return -1; + *uristr = g_strdup("libvirtd:///system"); } else { - if (VIR_STRDUP(*uristr, "libvirtd:///session") < 0) - return -1; + *uristr = g_strdup("libvirtd:///session"); } } } @@ -238,8 +233,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) goto error; if (name) { - if (VIR_STRDUP(uristr, name) < 0) - goto error; + uristr = g_strdup(name); } else { if (virAdmGetDefaultURI(conf, &uristr) < 0) goto error; diff --git a/src/libvirt.c b/src/libvirt.c index 812cb9efde..33b43305a1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -173,10 +173,7 @@ virConnectAuthCallbackDefault(virConnectCredentialPtr cred, } if (cred[i].type != VIR_CRED_EXTERNAL) { - if (VIR_STRDUP(cred[i].result, - STREQ(bufptr, "") && cred[i].defresult ? - cred[i].defresult : bufptr) < 0) - return -1; + cred[i].result = g_strdup(STREQ(bufptr, "") && cred[i].defresult ? cred[i].defresult : bufptr); cred[i].resultlen = strlen(cred[i].result); } } @@ -803,8 +800,7 @@ virConnectGetDefaultURI(virConfPtr conf, const char *defname = getenv("LIBVIRT_DEFAULT_URI"); if (defname && *defname) { VIR_DEBUG("Using LIBVIRT_DEFAULT_URI '%s'", defname); - if (VIR_STRDUP(*name, defname) < 0) - goto cleanup; + *name = g_strdup(defname); } else { if (virConfGetValueString(conf, "uri_default", name) < 0) goto cleanup; @@ -885,8 +881,7 @@ virConnectOpenInternal(const char *name, * if detectable. */ if (name) { - if (VIR_STRDUP(uristr, name) < 0) - goto failed; + uristr = g_strdup(name); } else { if (virConnectGetDefaultURI(conf, &uristr) < 0) goto failed; @@ -924,9 +919,8 @@ virConnectOpenInternal(const char *name, /* Avoid need for drivers to worry about NULLs, as * no one needs to distinguish "" vs NULL */ - if (ret->uri->path == NULL && - VIR_STRDUP(ret->uri->path, "") < 0) - goto failed; + if (ret->uri->path == NULL) + ret->uri->path = g_strdup(""); VIR_DEBUG("Split \"%s\" to URI components:\n" " scheme %s\n" diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e5ef426329..4646308c48 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -348,8 +348,7 @@ openvzReadFSConf(virDomainDefPtr def, goto error; fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE; - if (VIR_STRDUP(fs->src->path, temp) < 0) - goto error; + fs->src->path = g_strdup(temp); } else { /* OSTEMPLATE was not found, VE was booted from a private dir directly */ ret = openvzReadVPSConfigParam(veid, "VE_PRIVATE", &temp); @@ -373,8 +372,7 @@ openvzReadFSConf(virDomainDefPtr def, VIR_FREE(veid_str); } - if (VIR_STRDUP(fs->dst, "/") < 0) - goto error; + fs->dst = g_strdup("/"); param = "DISKSPACE"; ret = openvzReadVPSConfigParam(veid, param, &temp); @@ -549,8 +547,7 @@ int openvzLoadDomains(struct openvz_driver *driver) } def->os.type = VIR_DOMAIN_OSTYPE_EXE; - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - goto cleanup; + def->os.init = g_strdup("/sbin/init"); ret = openvzReadVPSConfigParam(veid, "CPUS", &temp); if (ret < 0) { @@ -727,10 +724,7 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) saveptr = NULL; if ((token = strtok_r(sf, "\"\t\n", &saveptr)) != NULL) { VIR_FREE(*value); - if (VIR_STRDUP(*value, token) < 0) { - err = 1; - break; - } + *value = g_strdup(token); /* keep going - last entry wins */ } } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index bf399986a7..017eec3081 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -118,10 +118,8 @@ openvzDomainDefPostParse(virDomainDefPtr def, void *parseOpaque G_GNUC_UNUSED) { /* fill the init path */ - if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - return -1; - } + if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) + def->os.init = g_strdup("/sbin/init"); return 0; } @@ -780,8 +778,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, /* if net is ethernet and the user has specified guest interface name, * let's use it; otherwise generate a new one */ if (net->ifname_guest) { - if (VIR_STRDUP(guest_ifname, net->ifname_guest) < 0) - goto cleanup; + guest_ifname = g_strdup(net->ifname_guest); } else { guest_ifname = openvzGenerateContainerVethName(veid); if (guest_ifname == NULL) { @@ -1507,8 +1504,7 @@ static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSED, continue; } snprintf(vpsname, sizeof(vpsname), "%d", veid); - if (VIR_STRDUP(names[got], vpsname) < 0) - goto out; + names[got] = g_strdup(vpsname); got ++; } diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4527adc670..8b1d804233 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -946,8 +946,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, goto err; if (conn->uri->user != NULL) { - if (VIR_STRDUP(username, conn->uri->user) < 0) - goto err; + username = g_strdup(conn->uri->user); } else { if (!(username = virAuthGetUsername(conn, auth, "ssh", NULL, conn->uri->server))) @@ -1124,9 +1123,7 @@ phypConnectOpen(virConnectPtr conn, if (conn->uri->path[0] != '\0') { /* need to shift one byte in order to remove the first "/" of URI component */ - if (VIR_STRDUP(managed_system, - conn->uri->path + (conn->uri->path[0] == '/')) < 0) - goto failure; + managed_system = g_strdup(conn->uri->path + (conn->uri->path[0] == '/')); /* here we are handling only the first component of the path, * so skipping the second: @@ -1465,8 +1462,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, else goto cleanup; - if (VIR_STRDUP(backing_device, char_ptr) < 0) - goto cleanup; + backing_device = g_strdup(char_ptr); } else { backing_device = g_steal_pointer(&ret); } @@ -2228,8 +2224,7 @@ phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) goto cleanup; } - if (VIR_STRDUP(voldef.key, vol->key) < 0) - goto cleanup; + voldef.key = g_strdup(vol->key); voldef.type = VIR_STORAGE_POOL_LOGICAL; @@ -2338,8 +2333,7 @@ phypStoragePoolListVolumes(virStoragePoolPtr pool, char **const volumes, if (char_ptr) { *char_ptr = '\0'; - if (VIR_STRDUP(volumes[got++], volumes_list) < 0) - goto cleanup; + volumes[got++] = g_strdup(volumes_list); char_ptr++; volumes_list = char_ptr; } else { @@ -2532,8 +2526,7 @@ phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) if (char_ptr) { *char_ptr = '\0'; - if (VIR_STRDUP(pools[got++], storage_pools) < 0) - goto cleanup; + pools[got++] = g_strdup(storage_pools); char_ptr++; storage_pools = char_ptr; } else { @@ -2985,8 +2978,7 @@ phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) if (char_ptr) { *char_ptr = '\0'; - if (VIR_STRDUP(names[got++], networks) < 0) - goto cleanup; + names[got++] = g_strdup(networks); char_ptr++; networks = char_ptr; } else { @@ -3146,8 +3138,7 @@ phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames if (char_ptr) { *char_ptr = '\0'; - if (VIR_STRDUP(names[got++], domains) < 0) - goto cleanup; + names[got++] = g_strdup(domains); char_ptr++; domains = char_ptr; } else { diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 207af8fe81..8707f842ad 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -175,8 +175,7 @@ vmwareLoadDomains(struct vmware_driver *driver) pDomain = vm->privateData; - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath = g_strdup(vmxPath); vmwareDomainConfigDisplay(pDomain, vmdef); @@ -354,14 +353,10 @@ vmwareParsePath(const char *path, char **directory, char **filename) if (VIR_STRNDUP(*directory, path, separator - path - 1) < 0) goto error; - if (VIR_STRDUP(*filename, separator) < 0) { - VIR_FREE(*directory); - goto error; - } + *filename = g_strdup(separator); } else { - if (VIR_STRDUP(*filename, path) < 0) - goto error; + *filename = g_strdup(path); } return 0; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 912827a921..83974531d5 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -447,8 +447,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla goto cleanup; pDomain = vm->privateData; - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath = g_strdup(vmxPath); vmwareDomainConfigDisplay(pDomain, vmdef); @@ -708,8 +707,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml, goto cleanup; pDomain = vm->privateData; - if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0) - goto cleanup; + pDomain->vmxPath = g_strdup(vmxPath); vmwareDomainConfigDisplay(pDomain, vmdef); vmdef = NULL; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c9a80ba35d..0d1d87bac6 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1085,8 +1085,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr def, if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || !driver) return 0; - if (VIR_STRDUP(copy, driver) < 0) - return -1; + copy = g_strdup(driver); tmp = copy; for (; *tmp != '\0'; ++tmp) @@ -1812,13 +1811,15 @@ virVMXParseConfig(virVMXContext *ctx, if (ctx->datacenterPath || ctx->moref) { struct virVMXDomainDefNamespaceData *nsdata = NULL; - if (VIR_ALLOC(nsdata) < 0 || - VIR_STRDUP(nsdata->datacenterPath, ctx->datacenterPath) < 0 || - VIR_STRDUP(nsdata->moref, ctx->moref) < 0) { + if (VIR_ALLOC(nsdata) < 0) { virVMXDomainDefNamespaceFree(nsdata); goto cleanup; } + nsdata->datacenterPath = g_strdup(ctx->datacenterPath); + + nsdata->moref = g_strdup(ctx->moref); + def->ns = *virDomainXMLOptionGetNamespace(xmlopt); def->namespaceData = nsdata; } @@ -2839,8 +2840,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, goto cleanup; } - if (VIR_STRDUP((*def)->source->data.tcp.host, parsedUri->server) < 0) - goto cleanup; + (*def)->source->data.tcp.host = g_strdup(parsedUri->server); if (virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->port) < 0) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 76b23788b8..5b54f83b22 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3015,8 +3015,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, if (dname) { VIR_FREE(def->name); - if (VIR_STRDUP(def->name, dname) < 0) - goto cleanup; + def->name = g_strdup(dname); } if (virDomainMigratePrepare3ParamsEnsureACL(conn, def) < 0) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 68284d53f7..e7c1676df9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -501,8 +501,7 @@ prlsdkUUIDParse(const char *uuidstr, unsigned char *uuid) virCheckNonNullArgGoto(uuidstr, error); virCheckNonNullArgGoto(uuid, error); - if (VIR_STRDUP(tmp, uuidstr) < 0) - goto error; + tmp = g_strdup(uuidstr); tmp[strlen(tmp) - 1] = '\0'; @@ -774,10 +773,8 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, fs->type = VIR_DOMAIN_FS_TYPE_VOLUME; if (VIR_ALLOC(fs->src->srcpool) < 0) goto cleanup; - if (VIR_STRDUP(fs->src->srcpool->pool, matches[1]) < 0) - goto cleanup; - if (VIR_STRDUP(fs->src->srcpool->volume, matches[2]) < 0) - goto cleanup; + fs->src->srcpool->pool = g_strdup(matches[1]); + fs->src->srcpool->volume = g_strdup(matches[2]); VIR_FREE(buf); } else { fs->type = VIR_DOMAIN_FS_TYPE_FILE; @@ -1054,9 +1051,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) * always up */ net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; net->type = VIR_DOMAIN_NET_TYPE_NETWORK; - if (VIR_STRDUP(net->data.network.name, - PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) - goto cleanup; + net->data.network.name = g_strdup(PARALLELS_DOMAIN_ROUTED_NETWORK_NAME); return 0; } @@ -1078,9 +1073,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) if (emulatedType == PNA_ROUTED) { net->type = VIR_DOMAIN_NET_TYPE_NETWORK; - if (VIR_STRDUP(net->data.network.name, - PARALLELS_DOMAIN_ROUTED_NETWORK_NAME) < 0) - goto cleanup; + net->data.network.name = g_strdup(PARALLELS_DOMAIN_ROUTED_NETWORK_NAME); } else { char *netid = prlsdkGetStringParamVar(PrlVmDevNet_GetVirtualNetworkId, @@ -1224,8 +1217,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) goto cleanup; if (!(uri = virURIParse(uristr))) goto cleanup; - if (VIR_STRDUP(chr->source->data.tcp.host, uri->server) < 0) - goto cleanup; + chr->source->data.tcp.host = g_strdup(uri->server); if (virAsprintf(&chr->source->data.tcp.service, "%d", uri->port) < 0) goto cleanup; chr->source->data.tcp.listen = socket_mode == PSP_SERIAL_SOCKET_SERVER; @@ -1236,12 +1228,10 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr) goto cleanup; if (!(uri = virURIParse(uristr))) goto cleanup; - if (VIR_STRDUP(chr->source->data.udp.bindHost, uri->server) < 0) - goto cleanup; + chr->source->data.udp.bindHost = g_strdup(uri->server); if (virAsprintf(&chr->source->data.udp.bindService, "%d", uri->port) < 0) goto cleanup; - if (VIR_STRDUP(chr->source->data.udp.connectHost, uri->server) < 0) - goto cleanup; + chr->source->data.udp.connectHost = g_strdup(uri->server); if (virAsprintf(&chr->source->data.udp.connectService, "%d", uri->port) < 0) goto cleanup; break; @@ -1526,8 +1516,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainDefPtr def) break; case PVT_CT: def->os.type = VIR_DOMAIN_OSTYPE_EXE; - if (VIR_STRDUP(def->os.init, "/sbin/init") < 0) - return -1; + def->os.init = g_strdup("/sbin/init"); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.21.0