[libvirt] [PATCH v1 00/26] remove more unneeded labels
Hi, This is a follow up of a cleanup I did last year [1], which was more focused on 'cleanup' labels. In this one I covered all labels that are simply a 'return' proxy call. This wasn't a 'purge all return labels' series. Some of them are still around in cases where they help the code flow (like Jano suggested in the review at [2], for example). I divided the series by module and by amount of changes made to make it less daunting for reviews (although cases such as domain_conf.c couldn't be avoided without splitting changes in the same file in multiple patches). The maintainer is welcome to squash the patches up as needed. [1] https://www.redhat.com/archives/libvir-list/2019-October/msg01420.html [2] https://www.redhat.com/archives/libvir-list/2019-November/msg00468.html Daniel Henrique Barboza (26): bhyve: remove unneeded labels conf: remove unneeded labels conf: remove more unneeded labels conf/domain_conf.c: remove unneeded labels test/test_driver.c: remove unneeded labels storage: remove unneeded labels nwfilter: remove unneeded labels remote/remote_daemon_config.c: remove unneeded label hyperv/hyperv_wmi.c: remove unneeded labels locking/lock_driver_lockd.c: remove unneeded labels cpu/cpu_ppc64.c: remove unneeded label lxc: remove unneeded labels node_device: remove unneeded labels secret/secret_driver.c: remove unneeded label openvz: remove unneeded labels qemu: remove unneeded labels qemu: remove remaining unneeded labels vz/vz_sdk.c: remove unneeded labels vbox: remove unneeded labels security: remove unneeded labels util/virsysinfo.c: remove unneeded labels util: remove unneeded labels util: remove remaining unneeded labels logging: remove unneeded labels tests: remove unneeded labels examples: remove unneeded labels examples/c/misc/hellolibvirt.c | 28 +-- examples/c/misc/openauth.c | 22 +-- src/bhyve/bhyve_device.c | 13 +- src/bhyve/bhyve_parse_command.c | 47 ++--- src/conf/capabilities.c | 14 +- src/conf/cpu_conf.c | 36 ++-- src/conf/domain_addr.c | 9 +- src/conf/domain_conf.c | 192 +++++++-------------- src/conf/interface_conf.c | 9 +- src/conf/network_conf.c | 45 ++--- src/conf/networkcommon_conf.c | 11 +- src/conf/nwfilter_conf.c | 3 +- src/conf/nwfilter_params.c | 5 +- src/conf/virnetworkobj.c | 7 +- src/cpu/cpu_ppc64.c | 12 +- src/hyperv/hyperv_wmi.c | 15 +- src/locking/lock_driver_lockd.c | 16 +- src/logging/log_handler.c | 7 +- src/logging/log_manager.c | 14 +- src/lxc/lxc_container.c | 7 +- src/lxc/lxc_controller.c | 10 +- src/node_device/node_device_driver.c | 4 +- src/node_device/node_device_hal.c | 10 +- src/nwfilter/nwfilter_ebiptables_driver.c | 11 +- src/nwfilter/nwfilter_learnipaddr.c | 3 +- src/openvz/openvz_conf.c | 11 +- src/openvz/openvz_driver.c | 42 ++--- src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_command.c | 93 +++++----- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_domain_address.c | 52 +++--- src/qemu/qemu_driver.c | 32 ++-- src/qemu/qemu_hostdev.c | 11 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration_cookie.c | 10 +- src/qemu/qemu_migration_params.c | 11 +- src/remote/remote_daemon_config.c | 101 ++++++----- src/secret/secret_driver.c | 6 +- src/security/security_dac.c | 26 ++- src/security/security_selinux.c | 26 ++- src/security/virt-aa-helper.c | 41 ++--- src/storage/storage_backend_iscsi_direct.c | 4 +- src/storage/storage_driver.c | 4 +- src/test/test_driver.c | 51 +++--- src/util/virhostcpu.c | 6 +- src/util/virnetdev.c | 13 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevtap.c | 15 +- src/util/virnetdevvportprofile.c | 52 +++--- src/util/virnetlink.c | 4 +- src/util/virpci.c | 14 +- src/util/virsocketaddr.c | 11 +- src/util/virstoragefile.c | 4 +- src/util/virsysinfo.c | 54 ++---- src/util/virtpm.c | 5 +- src/util/virtypedparam.c | 14 +- src/util/viruuid.c | 13 +- src/vbox/vbox_MSCOMGlue.c | 11 +- src/vbox/vbox_snapshot_conf.c | 9 +- src/vz/vz_sdk.c | 102 ++++------- tests/qemumonitortestutils.c | 15 +- tests/testutilsqemu.c | 8 +- tests/virhostdevtest.c | 14 +- 63 files changed, 564 insertions(+), 915 deletions(-) -- 2.24.1
Labels that are simply a jump to a 'return' call are unneeded and can be replaced by the return value instead. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/bhyve/bhyve_device.c | 13 ++++----- src/bhyve/bhyve_parse_command.c | 47 +++++++++++++-------------------- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index ddbe20d31d..13261e9935 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -97,7 +97,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveAddr(addrs, &lpc_addr, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0) < 0) { - goto error; + return -1; } for (i = 0; i < def->ncontrollers; i++) { @@ -113,7 +113,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->controllers[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, -1) < 0) - goto error; + return -1; } } @@ -124,7 +124,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->nets[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, -1) < 0) - goto error; + return -1; } for (i = 0; i < def->ndisks; i++) { @@ -140,7 +140,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, -1) < 0) - goto error; + return -1; } for (i = 0; i < def->nvideos; i++) { @@ -150,14 +150,11 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, &def->videos[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, -1) < 0) - goto error; + return -1; } return 0; - - error: - return -1; } int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index e74c4c2d0c..f7cedf5c65 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -374,7 +374,7 @@ bhyveParsePCISlot(const char *slotdef, val = g_strdup(curr); if (virStrToLong_ui(val, NULL, 10, &values[i]) < 0) - goto error; + return -1; VIR_FREE(val); @@ -404,8 +404,6 @@ bhyveParsePCISlot(const char *slotdef, } return 0; - error: - return -1; } static int @@ -426,7 +424,7 @@ bhyveParsePCIDisk(virDomainDefPtr def, virDomainDiskDefPtr disk = NULL; if (!(disk = virDomainDiskDefNew(NULL))) - goto cleanup; + return 0; disk->bus = bus; disk->device = device; @@ -471,7 +469,6 @@ bhyveParsePCIDisk(virDomainDefPtr def, if (VIR_APPEND_ELEMENT(def->disks, def->ndisks, disk) < 0) goto error; - cleanup: return 0; error: @@ -664,17 +661,17 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (virStrToLong_i(arg, NULL, 10, &vcpus) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse number of vCPUs")); - goto error; + return -1; } if (virDomainDefSetVcpusMax(def, vcpus, xmlopt) < 0) - goto error; + return -1; if (virDomainDefSetVcpus(def, vcpus) < 0) - goto error; + return -1; break; case 'l': CONSUME_ARG(arg); if (bhyveParseBhyveLPCArg(def, caps, arg)) - goto error; + return -1; break; case 's': CONSUME_ARG(arg); @@ -684,19 +681,19 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, &nahcidisks, &nvirtiodisks, arg)) - goto error; + return -1; break; case 'm': CONSUME_ARG(arg); if (bhyveParseMemsize(arg, &memory)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory")); - goto error; + return -1; } if (def->mem.cur_balloon != 0 && def->mem.cur_balloon != memory) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory: size mismatch")); - goto error; + return -1; } def->mem.cur_balloon = memory; virDomainDefSetMemoryTotal(def, memory); @@ -714,7 +711,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (virUUIDParse(arg, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse UUID '%s'"), arg); - goto error; + return -1; } break; case 'S': @@ -729,7 +726,7 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, if (argc != opti) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments for bhyve command")); - goto error; + return -1; } if (def->name == NULL) { @@ -739,13 +736,10 @@ bhyveParseBhyveCommandLine(virDomainDefPtr def, * error here */ virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments: VM name mismatch")); - goto error; + return -1; } return 0; - - error: - return -1; } /* @@ -761,7 +755,6 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, unsigned arguments = 0; size_t memory = 0; size_t i = 0; - int ret = -1; size_t opti; const char *arg; @@ -789,12 +782,12 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, if (bhyveParseMemsize(arg, &memory)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory")); - goto error; + return -1; } if (def->mem.cur_balloon != 0 && def->mem.cur_balloon != memory) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse memory: size mismatch")); - goto error; + return -1; } def->mem.cur_balloon = memory; virDomainDefSetMemoryTotal(def, memory); @@ -807,7 +800,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, if (argc != opti) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments for bhyve command")); - goto error; + return -1; } if (arguments != 3) { @@ -824,12 +817,10 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, * error here */ virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to parse arguments: VM name mismatch")); - goto error; + return -1; } - ret = 0; - error: - return ret; + return 0; } static int @@ -838,14 +829,12 @@ bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, char **argv) { if (!argv) - goto error; + return -1; def->os.bootloader = g_strdup(argv[0]); def->os.bootloaderArgs = virStringListJoin((const char**) &argv[1], " "); return 0; - error: - return -1; } virDomainDefPtr -- 2.24.1
On Mon, Jan 06, 2020 at 06:57:25PM -0300, Daniel Henrique Barboza wrote:
Labels that are simply a jump to a 'return' call are unneeded and can be replaced by the return value instead.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> ---
There are a few candidates suitable for a trivial g_autoFOO adjustment, but at the same time the commit message is very clear in what the patch is trying to achieve and such a change can be done at any point in time independently. Erik
Remove unneeded labels from the following src/conf files: capabilities.c network_conf.c networkcommon_conf.c nwfilter_conf.c virnetworkobj.c Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/conf/capabilities.c | 14 ++++------- src/conf/network_conf.c | 45 +++++++++++++++-------------------- src/conf/networkcommon_conf.c | 11 ++++----- src/conf/nwfilter_conf.c | 3 +-- src/conf/virnetworkobj.c | 7 +++--- 5 files changed, 32 insertions(+), 48 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 82129feaac..9a39858280 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -747,11 +747,11 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, _("could not find capabilities for %s"), virBufferCurrentContent(&buf)); virBufferFreeAndReset(&buf); - goto error; + return ret; } if (VIR_ALLOC(ret) < 0) - goto error; + return ret; ret->ostype = foundguest->ostype; ret->arch = foundguest->arch.id; @@ -764,7 +764,6 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, if (foundmachine) ret->machinetype = foundmachine->name; - error: return ret; } @@ -1179,13 +1178,13 @@ virCapabilitiesFormatHostXML(virCapsHostPtr host, if (host->numa && virCapabilitiesHostNUMAFormat(host->numa, buf) < 0) - goto error; + return -1; if (virCapabilitiesFormatCaches(buf, &host->cache) < 0) - goto error; + return -1; if (virCapabilitiesFormatMemoryBandwidth(buf, &host->memBW) < 0) - goto error; + return -1; for (i = 0; i < host->nsecModels; i++) { virBufferAddLit(buf, "<secmodel>\n"); @@ -1207,9 +1206,6 @@ virCapabilitiesFormatHostXML(virCapsHostPtr host, virBufferAddLit(buf, "</host>\n\n"); return 0; - - error: - return -1; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 5551b5b4d5..27e83b7d85 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2240,8 +2240,6 @@ static int virNetworkIPDefFormat(virBufferPtr buf, const virNetworkIPDef *def) { - int result = -1; - virBufferAddLit(buf, "<ip"); if (def->family) @@ -2249,14 +2247,14 @@ virNetworkIPDefFormat(virBufferPtr buf, if (VIR_SOCKET_ADDR_VALID(&def->address)) { char *addr = virSocketAddrFormat(&def->address); if (!addr) - goto error; + return -1; virBufferAsprintf(buf, " address='%s'", addr); VIR_FREE(addr); } if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { char *addr = virSocketAddrFormat(&def->netmask); if (!addr) - goto error; + return -1; virBufferAsprintf(buf, " netmask='%s'", addr); VIR_FREE(addr); } @@ -2283,11 +2281,11 @@ virNetworkIPDefFormat(virBufferPtr buf, for (i = 0; i < def->nranges; i++) { char *saddr = virSocketAddrFormat(&def->ranges[i].start); if (!saddr) - goto error; + return -1; char *eaddr = virSocketAddrFormat(&def->ranges[i].end); if (!eaddr) { VIR_FREE(saddr); - goto error; + return -1; } virBufferAsprintf(buf, "<range start='%s' end='%s'/>\n", saddr, eaddr); @@ -2305,7 +2303,7 @@ virNetworkIPDefFormat(virBufferPtr buf, if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) { char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip); if (!ipaddr) - goto error; + return -1; virBufferAsprintf(buf, " ip='%s'", ipaddr); VIR_FREE(ipaddr); } @@ -2317,7 +2315,7 @@ virNetworkIPDefFormat(virBufferPtr buf, if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) { char *ipaddr = virSocketAddrFormat(&def->bootserver); if (!ipaddr) - goto error; + return -1; virBufferEscapeString(buf, " server='%s'", ipaddr); VIR_FREE(ipaddr); } @@ -2332,9 +2330,7 @@ virNetworkIPDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</ip>\n"); - result = 0; - error: - return result; + return 0; } @@ -2458,7 +2454,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferGetIndent(buf) / 2, 1) < 0) { xmlBufferFree(xmlbuf); xmlIndentTreeOutput = oldIndentTreeOutput; - goto error; + return -1; } virBufferAsprintf(buf, "%s\n", (char *) xmlBufferContent(xmlbuf)); xmlBufferFree(xmlbuf); @@ -2475,7 +2471,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown forward type %d in network '%s'"), def->forward.type, def->name); - goto error; + return -1; } virBufferAddLit(buf, "<forward"); virBufferEscapeString(buf, " dev='%s'", dev); @@ -2504,13 +2500,13 @@ virNetworkDefFormatBuf(virBufferPtr buf, virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected hostdev driver name type %d "), def->forward.driverName); - goto error; + return -1; } virBufferAsprintf(buf, "<driver name='%s'/>\n", driverName); } if (def->forward.type == VIR_NETWORK_FORWARD_NAT) { if (virNetworkForwardNatDefFormat(buf, &def->forward) < 0) - goto error; + return -1; } /* For now, hard-coded to at most 1 forward.pfs */ @@ -2562,7 +2558,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto error; + return -1; } if (hasbridge || def->bridge || def->macTableManager) { @@ -2608,29 +2604,29 @@ virNetworkDefFormatBuf(virBufferPtr buf, } if (virNetworkDNSDefFormat(buf, &def->dns) < 0) - goto error; + return -1; if (virNetDevVlanFormat(&def->vlan, buf) < 0) - goto error; + return -1; if (virNetDevBandwidthFormat(def->bandwidth, 0, buf) < 0) - goto error; + return -1; for (i = 0; i < def->nips; i++) { if (virNetworkIPDefFormat(buf, &def->ips[i]) < 0) - goto error; + return -1; } for (i = 0; i < def->nroutes; i++) { if (virNetDevIPRouteFormat(buf, def->routes[i]) < 0) - goto error; + return -1; } if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0) - goto error; + return -1; for (i = 0; i < def->nPortGroups; i++) if (virPortGroupDefFormat(buf, &def->portGroups[i]) < 0) - goto error; + return -1; if (def->namespaceData && def->ns.format) { if ((def->ns.format)(buf, def->namespaceData) < 0) @@ -2641,9 +2637,6 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</network>\n"); return 0; - - error: - return -1; } diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index de807e2a54..e90cfcbef5 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -290,7 +290,6 @@ int virNetDevIPRouteFormat(virBufferPtr buf, const virNetDevIPRoute *def) { - int result = -1; char *addr = NULL; virBufferAddLit(buf, "<route"); @@ -299,13 +298,13 @@ virNetDevIPRouteFormat(virBufferPtr buf, virBufferAsprintf(buf, " family='%s'", def->family); if (!(addr = virSocketAddrFormat(&def->address))) - goto cleanup; + return -1; virBufferAsprintf(buf, " address='%s'", addr); VIR_FREE(addr); if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { if (!(addr = virSocketAddrFormat(&def->netmask))) - goto cleanup; + return -1; virBufferAsprintf(buf, " netmask='%s'", addr); VIR_FREE(addr); } @@ -313,7 +312,7 @@ virNetDevIPRouteFormat(virBufferPtr buf, virBufferAsprintf(buf, " prefix='%u'", def->prefix); if (!(addr = virSocketAddrFormat(&def->gateway))) - goto cleanup; + return -1; virBufferAsprintf(buf, " gateway='%s'", addr); VIR_FREE(addr); @@ -321,7 +320,5 @@ virNetDevIPRouteFormat(virBufferPtr buf, virBufferAsprintf(buf, " metric='%u'", def->metric); virBufferAddLit(buf, "/>\n"); - result = 0; - cleanup: - return result; + return 0; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d071c398bc..680f4184c3 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2903,7 +2903,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, _("formatter for %s %s reported error"), type, att[i].name); - goto err_exit; + return; } } else if ((flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) { virBufferAddChar(buf, '$'); @@ -2986,7 +2986,6 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, virBufferAsprintf(buf, "<%s/>\n", type); - err_exit: return; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 5daf4a8cb1..299cdba52d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1774,21 +1774,20 @@ virNetworkObjPortListExportCallback(void *payload, if (data->filter && !data->filter(data->net->conn, data->def, def)) - goto cleanup; + return 0; if (!data->ports) { data->nports++; - goto cleanup; + return 0; } if (!(port = virGetNetworkPort(data->net, def->uuid))) { data->error = true; - goto cleanup; + return 0; } data->ports[data->nports++] = port; - cleanup: return 0; } -- 2.24.1
Remove unneeded labels from the following conf files: cpu_conf.c domain_addr.c interface_conf.c nwfilter_params.c Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/conf/cpu_conf.c | 36 ++++++++++++++++-------------------- src/conf/domain_addr.c | 9 ++++----- src/conf/interface_conf.c | 9 +++------ src/conf/nwfilter_params.c | 5 +---- 4 files changed, 24 insertions(+), 35 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 7490d6bf73..b463981de0 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -992,7 +992,6 @@ virCPUDefIsEqual(virCPUDefPtr src, virCPUDefPtr dst, bool reportError) { - bool identical = false; size_t i; if (!src && !dst) @@ -1004,91 +1003,91 @@ virCPUDefIsEqual(virCPUDefPtr src, if ((src && !dst) || (!src && dst)) { MISMATCH("%s", _("Target CPU does not match source")); - goto cleanup; + return false; } if (src->type != dst->type) { MISMATCH(_("Target CPU type %s does not match source %s"), virCPUTypeToString(dst->type), virCPUTypeToString(src->type)); - goto cleanup; + return false; } if (src->mode != dst->mode) { MISMATCH(_("Target CPU mode %s does not match source %s"), virCPUModeTypeToString(dst->mode), virCPUModeTypeToString(src->mode)); - goto cleanup; + return false; } if (src->check != dst->check) { MISMATCH(_("Target CPU check %s does not match source %s"), virCPUCheckTypeToString(dst->check), virCPUCheckTypeToString(src->check)); - goto cleanup; + return false; } if (src->arch != dst->arch) { MISMATCH(_("Target CPU arch %s does not match source %s"), virArchToString(dst->arch), virArchToString(src->arch)); - goto cleanup; + return false; } if (STRNEQ_NULLABLE(src->model, dst->model)) { MISMATCH(_("Target CPU model %s does not match source %s"), NULLSTR(dst->model), NULLSTR(src->model)); - goto cleanup; + return false; } if (STRNEQ_NULLABLE(src->vendor, dst->vendor)) { MISMATCH(_("Target CPU vendor %s does not match source %s"), NULLSTR(dst->vendor), NULLSTR(src->vendor)); - goto cleanup; + return false; } if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { MISMATCH(_("Target CPU vendor id %s does not match source %s"), NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); - goto cleanup; + return false; } if (src->sockets != dst->sockets) { MISMATCH(_("Target CPU sockets %d does not match source %d"), dst->sockets, src->sockets); - goto cleanup; + return false; } if (src->cores != dst->cores) { MISMATCH(_("Target CPU cores %d does not match source %d"), dst->cores, src->cores); - goto cleanup; + return false; } if (src->threads != dst->threads) { MISMATCH(_("Target CPU threads %d does not match source %d"), dst->threads, src->threads); - goto cleanup; + return false; } if (src->nfeatures != dst->nfeatures) { MISMATCH(_("Target CPU feature count %zu does not match source %zu"), dst->nfeatures, src->nfeatures); - goto cleanup; + return false; } for (i = 0; i < src->nfeatures; i++) { if (STRNEQ(src->features[i].name, dst->features[i].name)) { MISMATCH(_("Target CPU feature %s does not match source %s"), dst->features[i].name, src->features[i].name); - goto cleanup; + return false; } if (src->features[i].policy != dst->features[i].policy) { MISMATCH(_("Target CPU feature policy %s does not match source %s"), virCPUFeaturePolicyTypeToString(dst->features[i].policy), virCPUFeaturePolicyTypeToString(src->features[i].policy)); - goto cleanup; + return false; } } @@ -1098,15 +1097,12 @@ virCPUDefIsEqual(virCPUDefPtr src, (src->cache->level != dst->cache->level || src->cache->mode != dst->cache->mode))) { MISMATCH("%s", _("Target CPU cache does not match source")); - goto cleanup; + return false; } #undef MISMATCH - identical = true; - - cleanup: - return identical; + return true; } diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 165bd70f2b..ef7ee80e6a 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1175,7 +1175,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs, if (addrs->nbuses == 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("No PCI buses available")); - goto error; + return -1; } /* if the caller asks for "any function", give them function 0 */ @@ -1199,7 +1199,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs, if (virDomainPCIAddressFindUnusedFunctionOnBus(bus, &a, function, flags, &found) < 0) { - goto error; + return -1; } if (found) @@ -1223,7 +1223,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs, if (virDomainPCIAddressFindUnusedFunctionOnBus(bus, &a, function, flags, &found) < 0) { - goto error; + return -1; } /* The isolation group for the bus will actually be changed @@ -1236,7 +1236,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs, if (addrs->dryRun) { /* a is already set to the first new bus */ if (virDomainPCIAddressSetGrow(addrs, &a, flags) < 0) - goto error; + return -1; /* this device will use the first slot of the new bus */ a.slot = addrs->buses[a.bus].minSlot; goto success; @@ -1244,7 +1244,6 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No more available PCI slots")); - error: return -1; success: diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index fbfd855395..7a41b19ed0 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -1070,19 +1070,19 @@ virInterfaceDefDevFormat(virBufferPtr buf, if (def == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virInterfaceDefFormat NULL def")); - goto cleanup; + return -1; } if ((def->name == NULL) && (def->type != VIR_INTERFACE_TYPE_VLAN)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virInterfaceDefFormat missing interface name")); - goto cleanup; + return -1; } if (!(type = virInterfaceTypeToString(def->type))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected interface type %d"), def->type); - goto cleanup; + return -1; } virBufferAsprintf(buf, "<interface type='%s' ", type); @@ -1125,9 +1125,6 @@ virInterfaceDefDevFormat(virBufferPtr buf, virBufferAddLit(buf, "</interface>\n"); return 0; - - cleanup: - return -1; } diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 4110169135..b0d60abdd0 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -672,12 +672,9 @@ virNWFilterHashTablePutAll(virHashTablePtr src, virHashForEach(src, addToTable, &atts); if (atts.errOccurred) - goto err_exit; + return -1; return 0; - - err_exit: - return -1; } /* The general purpose function virNWFilterVarValueEqual returns a -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/conf/domain_conf.c | 192 ++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 127 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ee33b7caf0..c026fdf45c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3682,8 +3682,6 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xmlopt, virDomainObjPtr domain, void *parseOpaque) { - int ret = -1; - if (!domain->persistent) return 0; @@ -3692,11 +3690,9 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xmlopt, if (!(domain->newDef = virDomainDefCopy(domain->def, xmlopt, parseOpaque, false))) - goto out; + return -1; - ret = 0; - out: - return ret; + return 0; } @@ -7701,7 +7697,6 @@ static int virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virDomainHostdevDefPtr def) { - int ret = -1; bool got_product, got_vendor; xmlNodePtr cur; virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; @@ -7715,7 +7710,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown startup policy '%s'"), startupPolicy); - goto out; + return -1; } } @@ -7738,12 +7733,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, if (virStrToLong_ui(vendor, NULL, 0, &usbsrc->vendor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse vendor id %s"), vendor); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb vendor needs id")); - goto out; + return -1; } } else if (virXMLNodeNameEqual(cur, "product")) { g_autofree char *product = virXMLPropString(cur, "id"); @@ -7755,12 +7750,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse product %s"), product); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb product needs id")); - goto out; + return -1; } } else if (virXMLNodeNameEqual(cur, "address")) { g_autofree char *bus = NULL; @@ -7771,12 +7766,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, if (virStrToLong_ui(bus, NULL, 0, &usbsrc->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse bus %s"), bus); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb address needs bus id")); - goto out; + return -1; } device = virXMLPropString(cur, "device"); @@ -7785,18 +7780,18 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse device %s"), device); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb address needs device id")); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown usb source type '%s'"), cur->name); - goto out; + return -1; } } cur = cur->next; @@ -7805,23 +7800,21 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, if (got_vendor && usbsrc->vendor == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("vendor cannot be 0.")); - goto out; + return -1; } if (!got_vendor && got_product) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing vendor")); - goto out; + return -1; } if (got_vendor && !got_product) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing product")); - goto out; + return -1; } - ret = 0; - out: - return ret; + return 0; } /* The internal XML for host PCI device's original states: @@ -7865,7 +7858,6 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, virDomainHostdevDefPtr def, unsigned int flags) { - int ret = -1; xmlNodePtr cur; cur = node->children; @@ -7876,25 +7868,23 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, &def->source.subsys.u.pci.addr; if (virPCIDeviceAddressParseXML(cur, addr) < 0) - goto out; + return -1; } else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) && virXMLNodeNameEqual(cur, "origstates")) { virDomainHostdevOrigStatesPtr states = &def->origstates; if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0) - goto out; + return -1; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown pci source type '%s'"), cur->name); - goto out; + return -1; } } cur = cur->next; } - ret = 0; - out: - return ret; + return 0; } @@ -8622,7 +8612,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, virDomainHostdevDefPtr def) { xmlNodePtr sourcenode; - int ret = -1; /* @type is passed in from the caller rather than read from the * xml document, because it is specified in different places for @@ -8638,18 +8627,18 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown host device source address type '%s'"), type); - goto error; + return -1; } } else { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing source address type")); - goto error; + return -1; } if (!(sourcenode = virXPathNode("./source", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <source> element in hostdev device")); - goto error; + return -1; } switch (def->source.caps.type) { @@ -8658,7 +8647,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, virXPathString("string(./source/block[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <block> element in hostdev storage device")); - goto error; + return -1; } break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: @@ -8666,7 +8655,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, virXPathString("string(./source/char[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <char> element in hostdev character device")); - goto error; + return -1; } break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: @@ -8674,21 +8663,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, virXPathString("string(./source/interface[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <interface> element in hostdev net device")); - goto error; + return -1; } if (virDomainNetIPInfoParseXML(_("Domain hostdev device"), ctxt, &def->source.caps.u.net.ip) < 0) - goto error; + return -1; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("address type='%s' not supported in hostdev interfaces"), virDomainHostdevCapsTypeToString(def->source.caps.type)); - goto error; + return -1; } - ret = 0; - error: - return ret; + + return 0; } @@ -9166,13 +9154,11 @@ virDomainLeaseDefParseXML(xmlNodePtr node) def->lockspace = g_steal_pointer(&lockspace); def->path = g_steal_pointer(&path); - cleanup: return def; error: virDomainLeaseDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static int @@ -11084,13 +11070,11 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, break; } - cleanup: return def; error: virDomainControllerDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -11277,13 +11261,11 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - cleanup: return def; error: virDomainFSDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static int @@ -13037,13 +13019,11 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - cleanup: return def; error: virDomainChrDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainSmartcardDefPtr @@ -13167,13 +13147,11 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - cleanup: return def; error: virDomainSmartcardDefFree(def); - def = NULL; - goto cleanup; + return NULL; } /* Parse the XML definition for a TPM device @@ -13295,13 +13273,11 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - cleanup: return def; error: virDomainTPMDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainPanicDefPtr @@ -13327,13 +13303,11 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - cleanup: return panic; error: virDomainPanicDefFree(panic); - panic = NULL; - goto cleanup; + return NULL; } /* Parse the XML definition for an input device */ @@ -13485,13 +13459,11 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, &def->virtio) < 0) goto error; - cleanup: return def; error: virDomainInputDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -13524,13 +13496,11 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - cleanup: return def; error: virDomainHubDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -13649,12 +13619,11 @@ virDomainTimerDefParseXML(xmlNodePtr node, } } - cleanup: return def; error: VIR_FREE(def); - goto cleanup; + return def; } @@ -14525,13 +14494,12 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt, break; } - cleanup: return def; error: virDomainGraphicsDefFree(def); def = NULL; - goto cleanup; + return NULL; } @@ -14551,13 +14519,11 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) goto error; } - cleanup: return def; error: virDomainSoundCodecDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -14613,13 +14579,11 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - cleanup: return def; error: virDomainSoundDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -14703,13 +14667,11 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - cleanup: return def; error: virDomainWatchdogDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -14816,13 +14778,12 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt, &def->virtio) < 0) goto error; - cleanup: return def; error: virDomainRNGDefFree(def); def = NULL; - goto cleanup; + return NULL; } @@ -14882,13 +14843,11 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt, &def->virtio) < 0) goto error; - cleanup: return def; error: virDomainMemballoonDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainNVRAMDefPtr @@ -15334,13 +15293,11 @@ virSysinfoParseXML(xmlNodePtr node, goto error; } - cleanup: return def; error: virSysinfoDefFree(def); - def = NULL; - goto cleanup; + return NULL; } unsigned int @@ -15528,16 +15485,15 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node) return NULL; if (VIR_ALLOC(def) < 0) - goto cleanup; + return def; if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown vgaconf value '%s'"), vgaconf); - goto cleanup; + return def; } def->vgaconf = val; - cleanup: return def; } @@ -15691,13 +15647,11 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt, def->driver = virDomainVideoDriverDefParseXML(node); - cleanup: return def; error: virDomainVideoDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainHostdevDefPtr @@ -15767,13 +15721,11 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, } } - cleanup: return def; error: virDomainHostdevDefFree(def); - def = NULL; - goto cleanup; + return NULL; } @@ -15840,14 +15792,11 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - - cleanup: return def; error: virDomainRedirdevDefFree(def); - def = NULL; - goto cleanup; + return NULL; } /* @@ -15963,13 +15912,11 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node) goto error; } - cleanup: return def; error: VIR_FREE(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainRedirFilterDefPtr @@ -16268,13 +16215,11 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, def->dh_cert = virXPathString("string(./dhCert)", ctxt); def->session = virXPathString("string(./session)", ctxt); - cleanup: return def; error: virDomainSEVDefFree(def); - def = NULL; - goto cleanup; + return NULL; } static virDomainMemoryDefPtr @@ -18222,7 +18167,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); if (VIR_ALLOC_N(idmap, num) < 0) - goto cleanup; + return idmap; for (i = 0; i < num; i++) { ctxt->node = node[i]; @@ -18232,7 +18177,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid idmap start/target/count settings")); VIR_FREE(idmap); - goto cleanup; + return NULL; } } @@ -18244,10 +18189,9 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("You must map the root user of container")); VIR_FREE(idmap); - goto cleanup; + return NULL; } - cleanup: return idmap; } @@ -18284,13 +18228,12 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node) goto error; } - cleanup: return iothrid; error: virDomainIOThreadIDDefFree(iothrid); iothrid = NULL; - goto cleanup; + return iothrid; } @@ -28984,18 +28927,15 @@ virDomainObjFormat(virDomainObjPtr obj, if (xmlopt->privateData.format && xmlopt->privateData.format(&buf, obj) < 0) - goto error; + return NULL; if (virDomainDefFormatInternal(obj->def, xmlopt, &buf, flags) < 0) - goto error; + return NULL; virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</domstatus>\n"); return virBufferContentAndReset(&buf); - - error: - return NULL; } static bool @@ -29302,7 +29242,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc = -1; if (abortOnError && rc != 0) - goto done; + return rc; } for (i = 0; i < def->nparallels; i++) { @@ -29312,7 +29252,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc = -1; if (abortOnError && rc != 0) - goto done; + return rc; } for (i = 0; i < def->nchannels; i++) { @@ -29322,7 +29262,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc = -1; if (abortOnError && rc != 0) - goto done; + return rc; } for (i = 0; i < def->nconsoles; i++) { if (virDomainSkipBackcompatConsole(def, i, false)) @@ -29333,10 +29273,9 @@ virDomainChrDefForeach(virDomainDefPtr def, rc = -1; if (abortOnError && rc != 0) - goto done; + return rc; } - done: return rc; } @@ -29357,10 +29296,9 @@ virDomainSmartcardDefForeach(virDomainDefPtr def, rc = -1; if (abortOnError && rc != 0) - goto done; + return rc; } - done: return rc; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/test/test_driver.c | 51 ++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f8e08dcf07..1908185743 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -791,7 +791,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu nodes value")); - goto error; + return -1; } ret = virXPathLong("string(/node/cpu/sockets[1])", ctxt, &l); @@ -800,7 +800,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu sockets value")); - goto error; + return -1; } ret = virXPathLong("string(/node/cpu/cores[1])", ctxt, &l); @@ -809,7 +809,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu cores value")); - goto error; + return -1; } ret = virXPathLong("string(/node/cpu/threads[1])", ctxt, &l); @@ -818,7 +818,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu threads value")); - goto error; + return -1; } nodeInfo->cpus = (nodeInfo->cores * nodeInfo->threads * @@ -830,7 +830,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu active value")); - goto error; + return -1; } ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); if (ret == 0) { @@ -838,7 +838,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node cpu mhz value")); - goto error; + return -1; } str = virXPathString("string(/node/cpu/model[1])", ctxt); @@ -846,7 +846,7 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) if (virStrcpyStatic(nodeInfo->model, str) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Model %s too big for destination"), str); - goto error; + return -1; } } @@ -856,12 +856,10 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt) } else if (ret == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid node memory value")); - goto error; + return -1; } return 0; - error: - return -1; } static int @@ -871,7 +869,6 @@ testParseDomainSnapshots(testDriverPtr privconn, xmlXPathContextPtr ctxt) { size_t i; - int ret = -1; testDomainNamespaceDefPtr nsdata = domobj->def->namespaceData; xmlNodePtr *nodes = nsdata->snap_nodes; bool cur; @@ -882,7 +879,7 @@ testParseDomainSnapshots(testDriverPtr privconn, xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "domainsnapshot"); if (!node) - goto error; + return -1; def = virDomainSnapshotDefParseNode(ctxt->doc, node, privconn->xmlopt, @@ -892,18 +889,18 @@ testParseDomainSnapshots(testDriverPtr privconn, VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL | VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); if (!def) - goto error; + return -1; if (!(snap = virDomainSnapshotAssignDef(domobj->snapshots, def))) { virObjectUnref(def); - goto error; + return -1; } if (cur) { if (virDomainSnapshotGetCurrent(domobj->snapshots)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("more than one snapshot claims to be active")); - goto error; + return -1; } virDomainSnapshotSetCurrent(domobj->snapshots, snap); @@ -914,12 +911,10 @@ testParseDomainSnapshots(testDriverPtr privconn, virReportError(VIR_ERR_INTERNAL_ERROR, _("Snapshots have inconsistent relations for " "domain %s"), domobj->def->name); - goto error; + return -1; } - ret = 0; - error: - return ret; + return 0; } static int @@ -1236,27 +1231,25 @@ testOpenParse(testDriverPtr privconn, if (!virXMLNodeNameEqual(ctxt->node, "node")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Root element is not 'node'")); - goto error; + return -1; } if (testParseNodeInfo(&privconn->nodeInfo, ctxt) < 0) - goto error; + return -1; if (testParseDomains(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseNetworks(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseInterfaces(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseStorage(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseNodedevs(privconn, file, ctxt) < 0) - goto error; + return -1; if (testParseAuthUsers(privconn, ctxt) < 0) - goto error; + return -1; return 0; - error: - return -1; } /* No shared state between simultaneous test connections initialized -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/storage/storage_backend_iscsi_direct.c | 4 +--- src/storage/storage_driver.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 2afa617cc1..3a5e2bb9f0 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -572,13 +572,11 @@ virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool, if (portalRet) *portalRet = g_steal_pointer(&portal); - cleanup: return iscsi; error: iscsi_destroy_context(iscsi); - iscsi = NULL; - goto cleanup; + return NULL; } static int diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6bbf52f729..0bb116cf08 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2771,13 +2771,13 @@ storageConnectStoragePoolEventRegisterAny(virConnectPtr conn, int callbackID = -1; if (virConnectStoragePoolEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virStoragePoolEventStateRegisterID(conn, driver->storageEventState, pool, eventID, callback, opaque, freecb, &callbackID) < 0) callbackID = -1; - cleanup: + return callbackID; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 11 ++++------- src/nwfilter/nwfilter_learnipaddr.c | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 0cf8149193..eec1414023 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1046,7 +1046,7 @@ iptablesHandlePortData(virFirewallPtr fw, if (printDataType(vars, portstr, sizeof(portstr), &portData->dataSrcPortStart) < 0) - goto err_exit; + return -1; if (ENTRY_WANT_NEG_SIGN(&portData->dataSrcPortStart)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1056,7 +1056,7 @@ iptablesHandlePortData(virFirewallPtr fw, if (printDataType(vars, portstralt, sizeof(portstralt), &portData->dataSrcPortEnd) < 0) - goto err_exit; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s:%s", portstr, portstralt); @@ -1069,7 +1069,7 @@ iptablesHandlePortData(virFirewallPtr fw, if (printDataType(vars, portstr, sizeof(portstr), &portData->dataDstPortStart) < 0) - goto err_exit; + return -1; if (ENTRY_WANT_NEG_SIGN(&portData->dataDstPortStart)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1079,7 +1079,7 @@ iptablesHandlePortData(virFirewallPtr fw, if (printDataType(vars, portstralt, sizeof(portstralt), &portData->dataDstPortEnd) < 0) - goto err_exit; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s:%s", portstr, portstralt); @@ -1089,9 +1089,6 @@ iptablesHandlePortData(virFirewallPtr fw, } return 0; - - err_exit: - return -1; } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 9b4fab7ffb..46ef65401c 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -725,7 +725,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, } if (VIR_ALLOC(req) < 0) - goto err_no_req; + return -1; if (!(req->binding = virNWFilterBindingDefCopy(binding))) goto err_free_req; @@ -752,7 +752,6 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, virNWFilterDeregisterLearnReq(ifindex); err_free_req: virNWFilterIPAddrLearnReqFree(req); - err_no_req: return -1; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/remote/remote_daemon_config.c | 101 +++++++++++++++--------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index 1d739caabf..0ecc49f179 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -230,19 +230,19 @@ daemonConfigLoadOptions(struct daemonConfig *data, { #ifdef WITH_IP if (virConfGetValueBool(conf, "listen_tcp", &data->listen_tcp) < 0) - goto error; + return -1; if (virConfGetValueBool(conf, "listen_tls", &data->listen_tls) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "tls_port", &data->tls_port) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "tcp_port", &data->tcp_port) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "listen_addr", &data->listen_addr) < 0) - goto error; + return -1; #endif /* !WITH_IP */ if (remoteConfigGetAuth(conf, filename, "auth_unix_rw", &data->auth_unix_rw) < 0) - goto error; + return -1; #if WITH_POLKIT /* Change default perms to be wide-open if PolicyKit is enabled. * Admin can always override in config file @@ -253,125 +253,122 @@ daemonConfigLoadOptions(struct daemonConfig *data, } #endif if (remoteConfigGetAuth(conf, filename, "auth_unix_ro", &data->auth_unix_ro) < 0) - goto error; + return -1; #ifdef WITH_IP if (remoteConfigGetAuth(conf, filename, "auth_tcp", &data->auth_tcp) < 0) - goto error; + return -1; if (remoteConfigGetAuth(conf, filename, "auth_tls", &data->auth_tls) < 0) - goto error; + return -1; #endif /* ! WITH_IP */ if (virConfGetValueStringList(conf, "access_drivers", false, &data->access_drivers) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "unix_sock_group", &data->unix_sock_group) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "unix_sock_admin_perms", &data->unix_sock_admin_perms) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "unix_sock_ro_perms", &data->unix_sock_ro_perms) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "unix_sock_rw_perms", &data->unix_sock_rw_perms) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "unix_sock_dir", &data->unix_sock_dir) < 0) - goto error; + return -1; #ifdef WITH_IP if (virConfGetValueBool(conf, "tls_no_sanity_certificate", &data->tls_no_sanity_certificate) < 0) - goto error; + return -1; if (virConfGetValueBool(conf, "tls_no_verify_certificate", &data->tls_no_verify_certificate) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "key_file", &data->key_file) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "cert_file", &data->cert_file) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "ca_file", &data->ca_file) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "crl_file", &data->crl_file) < 0) - goto error; + return -1; if (virConfGetValueStringList(conf, "tls_allowed_dn_list", false, &data->tls_allowed_dn_list) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) < 0) - goto error; + return -1; #endif /* ! WITH_IP */ if (virConfGetValueStringList(conf, "sasl_allowed_username_list", false, &data->sasl_allowed_username_list) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "min_workers", &data->min_workers) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "max_workers", &data->max_workers) < 0) - goto error; + return -1; if (data->max_workers < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'max_workers' must be greater than 0")); - goto error; + return -1; } if (virConfGetValueUInt(conf, "max_clients", &data->max_clients) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "max_queued_clients", &data->max_queued_clients) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "max_anonymous_clients", &data->max_anonymous_clients) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "prio_workers", &data->prio_workers) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "max_client_requests", &data->max_client_requests) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_min_workers", &data->admin_min_workers) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_max_workers", &data->admin_max_workers) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_max_clients", &data->admin_max_clients) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_max_queued_clients", &data->admin_max_queued_clients) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_max_client_requests", &data->admin_max_client_requests) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "audit_level", &data->audit_level) < 0) - goto error; + return -1; if (virConfGetValueBool(conf, "audit_logging", &data->audit_logging) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "host_uuid", &data->host_uuid) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "host_uuid_source", &data->host_uuid_source) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "log_level", &data->log_level) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "log_filters", &data->log_filters) < 0) - goto error; + return -1; if (virConfGetValueString(conf, "log_outputs", &data->log_outputs) < 0) - goto error; + return -1; if (virConfGetValueInt(conf, "keepalive_interval", &data->keepalive_interval) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "keepalive_count", &data->keepalive_count) < 0) - goto error; + return -1; if (virConfGetValueInt(conf, "admin_keepalive_interval", &data->admin_keepalive_interval) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "admin_keepalive_count", &data->admin_keepalive_count) < 0) - goto error; + return -1; if (virConfGetValueUInt(conf, "ovs_timeout", &data->ovs_timeout) < 0) - goto error; + return -1; return 0; - - error: - return -1; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/hyperv/hyperv_wmi.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 7d56677588..ca2d29733e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -173,15 +173,15 @@ hypervCreateInvokeParamsList(hypervPrivate *priv, const char *method, hypervWmiClassInfoPtr info = NULL; if (hypervGetWmiClassInfo(priv, obj, &info) < 0) - goto cleanup; + return NULL; if (VIR_ALLOC(params) < 0) - goto cleanup; + return NULL; if (VIR_ALLOC_N(params->params, HYPERV_DEFAULT_PARAM_COUNT) < 0) { VIR_FREE(params); - goto cleanup; + return NULL; } params->method = method; @@ -191,7 +191,6 @@ hypervCreateInvokeParamsList(hypervPrivate *priv, const char *method, params->nbParams = 0; params->nbAvailParams = HYPERV_DEFAULT_PARAM_COUNT; - cleanup: return params; } @@ -257,11 +256,10 @@ int hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *name, const char *value) { - int result = -1; hypervParamPtr p = NULL; if (hypervCheckParams(params) < 0) - goto cleanup; + return -1; p = ¶ms->params[params->nbParams]; p->type = HYPERV_SIMPLE_PARAM; @@ -271,10 +269,7 @@ hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *name, params->nbParams++; - result = 0; - - cleanup: - return result; + return 0; } /* -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/locking/lock_driver_lockd.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 339e2f6949..393154bb3c 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -140,7 +140,6 @@ virLockManagerLockDaemonConnectionRegister(virLockManagerPtr lock, { virLockManagerLockDaemonPrivatePtr priv = lock->privateData; virLockSpaceProtocolRegisterArgs args; - int rv = -1; memset(&args, 0, sizeof(args)); @@ -157,12 +156,9 @@ virLockManagerLockDaemonConnectionRegister(virLockManagerPtr lock, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLockSpaceProtocolRegisterArgs, (char*)&args, (xdrproc_t)xdr_void, NULL) < 0) - goto cleanup; - - rv = 0; + return -1; - cleanup: - return rv; + return 0; } @@ -173,7 +169,6 @@ virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock G_GNUC_UNUSED, int *counter) { virLockSpaceProtocolRestrictArgs args; - int rv = -1; memset(&args, 0, sizeof(args)); @@ -186,12 +181,9 @@ virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock G_GNUC_UNUSED, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLockSpaceProtocolRestrictArgs, (char*)&args, (xdrproc_t)xdr_void, NULL) < 0) - goto cleanup; - - rv = 0; + return -1; - cleanup: - return rv; + return 0; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/cpu/cpu_ppc64.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 818f1ec699..6b3590ab6a 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -81,7 +81,6 @@ ppc64CheckCompatibilityMode(const char *host_model, int host; int compat; char *tmp; - virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR; if (!compat_mode) return VIR_CPU_COMPARE_IDENTICAL; @@ -94,7 +93,7 @@ ppc64CheckCompatibilityMode(const char *host_model, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Host CPU does not support compatibility modes")); - goto out; + return VIR_CPU_COMPARE_ERROR; } /* Valid compatibility modes: power6, power7, power8, power9 */ @@ -105,17 +104,14 @@ ppc64CheckCompatibilityMode(const char *host_model, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown compatibility mode %s"), compat_mode); - goto out; + return VIR_CPU_COMPARE_ERROR; } /* Version check */ if (compat > host) - ret = VIR_CPU_COMPARE_INCOMPATIBLE; - else - ret = VIR_CPU_COMPARE_IDENTICAL; + return VIR_CPU_COMPARE_INCOMPATIBLE; - out: - return ret; + return VIR_CPU_COMPARE_IDENTICAL; } static void -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/lxc/lxc_container.c | 7 ++----- src/lxc/lxc_controller.c | 10 ++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 42ed08ede6..b44cc68e67 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -380,18 +380,15 @@ static int lxcContainerSetupFDs(int *ttyfd, */ int lxcContainerSendContinue(int control) { - int rc = -1; lxc_message_t msg = LXC_CONTINUE_MSG; int writeCount = 0; VIR_DEBUG("Send continue on fd %d", control); writeCount = safewrite(control, &msg, sizeof(msg)); if (writeCount != sizeof(msg)) - goto error_out; + return -1; - rc = 0; - error_out: - return rc; + return 0; } /** diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e572c3f5fd..42c631ed0b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1115,7 +1115,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol virReportSystemError(errno, "%s", _("Unable to add epoll fd")); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->hostEpoll = events; VIR_DEBUG("newHostEvents=%x oldHostEvents=%x", events, console->hostEpoll); @@ -1127,7 +1127,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol _("Unable to remove epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->hostEpoll = 0; } @@ -1153,7 +1153,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol _("Unable to add epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->contEpoll = events; VIR_DEBUG("newHostEvents=%x oldHostEvents=%x", events, console->contEpoll); @@ -1165,12 +1165,10 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol _("Unable to remove epoll fd")); VIR_DEBUG(":fail"); virNetDaemonQuit(console->daemon); - goto cleanup; + return; } console->contEpoll = 0; } - cleanup: - return; } -- 2.24.1
gather_scsi_host_cap() in node_device_hal.c can be greatly simplified, given that the 'out' label is always getting hit regardless of 'retval', which can also be eliminated. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/node_device/node_device_driver.c | 4 ++-- src/node_device/node_device_hal.c | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index ebcc9696af..b630be4399 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -572,13 +572,13 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn, int callbackID = -1; if (virConnectNodeDeviceEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState, device, eventID, callback, opaque, freecb, &callbackID) < 0) callbackID = -1; - cleanup: + return callbackID; } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index cf12854fe9..4cef7c2c12 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -232,17 +232,9 @@ static int gather_scsi_host_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { - int retval = 0; - (void)get_int_prop(ctx, udi, "scsi_host.host", (int *)&d->scsi_host.host); - retval = virNodeDeviceGetSCSIHostCaps(&d->scsi_host); - - if (retval == -1) - goto out; - - out: - return retval; + return virNodeDeviceGetSCSIHostCaps(&d->scsi_host); } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/secret/secret_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 096672f114..5a93c3af82 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -591,13 +591,13 @@ secretConnectSecretEventRegisterAny(virConnectPtr conn, int callbackID = -1; if (virConnectSecretEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virSecretEventStateRegisterID(conn, driver->secretEventState, secret, eventID, callback, opaque, freecb, &callbackID) < 0) - callbackID = -1; - cleanup: + return -1; + return callbackID; } -- 2.24.1
On Mon, Jan 06, 2020 at 06:57:38PM -0300, Daniel Henrique Barboza wrote:
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/secret/secret_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 096672f114..5a93c3af82 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -591,13 +591,13 @@ secretConnectSecretEventRegisterAny(virConnectPtr conn, int callbackID = -1;
if (virConnectSecretEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1;
if (virSecretEventStateRegisterID(conn, driver->secretEventState, secret, eventID, callback, opaque, freecb, &callbackID) < 0) - callbackID = -1;
Nitpick: inconsistent with the other driver equivalents. 'return -1' is okay, but let's just focus only on the label like the other patches did. Erik
- cleanup: + return -1; + return callbackID; }
-- 2.24.1
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/openvz/openvz_conf.c | 11 ++++------ src/openvz/openvz_driver.c | 42 +++++++++++++++----------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c4c6dec2f7..40a748351d 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -858,18 +858,15 @@ openvzLocateConfDir(void) { const char *conf_dir_list[] = {"/etc/vz/conf", "/usr/local/etc/conf", NULL}; size_t i = 0; - char *ret = NULL; while (conf_dir_list[i]) { - if (virFileExists(conf_dir_list[i])) { - ret = g_strdup(conf_dir_list[i]); - goto cleanup; - } + if (virFileExists(conf_dir_list[i])) + return g_strdup(conf_dir_list[i]); + i++; } - cleanup: - return ret; + return NULL; } /* Richard Steven's classic readline() function */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 0c472601d3..62644f3129 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1554,12 +1554,9 @@ openvzDomainSetMemoryInternal(virDomainObjPtr vm, openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) - goto cleanup; + return -1; return 0; - - cleanup: - return -1; } @@ -1641,7 +1638,6 @@ openvzDomainGetMemoryParameters(virDomainPtr domain, unsigned int flags) { size_t i; - int result = -1; const char *name; long kb_per_pages; unsigned long long barrier, limit, val; @@ -1650,7 +1646,7 @@ openvzDomainGetMemoryParameters(virDomainPtr domain, kb_per_pages = openvzKBPerPages(); if (kb_per_pages < 0) - goto cleanup; + return -1; if (*nparams == 0) { *nparams = OPENVZ_NB_MEM_PARAM; @@ -1664,44 +1660,42 @@ openvzDomainGetMemoryParameters(virDomainPtr domain, case 0: name = "privvmpages"; if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) - goto cleanup; + return -1; val = (limit == LONG_MAX) ? VIR_DOMAIN_MEMORY_PARAM_UNLIMITED : limit * kb_per_pages; if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_HARD_LIMIT, VIR_TYPED_PARAM_ULLONG, val) < 0) - goto cleanup; + return -1; break; case 1: name = "privvmpages"; if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) - goto cleanup; + return -1; val = (barrier == LONG_MAX) ? VIR_DOMAIN_MEMORY_PARAM_UNLIMITED : barrier * kb_per_pages; if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_SOFT_LIMIT, VIR_TYPED_PARAM_ULLONG, val) < 0) - goto cleanup; + return -1; break; case 2: name = "vmguarpages"; if (openvzDomainGetBarrierLimit(domain, name, &barrier, &limit) < 0) - goto cleanup; + return -1; val = (barrier == LONG_MAX) ? 0ull : barrier * kb_per_pages; if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, VIR_TYPED_PARAM_ULLONG, val) < 0) - goto cleanup; + return -1; break; } } if (*nparams > OPENVZ_NB_MEM_PARAM) *nparams = OPENVZ_NB_MEM_PARAM; - result = 0; - cleanup: - return result; + return 0; } @@ -1712,12 +1706,11 @@ openvzDomainSetMemoryParameters(virDomainPtr domain, unsigned int flags) { size_t i; - int result = -1; long kb_per_pages; kb_per_pages = openvzKBPerPages(); if (kb_per_pages < 0) - goto cleanup; + return -1; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, @@ -1737,29 +1730,28 @@ openvzDomainSetMemoryParameters(virDomainPtr domain, if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (openvzDomainGetBarrierLimit(domain, "privvmpages", &barrier, &limit) < 0) - goto cleanup; + return -1; limit = params[i].value.ul / kb_per_pages; if (openvzDomainSetBarrierLimit(domain, "privvmpages", barrier, limit) < 0) - goto cleanup; + return -1; } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { if (openvzDomainGetBarrierLimit(domain, "privvmpages", &barrier, &limit) < 0) - goto cleanup; + return -1; barrier = params[i].value.ul / kb_per_pages; if (openvzDomainSetBarrierLimit(domain, "privvmpages", barrier, limit) < 0) - goto cleanup; + return -1; } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { barrier = params[i].value.ul / kb_per_pages; if (openvzDomainSetBarrierLimit(domain, "vmguarpages", barrier, LONG_MAX) < 0) - goto cleanup; + return -1; } } - result = 0; - cleanup: - return result; + + return 0; } -- 2.24.1
This patch remove unneeded labels for the following files: qemu_capabilities.c qemu_domain_address.c qemu_hostdev.c qemu_hotplug.c qemu_migration_cookie.c qemu_migration_params.c Next patch will handle the remaining QEMU files that can be cleaned up. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_capabilities.c | 15 +++------ src/qemu/qemu_domain_address.c | 52 +++++++++++++++----------------- src/qemu/qemu_hostdev.c | 11 +++---- src/qemu/qemu_hotplug.c | 15 ++++----- src/qemu/qemu_migration_cookie.c | 10 +++--- src/qemu/qemu_migration_params.c | 11 +++---- 6 files changed, 47 insertions(+), 67 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0929fd3e28..da0c7a257f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -781,23 +781,22 @@ virQEMUCapsFindBinaryForArch(virArch hostarch, if (hostarch == VIR_ARCH_AARCH64 && guestarch == VIR_ARCH_ARMV7L) { archstr = virQEMUCapsArchToString(hostarch); if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) - goto out; + return ret; } /* First attempt: try the guest architecture as it is */ archstr = virQEMUCapsArchToString(guestarch); if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) - goto out; + return ret; /* Second attempt: try looking up by target instead */ target = virQEMUCapsFindTarget(hostarch, guestarch); if (target != guestarch) { archstr = virQEMUCapsArchToString(target); if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) - goto out; + return ret; } - out: return ret; } @@ -5013,13 +5012,11 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, qemuCaps->kvmSupportsNesting = virQEMUCapsKVMSupportsNesting(); } - cleanup: return qemuCaps; error: virObjectUnref(qemuCaps); - qemuCaps = NULL; - goto cleanup; + return NULL; } static void * @@ -5052,13 +5049,11 @@ virQEMUCapsLoadFile(const char *filename, if (virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename) < 0) goto error; - cleanup: return qemuCaps; error: virObjectUnref(qemuCaps); - qemuCaps = NULL; - goto cleanup; + return NULL; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b077240899..0e28ecf1d5 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1257,7 +1257,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, /* Only PCI host devices are subject to isolation */ if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { - goto skip; + return 0; } hostAddr = &hostdev->source.subsys.u.pci.addr; @@ -1265,7 +1265,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - goto skip; + return 0; /* The isolation group depends on the IOMMU group assigned by the host */ tmp = virPCIDeviceAddressGetIOMMUGroupNum(hostAddr); @@ -1275,7 +1275,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, "%04x:%02x:%02x.%x, device won't be isolated", hostAddr->domain, hostAddr->bus, hostAddr->slot, hostAddr->function); - goto skip; + return 0; } /* The isolation group for a host device is its IOMMU group, @@ -1301,13 +1301,13 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, * require us to isolate the guest device, so we can skip them */ if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK || virDomainNetResolveActualType(iface) != VIR_DOMAIN_NET_TYPE_HOSTDEV) { - goto skip; + return 0; } /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - goto skip; + return 0; /* Obtain a synthetic isolation group for the device, since at this * point in time we don't have access to the IOMMU group of the host @@ -1319,7 +1319,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, "configured to use hostdev-backed network '%s', " "device won't be isolated", iface->data.network.name); - goto skip; + return 0; } info->isolationGroup = tmp; @@ -1329,7 +1329,6 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, iface->data.network.name, info->isolationGroup); } - skip: return 0; } @@ -2131,7 +2130,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < 0) - goto error; + return -1; } } @@ -2142,7 +2141,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* Only support VirtIO-9p-pci so far. If that changes, * we might need to skip devices here */ if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->fss[i]->info) < 0) - goto error; + return -1; } /* Network interfaces */ @@ -2159,7 +2158,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } if (qemuDomainPCIAddressReserveNextAddr(addrs, &net->info) < 0) - goto error; + return -1; } /* Sound cards */ @@ -2177,7 +2176,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } if (qemuDomainPCIAddressReserveNextAddr(addrs, &sound->info) < 0) - goto error; + return -1; } /* Device controllers (SCSI, USB, but not IDE, FDC or CCID) */ @@ -2246,7 +2245,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveAddr(addrs, &addr, cont->info.pciConnectFlags, cont->info.isolationGroup) < 0) { - goto error; + return -1; } cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; @@ -2257,14 +2256,14 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveNextAddr(addrs, &cont->info, cont->info.pciConnectFlags, addr.function) < 0) { - goto error; + return -1; } cont->info.addr.pci.multi = addr.multi; } } else { if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < 0) - goto error; + return -1; } } @@ -2292,11 +2291,11 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '%s'"), virDomainDeviceAddressTypeToString(def->disks[i]->info.type)); - goto error; + return -1; } if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info) < 0) - goto error; + return -1; } /* Host PCI devices */ @@ -2320,7 +2319,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (qemuDomainPCIAddressReserveNextAddr(addrs, def->hostdevs[i]->info) < 0) - goto error; + return -1; } /* memballoon. the qemu driver only accepts virtio memballoon devices */ @@ -2328,7 +2327,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virDeviceInfoPCIAddressIsWanted(&def->memballoon->info)) { if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->memballoon->info) < 0) - goto error; + return -1; } /* the qemu driver only accepts virtio rng devices */ @@ -2337,7 +2336,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->rngs[i]->info) < 0) - goto error; + return -1; } /* A watchdog - check if it is a PCI device */ @@ -2345,7 +2344,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, def->watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB && virDeviceInfoPCIAddressIsWanted(&def->watchdog->info)) { if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->watchdog->info) < 0) - goto error; + return -1; } /* Video devices */ @@ -2358,7 +2357,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->info) < 0) - goto error; + return -1; } /* Shared Memory */ @@ -2367,7 +2366,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->shmems[i]->info) < 0) - goto error; + return -1; } for (i = 0; i < def->ninputs; i++) { if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO || @@ -2375,7 +2374,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->inputs[i]->info) < 0) - goto error; + return -1; } for (i = 0; i < def->nparallels; i++) { /* Nada - none are PCI based (yet) */ @@ -2388,7 +2387,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; if (qemuDomainPCIAddressReserveNextAddr(addrs, &chr->info) < 0) - goto error; + return -1; } for (i = 0; i < def->nchannels; i++) { /* Nada - none are PCI based (yet) */ @@ -2402,13 +2401,10 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->vsock->info) < 0) - goto error; + return -1; } return 0; - - error: - return -1; } diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6ab052724a..1774850640 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -243,17 +243,14 @@ qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int flags) { - int ret = -1; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; if (!qemuHostdevPreparePCIDevicesCheckSupport(hostdevs, nhostdevs, qemuCaps)) - goto out; + return -1; - ret = virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, - name, uuid, hostdevs, - nhostdevs, flags); - out: - return ret; + return virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, + name, uuid, hostdevs, + nhostdevs, flags); } int diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f2a9386433..31d455505b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2894,41 +2894,38 @@ qemuDomainAttachHostDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (qemuDomainAttachHostPCIDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: if (qemuDomainAttachHostUSBDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: if (qemuDomainAttachHostSCSIDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: if (qemuDomainAttachSCSIVHostDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: if (qemuDomainAttachMediatedDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hotplug is not supported for hostdev subsys type '%s'"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); - goto error; + return -1; } return 0; - - error: - return -1; } diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 9cfb08951c..299bf17c9e 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -971,14 +971,12 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) VIR_FREE(interfaces); - cleanup: return optr; error: VIR_FREE(interfaces); qemuMigrationCookieNetworkFree(optr); - optr = NULL; - goto cleanup; + return NULL; } @@ -1053,10 +1051,10 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt); if (!(ctxt->node = virXPathNode("./statistics", ctxt))) - goto cleanup; + return NULL; if (VIR_ALLOC(jobInfo) < 0) - goto cleanup; + return NULL; stats = &jobInfo->stats.mig; jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; @@ -1127,7 +1125,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) virXPathInt("string(./" VIR_DOMAIN_JOB_AUTO_CONVERGE_THROTTLE "[1])", ctxt, &stats->cpu_throttle_percentage); - cleanup: + return jobInfo; } diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index e6cf6b4b0b..9430ce1d00 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -480,14 +480,14 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params, virReportError(VIR_ERR_INVALID_ARG, _("Unsupported compression method '%s'"), params[i].value.s); - goto error; + return -1; } if (migParams->compMethods & (1ULL << method)) { virReportError(VIR_ERR_INVALID_ARG, _("Compression method '%s' is specified twice"), params[i].value.s); - goto error; + return -1; } migParams->compMethods |= 1ULL << method; @@ -514,14 +514,14 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params, !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_MT))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Turn multithread compression on to tune it")); - goto error; + return -1; } if (migParams->params[QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE].set && !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Turn xbzrle compression on to tune it")); - goto error; + return -1; } if (!migParams->compMethods && (flags & VIR_MIGRATE_COMPRESSED)) { @@ -531,9 +531,6 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params, } return 0; - - error: - return -1; } -- 2.24.1
This patch finishes cleaning up unneeded labels on the QEMU files. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/qemu/qemu_command.c | 93 +++++++++++++++++++---------------------- src/qemu/qemu_domain.c | 11 ++--- src/qemu/qemu_driver.c | 32 +++++--------- 3 files changed, 55 insertions(+), 81 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 11d3c29297..d0b1f34058 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1776,12 +1776,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, disk->detect_zeroes); if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) - goto error; + return NULL; if (!qemuDiskBusNeedsDriveArg(disk->bus)) { g_autofree char *drivealias = qemuAliasDiskDriveFromDisk(disk); if (!drivealias) - goto error; + return NULL; virBufferAddLit(&opt, "if=none"); virBufferAsprintf(&opt, ",id=%s", drivealias); @@ -1791,12 +1791,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported disk type '%s'"), disk->dst); - goto error; + return NULL; } /* if we are using -device this will be checked elsewhere */ if (qemuCheckDiskConfig(disk, qemuCaps) < 0) - goto error; + return NULL; virBufferAsprintf(&opt, "if=%s", virDomainDiskQEMUBusTypeToString(disk->bus)); @@ -1849,9 +1849,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, qemuBuildDiskThrottling(disk, &opt); return virBufferContentAndReset(&opt); - - error: - return NULL; } @@ -1941,20 +1938,20 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, int controllerModel; if (qemuCheckDiskConfig(disk, qemuCaps) < 0) - goto error; + return NULL; if (!qemuDomainCheckCCWS390AddressSupport(def, &disk->info, qemuCaps, disk->dst)) - goto error; + return NULL; if (disk->iothread && !qemuCheckIOThreads(def, disk)) - goto error; + return NULL; switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: if (disk->info.addr.drive.target != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for ide controller")); - goto error; + return NULL; } if (disk->wwn && @@ -1962,7 +1959,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting wwn for ide disk is not supported " "by this QEMU")); - goto error; + return NULL; } if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) @@ -1979,7 +1976,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_IDE, disk->info.addr.drive.controller))) - goto error; + return NULL; } virBufferAsprintf(&opt, ",bus=%s.%d,unit=%d", contAlias, @@ -1993,7 +1990,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support scsi-block for " "lun passthrough")); - goto error; + return NULL; } } @@ -2002,7 +1999,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting wwn for scsi disk is not supported " "by this QEMU")); - goto error; + return NULL; } /* Properties wwn, vendor and product were introduced in the @@ -2013,12 +2010,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting vendor or product for scsi disk is not " "supported by this QEMU")); - goto error; + return NULL; } controllerModel = qemuDomainFindSCSIControllerModel(def, &disk->info); if (controllerModel < 0) - goto error; + return NULL; if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); @@ -2038,21 +2035,21 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, scsiVPDDeviceId = g_strdup(disk->serial); } else { if (!(scsiVPDDeviceId = qemuAliasDiskDriveFromDisk(disk))) - goto error; + return NULL; } } } if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, disk->info.addr.drive.controller))) - goto error; + return NULL; if (controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { if (disk->info.addr.drive.target != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for controller " "model 'lsilogic'")); - goto error; + return NULL; } virBufferAsprintf(&opt, ",bus=%s.%d,scsi-id=%d", @@ -2065,7 +2062,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support target " "greater than 7")); - goto error; + return NULL; } if (disk->info.addr.drive.bus != 0 && @@ -2073,7 +2070,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU only supports both bus and " "unit equal to 0")); - goto error; + return NULL; } } @@ -2093,12 +2090,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->info.addr.drive.bus != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bus must be 0 for ide controller")); - goto error; + return NULL; } if (disk->info.addr.drive.target != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for ide controller")); - goto error; + return NULL; } if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) @@ -2116,7 +2113,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, disk->info.addr.drive.controller))) - goto error; + return NULL; } virBufferAsprintf(&opt, ",bus=%s.%d", contAlias, @@ -2126,7 +2123,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_VIRTIO: if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps, VIR_DOMAIN_DEVICE_DISK, disk) < 0) { - goto error; + return NULL; } if (disk->iothread) @@ -2152,17 +2149,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("num-queues property isn't supported by this " "QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&opt, ",num-queues=%u", disk->queues); } if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0) - goto error; + return NULL; if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0) - goto error; + return NULL; break; case VIR_DOMAIN_DISK_BUS_USB: @@ -2170,19 +2167,19 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected address type for usb disk")); - goto error; + return NULL; } if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support '-device " "usb-storage'")); - goto error; + return NULL; } virBufferAddLit(&opt, "usb-storage"); if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0) - goto error; + return NULL; break; case VIR_DOMAIN_DISK_BUS_FDC: @@ -2196,7 +2193,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported disk bus '%s' with device setup"), bus); - goto error; + return NULL; } if (disk->src->shared && @@ -2204,7 +2201,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAddLit(&opt, ",share-rw=on"); if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0) - goto error; + return NULL; if (backendAlias) virBufferAsprintf(&opt, ",drive=%s", backendAlias); @@ -2249,13 +2246,13 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support setting the " "removable flag of USB storage devices")); - goto error; + return NULL; } } } if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) - goto error; + return NULL; qemuBuildDiskFrontendAttributes(disk, &opt); @@ -2263,9 +2260,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); return virBufferContentAndReset(&opt); - - error: - return NULL; } char * @@ -3693,7 +3687,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (virDomainNetIsVirtioModel(net)) { if (qemuBuildVirtioDevStr(&buf, "virtio-net", qemuCaps, VIR_DOMAIN_DEVICE_NET, net) < 0) { - goto error; + return NULL; } usingVirtio = true; @@ -3723,12 +3717,12 @@ qemuBuildNicDevStr(virDomainDefPtr def, */ virReportEnumRangeError(virDomainNetVirtioTxModeType, net->driver.virtio.txmode); - goto error; + return NULL; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio-net-pci 'tx' option not supported in this QEMU binary")); - goto error; + return NULL; } } if (usingVirtio) { @@ -3804,7 +3798,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio rx_queue_size option is not supported with this QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } @@ -3812,7 +3806,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio tx_queue_size option is not supported with this QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); } @@ -3821,7 +3815,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("setting MTU is not supported with this QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu); } @@ -3832,19 +3826,16 @@ qemuBuildNicDevStr(virDomainDefPtr def, virMacAddrFormat(&net->mac, macaddr)); if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0) - goto error; + return NULL; if (qemuBuildRomStr(&buf, &net->info) < 0) - goto error; + return NULL; if (bootindex) virBufferAsprintf(&buf, ",bootindex=%u", bootindex); if (usingVirtio && qemuBuildVirtioOptionsStr(&buf, net->virtio, qemuCaps) < 0) - goto error; + return NULL; return virBufferContentAndReset(&buf); - - error: - return NULL; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 065c9e97a9..a4793ea51a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13113,7 +13113,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def, /* prefer the hard limit */ if (virMemoryLimitIsSet(def->mem.hard_limit)) { memKB = def->mem.hard_limit; - goto done; + return memKB << 10; } /* If the guest wants its memory to be locked, we need to raise the memory @@ -13161,7 +13161,6 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def, if (usesVFIO || forceVFIO) memKB = virDomainDefGetMemoryTotal(def) + 1024 * 1024; - done: return memKB << 10; } @@ -13188,7 +13187,6 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm, bool forceVFIO) { unsigned long long bytes = 0; - int ret = -1; bytes = qemuDomainGetMemLockLimitBytes(vm->def, forceVFIO); @@ -13210,12 +13208,9 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm, /* Trying to set the memory locking limit to zero is a no-op */ if (virProcessSetMaxMemLock(vm->pid, bytes) < 0) - goto out; - - ret = 0; + return -1; - out: - return ret; + return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae54c00239..398258fe0c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1916,7 +1916,7 @@ qemuDomainShutdownFlagsAgent(virQEMUDriverPtr driver, if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0) - goto cleanup; + return -1; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -1934,8 +1934,6 @@ qemuDomainShutdownFlagsAgent(virQEMUDriverPtr driver, endjob: qemuDomainObjEndAgentJob(vm); - - cleanup: return ret; } @@ -1951,7 +1949,7 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriverPtr driver, priv = vm->privateData; if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -1967,8 +1965,6 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriverPtr driver, endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: return ret; } @@ -6784,14 +6780,13 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def = def; *ret_data = data; - cleanup: return fd; error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) @@ -12620,7 +12615,6 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, { virQEMUDriverPtr driver = dconn->privateData; virDomainObjPtr vm; - virDomainPtr dom = NULL; virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); @@ -12629,24 +12623,21 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching name '%s'"), dname); qemuMigrationDstErrorReport(driver, dname); - goto cleanup; + return NULL; } if (virDomainMigrateFinish2EnsureACL(dconn, vm->def) < 0) { virDomainObjEndAPI(&vm); - goto cleanup; + return NULL; } /* Do not use cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - dom = qemuMigrationDstFinish(driver, dconn, vm, - NULL, 0, NULL, NULL, /* No cookies */ - flags, retcode, false); - - cleanup: - return dom; + return qemuMigrationDstFinish(driver, dconn, vm, + NULL, 0, NULL, NULL, /* No cookies */ + flags, retcode, false); } @@ -13260,7 +13251,6 @@ qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, unsigned *function) { virNodeDevCapsDefPtr cap; - int ret = -1; cap = def->caps; while (cap) { @@ -13278,12 +13268,10 @@ qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, if (!cap) { virReportError(VIR_ERR_INVALID_ARG, _("device %s is not a PCI device"), def->name); - goto out; + return -1; } - ret = 0; - out: - return ret; + return 0; } static int -- 2.24.1
On Mon, Jan 06, 2020 at 06:57:41PM -0300, Daniel Henrique Barboza wrote:
This patch finishes cleaning up unneeded labels on the QEMU files.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- I'll squash this into the previous patch.
Erik
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/vz/vz_sdk.c | 102 ++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 65 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c98542c244..b8ac055574 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1036,16 +1036,15 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) PRL_UINT32 emulatedType; PRL_RESULT pret; PRL_BOOL isConnected, isMacFilter; - int ret = -1; /* use device name, shown by prlctl as target device * for identifying network adapter in virDomainDefineXML */ if (!(net->ifname = prlsdkGetStringParamVar(PrlVmDevNet_GetHostInterfaceName, netAdapter))) - goto cleanup; + return -1; pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); if (isCt && netAdapterIndex == (PRL_UINT32) -1) { /* venet devices don't have mac address and @@ -1058,19 +1057,19 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) pret = prlsdkGetStringParamBuf(PrlVmDevNet_GetMacAddressCanonical, netAdapter, macstr, sizeof(macstr)); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); if (virMacAddrParse(macstr, &net->mac) < 0) - goto cleanup; + return -1; if (prlsdkGetNetAddresses(netAdapter, net) < 0) - goto cleanup; + return -1; if (prlsdkGetRoutes(netAdapter, net) < 0) - goto cleanup; + return -1; pret = PrlVmDev_GetEmulatedType(netAdapter, &emulatedType); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); if (emulatedType == PNA_ROUTED) { net->type = VIR_DOMAIN_NET_TYPE_NETWORK; @@ -1094,7 +1093,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) if (!isCt) { PRL_VM_NET_ADAPTER_TYPE type; pret = PrlVmDevNet_GetAdapterType(netAdapter, &type); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); switch ((int)type) { case PNT_RTL: @@ -1109,12 +1108,12 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown adapter type: %X"), type); - goto cleanup; + return -1; } } pret = PrlVmDev_IsConnected(netAdapter, &isConnected); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); if (isConnected) net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; @@ -1122,14 +1121,12 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; pret = PrlVmDevNet_IsPktFilterPreventMacSpoof(netAdapter, &isMacFilter); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); net->trustGuestRxFilters = isMacFilter ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -1296,29 +1293,27 @@ prlsdkAddDomainHardware(vzDriverPtr driver, { if (IS_CT(def)) { if (prlsdkAddDomainVideoInfoCt(def, xmlopt) < 0) - goto error; + return -1; } else { if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0) - goto error; + return -1; } if (prlsdkAddDomainHardDisksInfo(driver, sdkdom, def) < 0) - goto error; + return -1; if (prlsdkAddDomainOpticalDisksInfo(driver, sdkdom, def) < 0) - goto error; + return -1; if (prlsdkAddDomainNetInfo(sdkdom, def) < 0) - goto error; + return -1; if (prlsdkAddSerialInfo(sdkdom, &def->serials, &def->nserials) < 0) - goto error; + return -1; return 0; - error: - return -1; } @@ -1507,7 +1502,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainDefPtr def) PRL_RESULT pret; pret = PrlVmCfg_GetVmType(sdkdom, &domainType); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); switch (domainType) { case PVT_VM: @@ -1524,9 +1519,6 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainDefPtr def) } return 0; - - error: - return -1; } static int @@ -1536,7 +1528,7 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDefPtr def) PRL_CPU_MODE cpuMode; pret = PrlVmCfg_GetCpuMode(sdkdom, &cpuMode); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); switch (cpuMode) { case PCM_CPU_MODE_32: @@ -1552,8 +1544,6 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDefPtr def) } return 0; - error: - return -1; } static PRL_HANDLE @@ -2741,19 +2731,16 @@ prlsdkRemoveBootDevices(PRL_HANDLE sdkdom) /* always get device by index 0, because device list resort after delete */ pret = PrlVmCfg_GetBootDev(sdkdom, 0, &dev); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); pret = PrlBootDev_GetType(dev, &devType); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); pret = PrlBootDev_Remove(dev); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); } return 0; - - error: - return -1; } static int @@ -3039,7 +3026,6 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, { virDomainGraphicsListenDefPtr glisten; PRL_RESULT pret; - int ret = -1; if (!gr) { pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_DISABLED); @@ -3052,23 +3038,21 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, if (gr->data.vnc.autoport) { pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_AUTO); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); } else { pret = PrlVmCfg_SetVNCMode(sdkdom, PRD_MANUAL); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); pret = PrlVmCfg_SetVNCPort(sdkdom, gr->data.vnc.port); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); } glisten = virDomainGraphicsGetListen(gr, 0); pret = PrlVmCfg_SetVNCHostName(sdkdom, glisten && glisten->address ? glisten->address : VIR_LOOPBACK_IPV4_ADDR); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetExit(pret, -1); - ret = 0; - cleanup: - return ret; + return 0; } static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDomainDefPtr def) @@ -3087,11 +3071,9 @@ static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDomainDefP return -1; pret = PrlVmCfg_SetVideoRamSize(sdkdom, def->videos[0]->vram >> 10); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); return 0; - error: - return -1; } static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDomainChrDefPtr chr) @@ -4524,13 +4506,12 @@ prlsdkGetMemoryStats(PRL_HANDLE sdkstats, virDomainMemoryStatPtr stats, unsigned int nr_stats) { - int ret = -1; long long v = 0, t = 0, u = 0; size_t i = 0; #define PRLSDK_GET_COUNTER(NAME, VALUE) \ if (prlsdkExtractStatsParam(sdkstats, NAME, &VALUE) < 0) \ - goto cleanup; \ + return -1; \ #define PRLSDK_MEMORY_STAT_SET(TAG, VALUE) \ if (i < nr_stats) { \ @@ -4574,10 +4555,7 @@ prlsdkGetMemoryStats(PRL_HANDLE sdkstats, #undef PRLSDK_GET_COUNTER #undef PRLSDK_MEMORY_STAT_SET - ret = i; - cleanup: - - return ret; + return i; } /* memsize is in MiB */ @@ -4589,19 +4567,16 @@ int prlsdkSetMemsize(virDomainObjPtr dom, unsigned int memsize) job = PrlVm_BeginEdit(privdom->sdkdom); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; pret = PrlVmCfg_SetRamSize(privdom->sdkdom, memsize); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); job = PrlVm_CommitEx(privdom->sdkdom, 0); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; return 0; - - error: - return -1; } static long long @@ -4861,19 +4836,16 @@ int prlsdkSetCpuCount(virDomainObjPtr dom, unsigned int count) job = PrlVm_BeginEdit(privdom->sdkdom); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; pret = PrlVmCfg_SetCpuCount(privdom->sdkdom, count); - prlsdkCheckRetGoto(pret, error); + prlsdkCheckRetExit(pret, -1); job = PrlVm_CommitEx(privdom->sdkdom, 0); if (PRL_FAILED(waitDomainJob(job, dom))) - goto error; + return -1; return 0; - - error: - return -1; } int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/vbox/vbox_MSCOMGlue.c | 11 +++++------ src/vbox/vbox_snapshot_conf.c | 9 +++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 18a291a0d8..5cc3f5c7c8 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -357,24 +357,24 @@ vboxLookupRegistryValue(HKEY key, const char *keyName, const char *valueName) if (status != ERROR_SUCCESS) { VIR_ERROR(_("Could not query registry value '%s\\%s'"), keyName, valueName); - goto cleanup; + return NULL; } if (type != REG_SZ) { VIR_ERROR(_("Registry value '%s\\%s' has unexpected type"), keyName, valueName); - goto cleanup; + return NULL; } if (length < 2) { VIR_ERROR(_("Registry value '%s\\%s' is too short"), keyName, valueName); - goto cleanup; + return NULL; } /* +1 for the null-terminator if it's missing */ if (VIR_ALLOC_N(value, length + 1) < 0) - goto cleanup; + return NULL; status = RegQueryValueEx(key, valueName, NULL, NULL, (LPBYTE)value, &length); @@ -382,13 +382,12 @@ vboxLookupRegistryValue(HKEY key, const char *keyName, const char *valueName) VIR_FREE(value); VIR_ERROR(_("Could not query registry value '%s\\%s'"), keyName, valueName); - goto cleanup; + return NULL; } if (value[length - 1] != '\0') value[length] = '\0'; - cleanup: return value; } diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index db6c389a64..4cd4e3a983 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -1228,23 +1228,20 @@ virVBoxSnapshotConfIsCurrentSnapshot(virVBoxSnapshotConfMachinePtr machine, if (machine == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Machine is null")); - goto cleanup; + return 0; } if (snapshotName == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("snapshotName is null")); - goto cleanup; + return 0; } snapshot = virVBoxSnapshotConfSnapshotByName(machine->snapshot, snapshotName); if (snapshot == NULL) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, _("Unable to find the snapshot %s"), snapshotName); - goto cleanup; + return 0; } return STREQ(snapshot->uuid, machine->currentSnapshot); - - cleanup: - return 0; } /* -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/security/security_dac.c | 26 ++++++++++----------- src/security/security_selinux.c | 26 ++++++++++----------- src/security/virt-aa-helper.c | 41 ++++++++++++++------------------- 3 files changed, 41 insertions(+), 52 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index ccd3874897..2561ee440e 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1238,7 +1238,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, return 0; if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot))) - goto done; + return -1; ret = virUSBDeviceFileIterate(usb, virSecurityDACSetUSBLabel, @@ -1253,14 +1253,14 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, pcisrc->addr.slot, pcisrc->addr.function); if (!pci) - goto done; + return -1; if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); if (!vfioGroupDev) { virPCIDeviceFree(pci); - goto done; + return -1; } ret = virSecurityDACSetPCILabel(pci, vfioGroupDev, &cbdata); VIR_FREE(vfioGroupDev); @@ -1283,7 +1283,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, dev->readonly, dev->shareable); if (!scsi) - goto done; + return -1; ret = virSCSIDeviceFileIterate(scsi, virSecurityDACSetSCSILabel, @@ -1297,7 +1297,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, virSCSIVHostDevicePtr host = virSCSIVHostDeviceNew(hostsrc->wwpn); if (!host) - goto done; + return -1; ret = virSCSIVHostDeviceFileIterate(host, virSecurityDACSetHostLabel, @@ -1310,7 +1310,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, char *vfiodev = NULL; if (!(vfiodev = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr))) - goto done; + return -1; ret = virSecurityDACSetHostdevLabelHelper(vfiodev, &cbdata); @@ -1323,7 +1323,6 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, break; } - done: return ret; } @@ -1407,7 +1406,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, return 0; if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, vroot))) - goto done; + return -1; ret = virUSBDeviceFileIterate(usb, virSecurityDACRestoreUSBLabel, mgr); virUSBDeviceFree(usb); @@ -1421,14 +1420,14 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, pcisrc->addr.slot, pcisrc->addr.function); if (!pci) - goto done; + return -1; if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); if (!vfioGroupDev) { virPCIDeviceFree(pci); - goto done; + return -1; } ret = virSecurityDACRestorePCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); @@ -1448,7 +1447,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, dev->readonly, dev->shareable); if (!scsi) - goto done; + return -1; ret = virSCSIDeviceFileIterate(scsi, virSecurityDACRestoreSCSILabel, mgr); virSCSIDeviceFree(scsi); @@ -1460,7 +1459,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, virSCSIVHostDevicePtr host = virSCSIVHostDeviceNew(hostsrc->wwpn); if (!host) - goto done; + return -1; ret = virSCSIVHostDeviceFileIterate(host, virSecurityDACRestoreHostLabel, @@ -1474,7 +1473,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, char *vfiodev = NULL; if (!(vfiodev = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr))) - goto done; + return -1; ret = virSecurityDACRestoreFileLabel(mgr, vfiodev); VIR_FREE(vfiodev); @@ -1486,7 +1485,6 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, break; } - done: return ret; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 32dc78d777..3a43c4ca7d 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2094,7 +2094,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, usbsrc->device, vroot); if (!usb) - goto done; + return -1; ret = virUSBDeviceFileIterate(usb, virSecuritySELinuxSetUSBLabel, &data); virUSBDeviceFree(usb); @@ -2107,14 +2107,14 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, pcisrc->addr.slot, pcisrc->addr.function); if (!pci) - goto done; + return -1; if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); if (!vfioGroupDev) { virPCIDeviceFree(pci); - goto done; + return -1; } ret = virSecuritySELinuxSetPCILabel(pci, vfioGroupDev, &data); VIR_FREE(vfioGroupDev); @@ -2135,7 +2135,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, dev->readonly, dev->shareable); if (!scsi) - goto done; + return -1; ret = virSCSIDeviceFileIterate(scsi, virSecuritySELinuxSetSCSILabel, @@ -2149,7 +2149,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, virSCSIVHostDevicePtr host = virSCSIVHostDeviceNew(hostsrc->wwpn); if (!host) - goto done; + return -1; ret = virSCSIVHostDeviceFileIterate(host, virSecuritySELinuxSetHostLabel, @@ -2162,7 +2162,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, char *vfiodev = NULL; if (!(vfiodev = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr))) - goto done; + return ret; ret = virSecuritySELinuxSetHostdevLabelHelper(vfiodev, &data); @@ -2175,7 +2175,6 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, break; } - done: return ret; } @@ -2332,7 +2331,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, usbsrc->device, vroot); if (!usb) - goto done; + return -1; ret = virUSBDeviceFileIterate(usb, virSecuritySELinuxRestoreUSBLabel, mgr); virUSBDeviceFree(usb); @@ -2346,14 +2345,14 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, pcisrc->addr.slot, pcisrc->addr.function); if (!pci) - goto done; + return -1; if (pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci); if (!vfioGroupDev) { virPCIDeviceFree(pci); - goto done; + return -1; } ret = virSecuritySELinuxRestorePCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); @@ -2373,7 +2372,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, dev->readonly, dev->shareable); if (!scsi) - goto done; + return -1; ret = virSCSIDeviceFileIterate(scsi, virSecuritySELinuxRestoreSCSILabel, mgr); virSCSIDeviceFree(scsi); @@ -2385,7 +2384,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, virSCSIVHostDevicePtr host = virSCSIVHostDeviceNew(hostsrc->wwpn); if (!host) - goto done; + return -1; ret = virSCSIVHostDeviceFileIterate(host, virSecuritySELinuxRestoreHostLabel, @@ -2399,7 +2398,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, char *vfiodev = NULL; if (!(vfiodev = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr))) - goto done; + return -1; ret = virSecuritySELinuxRestoreFileLabel(mgr, vfiodev, true); @@ -2412,7 +2411,6 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, break; } - done: return ret; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2b1d199458..e01ec12d09 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -546,27 +546,24 @@ verify_xpath_context(xmlXPathContextPtr ctxt) if (!ctxt) { vah_warning(_("Invalid context")); - goto error; + return -1; } /* check if have <name> */ if (!(tmp = virXPathString("string(./name[1])", ctxt))) { vah_warning(_("Could not find <name>")); - goto error; + return -1; } VIR_FREE(tmp); /* check if have <uuid> */ if (!(tmp = virXPathString("string(./uuid[1])", ctxt))) { vah_warning(_("Could not find <uuid>")); - goto error; + return -1; } VIR_FREE(tmp); - rc = 0; - - error: - return rc; + return 0; } /* @@ -636,7 +633,7 @@ virDomainDefParserConfig virAAHelperDomainDefParserConfig = { static int get_definition(vahControl * ctl, const char *xmlStr) { - int rc = -1, ostype, virtType; + int ostype, virtType; virCapsGuestPtr guest; /* this is freed when caps is freed */ /* @@ -644,22 +641,22 @@ get_definition(vahControl * ctl, const char *xmlStr) * but need them for virDomainDefParseString(). */ if (caps_mockup(ctl, xmlStr) != 0) - goto exit; + return -1; if ((ctl->caps = virCapabilitiesNew(ctl->arch, true, true)) == NULL) { vah_error(ctl, 0, _("could not allocate memory")); - goto exit; + return -1; } if (!(ctl->xmlopt = virDomainXMLOptionNew(&virAAHelperDomainDefParserConfig, NULL, NULL, NULL, NULL))) { vah_error(ctl, 0, _("Failed to create XML config object")); - goto exit; + return -1; } if ((ostype = virDomainOSTypeFromString(ctl->os)) < 0) { vah_error(ctl, 0, _("unknown OS type")); - goto exit; + return -1; } if ((guest = virCapabilitiesAddGuest(ctl->caps, @@ -670,12 +667,12 @@ get_definition(vahControl * ctl, const char *xmlStr) 0, NULL)) == NULL) { vah_error(ctl, 0, _("could not allocate memory")); - goto exit; + return -1; } if ((virtType = virDomainVirtTypeFromString(ctl->virtType)) < 0) { vah_error(ctl, 0, _("unknown virtualization type")); - goto exit; + return -1; } if (virCapabilitiesAddGuestDomain(guest, @@ -685,7 +682,7 @@ get_definition(vahControl * ctl, const char *xmlStr) 0, NULL) == NULL) { vah_error(ctl, 0, _("could not allocate memory")); - goto exit; + return -1; } ctl->def = virDomainDefParseString(xmlStr, @@ -695,23 +692,20 @@ get_definition(vahControl * ctl, const char *xmlStr) if (ctl->def == NULL) { vah_error(ctl, 0, _("could not parse XML")); - goto exit; + return -1; } if (!ctl->def->name) { vah_error(ctl, 0, _("could not find name in XML")); - goto exit; + return -1; } if (valid_name(ctl->def->name) != 0) { vah_error(ctl, 0, _("bad name")); - goto exit; + return -1; } - rc = 0; - - exit: - return rc; + return 0; } /** @@ -854,11 +848,10 @@ vah_add_file_chardev(virBufferPtr buf, } else { /* add the file */ if (vah_add_file(buf, path, perms) != 0) - goto cleanup; + return -1; rc = 0; } - cleanup: return rc; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/util/virsysinfo.c | 54 ++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index e5af4f25e0..c526c0322f 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -1478,7 +1478,7 @@ virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ _("Target sysinfo %s %s does not match source %s"), \ desc, NULLSTR(dst->name), NULLSTR(src->name)); \ - goto cleanup; \ + return false; \ } \ } while (0) @@ -1486,15 +1486,13 @@ static bool virSysinfoBIOSIsEqual(virSysinfoBIOSDefPtr src, virSysinfoBIOSDefPtr dst) { - bool identical = false; - if (!src && !dst) return true; if ((src && !dst) || (!src && dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target sysinfo does not match source")); - goto cleanup; + return false; } CHECK_FIELD(vendor, "BIOS vendor"); @@ -1502,24 +1500,20 @@ virSysinfoBIOSIsEqual(virSysinfoBIOSDefPtr src, CHECK_FIELD(date, "BIOS date"); CHECK_FIELD(release, "BIOS release"); - identical = true; - cleanup: - return identical; + return true; } static bool virSysinfoSystemIsEqual(virSysinfoSystemDefPtr src, virSysinfoSystemDefPtr dst) { - bool identical = false; - if (!src && !dst) return true; if ((src && !dst) || (!src && dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target sysinfo does not match source")); - goto cleanup; + return false; } CHECK_FIELD(manufacturer, "system vendor"); @@ -1530,24 +1524,20 @@ virSysinfoSystemIsEqual(virSysinfoSystemDefPtr src, CHECK_FIELD(sku, "system sku"); CHECK_FIELD(family, "system family"); - identical = true; - cleanup: - return identical; + return true; } static bool virSysinfoBaseBoardIsEqual(virSysinfoBaseBoardDefPtr src, virSysinfoBaseBoardDefPtr dst) { - bool identical = false; - if (!src && !dst) return true; if ((src && !dst) || (!src && dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target base board does not match source")); - goto cleanup; + return false; } CHECK_FIELD(manufacturer, "base board vendor"); @@ -1557,9 +1547,7 @@ virSysinfoBaseBoardIsEqual(virSysinfoBaseBoardDefPtr src, CHECK_FIELD(asset, "base board asset"); CHECK_FIELD(location, "base board location"); - identical = true; - cleanup: - return identical; + return true; } @@ -1567,15 +1555,13 @@ static bool virSysinfoChassisIsEqual(virSysinfoChassisDefPtr src, virSysinfoChassisDefPtr dst) { - bool identical = false; - if (!src && !dst) return true; if ((src && !dst) || (!src && dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target chassis does not match source")); - goto cleanup; + return false; } CHECK_FIELD(manufacturer, "chassis vendor"); @@ -1584,9 +1570,7 @@ virSysinfoChassisIsEqual(virSysinfoChassisDefPtr src, CHECK_FIELD(asset, "chassis asset"); CHECK_FIELD(sku, "chassis sku"); - identical = true; - cleanup: - return identical; + return true; } @@ -1595,7 +1579,6 @@ virSysinfoChassisIsEqual(virSysinfoChassisDefPtr src, bool virSysinfoIsEqual(virSysinfoDefPtr src, virSysinfoDefPtr dst) { - bool identical = false; size_t i; if (!src && !dst) @@ -1604,7 +1587,7 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, if ((src && !dst) || (!src && dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target sysinfo does not match source")); - goto cleanup; + return false; } if (src->type != dst->type) { @@ -1612,32 +1595,29 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, _("Target sysinfo %s does not match source %s"), virSysinfoTypeToString(dst->type), virSysinfoTypeToString(src->type)); - goto cleanup; + return false; } if (!virSysinfoBIOSIsEqual(src->bios, dst->bios)) - goto cleanup; + return false; if (!virSysinfoSystemIsEqual(src->system, dst->system)) - goto cleanup; + return false; if (src->nbaseBoard != dst->nbaseBoard) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target sysinfo base board count '%zu' does not match source '%zu'"), dst->nbaseBoard, src->nbaseBoard); - goto cleanup; + return false; } for (i = 0; i < src->nbaseBoard; i++) if (!virSysinfoBaseBoardIsEqual(src->baseBoard + i, dst->baseBoard + i)) - goto cleanup; + return false; if (!virSysinfoChassisIsEqual(src->chassis, dst->chassis)) - goto cleanup; + return false; - identical = true; - - cleanup: - return identical; + return true; } -- 2.24.1
Remove unneeded labels of the following util files: virhostcpu.c virnetdevvportprofile.c virnetlink.c virpci.c virsocketaddr.c virstoragefile.c Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/util/virhostcpu.c | 6 ++-- src/util/virnetdevvportprofile.c | 52 ++++++++++++++------------------ src/util/virnetlink.c | 4 +-- src/util/virpci.c | 14 +++------ src/util/virsocketaddr.c | 11 ++----- src/util/virstoragefile.c | 4 +-- 6 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 22102f2c75..7f14340f49 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1119,7 +1119,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch) * In either case, falling back to the subcore-unaware thread * counting logic is the right thing to do */ if (!virFileExists(KVM_DEVICE)) - goto out; + return 0; if ((kvmfd = open(KVM_DEVICE, O_RDONLY)) < 0) { /* This can happen when running as a regular user if @@ -1129,8 +1129,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch) virReportSystemError(errno, _("Failed to open '%s'"), KVM_DEVICE); - threads_per_subcore = -1; - goto out; + return -1; } /* For Phyp and KVM based guests the ioctl for KVM_CAP_PPC_SMT @@ -1143,7 +1142,6 @@ virHostCPUGetThreadsPerSubcore(virArch arch) VIR_FORCE_CLOSE(kvmfd); } - out: return threads_per_subcore; } diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index c5db49b932..5ca96132c4 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -518,7 +518,6 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, bool is8021Qbg, uint16_t *status) { - int rc = -1; struct nlattr *tb_port[IFLA_PORT_MAX + 1] = { NULL, }; if (vf == PORT_SELF_VF && nltarget_kernel) { @@ -527,12 +526,12 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, ifla_port_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_PORT_SELF part")); - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IFLA_PORT_SELF is missing")); - goto cleanup; + return -1; } } else { if (tb[IFLA_VF_PORTS]) { @@ -546,14 +545,14 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error while iterating over " "IFLA_VF_PORTS part")); - goto cleanup; + return -1; } if (nla_parse_nested(tb_port, IFLA_PORT_MAX, tb_vf_ports, ifla_port_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_PORT part")); - goto cleanup; + return -1; } /* This ensures that the given VF is present in the @@ -601,7 +600,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_PORT " "during error reporting")); - goto cleanup; + return -1; } if (tb_port[IFLA_PORT_INSTANCE_UUID]) { virUUIDFormat((unsigned char *) @@ -613,31 +612,29 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, *(uint32_t *)RTA_DATA(tb_port[IFLA_PORT_VF]) : -1, uuidstr); } - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IFLA_VF_PORTS is missing")); - goto cleanup; + return -1; } } if (tb_port[IFLA_PORT_RESPONSE]) { *status = *(uint16_t *)RTA_DATA(tb_port[IFLA_PORT_RESPONSE]); - rc = 0; } else { if (is8021Qbg) { /* no in-progress here; may be missing */ *status = PORT_PROFILE_RESPONSE_INPROGRESS; - rc = 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no IFLA_PORT_RESPONSE found in netlink message")); - goto cleanup; + return -1; } } - cleanup: - return rc; + + return 0; } @@ -1051,7 +1048,6 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, enum virNetDevVPortProfileLinkOp virtPortOp, bool setlink_only) { - int rc = -1; int op = PORT_REQUEST_ASSOCIATE; struct ifla_port_vsi portVsi = { .vsi_mgr_id = virtPort->managerID, @@ -1069,7 +1065,7 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, if (virNetDevVPortProfileGetPhysdevAndVlan(ifname, &physdev_ifindex, physdev_ifname, &vlanid) < 0) { - goto cleanup; + return -1; } if (vlanid < 0) @@ -1095,22 +1091,20 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); - goto cleanup; + return -1; } - rc = virNetDevVPortProfileOpCommon(physdev_ifname, physdev_ifindex, - nltarget_kernel, - macaddr, - vlanid, - NULL, - &portVsi, - virtPort->instanceID, - NULL, - vf, - op, - setlink_only); - cleanup: - return rc; + return virNetDevVPortProfileOpCommon(physdev_ifname, physdev_ifindex, + nltarget_kernel, + macaddr, + vlanid, + NULL, + &portVsi, + virtPort->instanceID, + NULL, + vf, + op, + setlink_only); } /* Returns 0 on success, -1 on general failure, and -2 on timeout */ diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 2542703092..710b4f5f51 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -184,16 +184,14 @@ virNetlinkCreateSocket(int protocol) } nl_socket_enable_msg_peek(nlhandle); - cleanup: return nlhandle; error: if (nlhandle) { nl_close(nlhandle); virNetlinkFree(nlhandle); - nlhandle = NULL; } - goto cleanup; + return NULL; } static virNetlinkHandle * diff --git a/src/util/virpci.c b/src/util/virpci.c index 06d855a95b..0b1222373e 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2146,32 +2146,28 @@ virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf) { char *p = NULL; - int ret = -1; if ((address == NULL) || (logStrToLong_ui(address, &p, 16, &bdf->domain) == -1)) { - goto out; + return -1; } if ((p == NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->bus) == -1)) { - goto out; + return -1; } if ((p == NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->slot) == -1)) { - goto out; + return -1; } if ((p == NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->function) == -1)) { - goto out; + return -1; } - ret = 0; - - out: - return ret; + return 0; } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index ef51d3fa7d..f90022827e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1102,27 +1102,24 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, virSocketAddrPtr netmask, int family) { - int result = -1; - netmask->data.stor.ss_family = AF_UNSPEC; /* assume failure */ if (family == AF_INET) { int ip; if (prefix > 32) - goto error; + return -1; ip = prefix ? ~((1 << (32 - prefix)) - 1) : 0; netmask->data.inet4.sin_addr.s_addr = htonl(ip); netmask->data.stor.ss_family = AF_INET; netmask->len = sizeof(struct sockaddr_in); - result = 0; } else if (family == AF_INET6) { size_t i = 0; if (prefix > 128) - goto error; + return -1; while (prefix >= 8) { /* do as much as possible an entire byte at a time */ @@ -1140,11 +1137,9 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, } netmask->data.stor.ss_family = AF_INET6; netmask->len = sizeof(struct sockaddr_in6); - result = 0; } - error: - return result; + return 0; } /** diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c9f3e5f865..e46ac99219 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -533,14 +533,12 @@ qcow2GetExtensions(const char *buf, } case QCOW2_HDR_EXTENSION_END: - goto done; + return 0; } offset += len; } - done: - return 0; } -- 2.24.1
This patch remove the remaining unneeded labels in 'util' files: virnetdev.c virnetdevmacvlan.c virnetdevtap.c virtpm.c virtypedparam.c viruuid.c Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/util/virnetdev.c | 13 ++++--------- src/util/virnetdevmacvlan.c | 3 +-- src/util/virnetdevtap.c | 15 ++++++--------- src/util/virtpm.c | 5 ++--- src/util/virtypedparam.c | 14 ++++---------- src/util/viruuid.c | 13 +++++-------- 6 files changed, 22 insertions(+), 41 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 03e276a972..e2aad07c24 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -823,7 +823,6 @@ virNetDevGetRcvAllMulti(const char *ifname, char *virNetDevGetName(int ifindex) { char name[IFNAMSIZ]; - char *ifname = NULL; memset(&name, 0, sizeof(name)); @@ -831,13 +830,10 @@ char *virNetDevGetName(int ifindex) virReportSystemError(errno, _("Failed to convert interface index %d to a name"), ifindex); - goto cleanup; + return NULL; } - ifname = g_strdup(name); - - cleanup: - return ifname; + return g_strdup(name); } #else char *virNetDevGetName(int ifindex) @@ -1702,7 +1698,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, if (!tb[IFLA_VFINFO_LIST]) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing IFLA_VF_INFO in netlink response")); - goto cleanup; + return rc; } nla_for_each_nested(tb_vf_info, tb[IFLA_VFINFO_LIST], rem) { @@ -1713,7 +1709,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, ifla_vf_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_INFO")); - goto cleanup; + return rc; } if (mac && tb[IFLA_VF_MAC]) { @@ -1739,7 +1735,6 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, virReportError(VIR_ERR_INTERNAL_ERROR, _("couldn't find IFLA_VF_INFO for VF %d " "in netlink response"), vf); - cleanup: return rc; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 09efa04df1..3ca568fb44 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1156,7 +1156,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, linkdev, vmuuid, virtPortProfile, vmOp); if (rc < 0) - goto error; + return rc; ignore_value(virNetDevVPortProfileAssociate(cr_ifname, virtPortProfile, @@ -1166,7 +1166,6 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, vmuuid, vmOp, true)); - error: return rc; } diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index e3cf44c5cb..6a16b58d60 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -514,16 +514,16 @@ virNetDevTapAttachBridge(const char *tapname, */ if (mtu > 0) { if (virNetDevSetMTU(tapname, mtu) < 0) - goto error; + return -1; } else { if (virNetDevSetMTUFromDevice(tapname, brname) < 0) - goto error; + return -1; } if (actualMTU) { int retMTU = virNetDevGetMTU(tapname); if (retMTU < 0) - goto error; + return -1; *actualMTU = retMTU; } @@ -532,21 +532,18 @@ virNetDevTapAttachBridge(const char *tapname, if (virtPortProfile) { if (virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_MIDONET) { if (virNetDevMidonetBindPort(tapname, virtPortProfile) < 0) - goto error; + return -1; } else if (virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { if (virNetDevOpenvswitchAddPort(brname, tapname, macaddr, vmuuid, virtPortProfile, virtVlan) < 0) - goto error; + return -1; } } else { if (virNetDevBridgeAddPort(brname, tapname) < 0) - goto error; + return -1; } return 0; - - error: - return -1; } diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 97013f6a7d..505a4230dd 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -216,16 +216,15 @@ virTPMExecGetCaps(virCommandPtr cmd, continue; if (virBitmapSetBitExpand(bitmap, typ) < 0) - goto cleanup; + return bitmap; } - cleanup: return bitmap; error_bad_json: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected JSON format: %s"), outbuf); - goto cleanup; + return bitmap; } static virBitmapPtr diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index be3dac1571..d6103bdcb6 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -327,12 +327,12 @@ virTypedParamsReplaceString(virTypedParameterPtr *params, virReportError(VIR_ERR_INVALID_ARG, _("Parameter '%s' is not a string"), param->field); - goto error; + return -1; } old = param->value.s; } else { if (VIR_EXPAND_N(*params, n, 1) < 0) - goto error; + return -1; param = *params + n - 1; } @@ -342,15 +342,12 @@ virTypedParamsReplaceString(virTypedParameterPtr *params, VIR_TYPED_PARAM_STRING, str) < 0) { param->value.s = old; VIR_FREE(str); - goto error; + return -1; } VIR_FREE(old); *nparams = n; return 0; - - error: - return -1; } @@ -404,7 +401,7 @@ virTypedParamsFilter(virTypedParameterPtr params, size_t i, n = 0; if (VIR_ALLOC_N(*ret, nparams) < 0) - goto error; + return -1; for (i = 0; i < nparams; i++) { if (STREQ(params[i].field, name)) { @@ -414,9 +411,6 @@ virTypedParamsFilter(virTypedParameterPtr params, } return n; - - error: - return -1; } diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 0745189aa9..c8ee59beee 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -107,20 +107,20 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) for (i = 0; i < VIR_UUID_BUFLEN;) { uuid[i] = 0; if (*cur == 0) - goto error; + return -1; if ((*cur == '-') || (*cur == ' ')) { cur++; continue; } if (!g_ascii_isxdigit(*cur)) - goto error; + return -1; uuid[i] = virHexToBin(*cur); uuid[i] *= 16; cur++; if (*cur == 0) - goto error; + return -1; if (!g_ascii_isxdigit(*cur)) - goto error; + return -1; uuid[i] += virHexToBin(*cur); i++; cur++; @@ -128,14 +128,11 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) while (*cur) { if (!g_ascii_isspace(*cur)) - goto error; + return -1; cur++; } return 0; - - error: - return -1; } /** -- 2.24.1
On Mon, Jan 06, 2020 at 06:57:47PM -0300, Daniel Henrique Barboza wrote:
This patch remove the remaining unneeded labels in 'util' files:
virnetdev.c virnetdevmacvlan.c virnetdevtap.c virtpm.c virtypedparam.c viruuid.c
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> ---
I'd squash 21-23 together. Erik
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/logging/log_handler.c | 7 ++----- src/logging/log_manager.c | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 29ea3011b9..030c9d66e3 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -196,10 +196,10 @@ virLogHandlerNew(bool privileged, virLogHandlerPtr handler; if (virLogHandlerInitialize() < 0) - goto error; + return NULL; if (!(handler = virObjectLockableNew(virLogHandlerClass))) - goto error; + return NULL; handler->privileged = privileged; handler->max_size = max_size; @@ -208,9 +208,6 @@ virLogHandlerNew(bool privileged, handler->opaque = opaque; return handler; - - error: - return NULL; } diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index 6b66218116..fd7c2922b3 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -213,7 +213,6 @@ virLogManagerDomainGetLogFilePosition(virLogManagerPtr mgr, { struct virLogManagerProtocolDomainGetLogFilePositionArgs args; struct virLogManagerProtocolDomainGetLogFilePositionRet ret; - int rv = -1; memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); @@ -228,14 +227,12 @@ virLogManagerDomainGetLogFilePosition(virLogManagerPtr mgr, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLogManagerProtocolDomainGetLogFilePositionArgs, &args, (xdrproc_t)xdr_virLogManagerProtocolDomainGetLogFilePositionRet, &ret) < 0) - goto cleanup; + return -1; *inode = ret.pos.inode; *offset = ret.pos.offset; - rv = 0; - cleanup: - return rv; + return 0; } @@ -249,7 +246,6 @@ virLogManagerDomainReadLogFile(virLogManagerPtr mgr, { struct virLogManagerProtocolDomainReadLogFileArgs args; struct virLogManagerProtocolDomainReadLogFileRet ret; - char *rv = NULL; memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); @@ -267,11 +263,9 @@ virLogManagerDomainReadLogFile(virLogManagerPtr mgr, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLogManagerProtocolDomainReadLogFileArgs, &args, (xdrproc_t)xdr_virLogManagerProtocolDomainReadLogFileRet, &ret) < 0) - goto cleanup; + return NULL; - rv = ret.data; - cleanup: - return rv; + return ret.data; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- tests/qemumonitortestutils.c | 15 +++++---------- tests/testutilsqemu.c | 8 ++------ tests/virhostdevtest.c | 14 +++++--------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 617a2997d1..b29e5d8cd2 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1078,15 +1078,13 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, if (virNetSocketListen(test->server, 1) < 0) goto error; - cleanup: return test; error: VIR_FREE(path); VIR_FREE(tmpdir_template); qemuMonitorTestFree(test); - test = NULL; - goto cleanup; + return NULL; } @@ -1100,10 +1098,10 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test) return -1; if (virNetSocketAccept(test->server, &test->client) < 0) - goto error; + return -1; if (!test->client) - goto error; + return -1; if (test->outgoingLength > 0) events = VIR_EVENT_HANDLE_WRITABLE; @@ -1113,7 +1111,7 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test) qemuMonitorTestIO, test, NULL) < 0) - goto error; + return -1; virMutexLock(&test->lock); if (virThreadCreate(&test->thread, @@ -1121,15 +1119,12 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test) qemuMonitorTestWorker, test) < 0) { virMutexUnlock(&test->lock); - goto error; + return -1; } test->started = test->running = true; virMutexUnlock(&test->lock); return 0; - - error: - return -1; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8a4fdb1949..9db0cb44c6 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -449,10 +449,9 @@ testQemuCapsSetGIC(virQEMUCapsPtr qemuCaps, { virGICCapability *gicCapabilities = NULL; size_t ngicCapabilities = 0; - int ret = -1; if (VIR_ALLOC_N(gicCapabilities, 2) < 0) - goto out; + return -1; # define IMPL_BOTH \ VIR_GIC_IMPLEMENTATION_KERNEL|VIR_GIC_IMPLEMENTATION_EMULATED @@ -473,10 +472,7 @@ testQemuCapsSetGIC(virQEMUCapsPtr qemuCaps, virQEMUCapsSetGICCapabilities(qemuCaps, gicCapabilities, ngicCapabilities); - ret = 0; - - out: - return ret; + return 0; } #endif diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index b76b78eb56..b6260bd9c1 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -539,8 +539,6 @@ testVirHostdevOther(const void *opaque G_GNUC_UNUSED) static int testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) { - int ret = -1; - /* Don't rely on a state that previous test cases might have * left the manager in. Start with a clean slate. */ virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, @@ -552,7 +550,7 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) /* Firstly, attach all NVMe disks */ if (virHostdevPrepareNVMeDevices(mgr, drv_name, dom_name, disks, ndisks) < 0) - goto cleanup; + return -1; CHECK_NVME_LIST_COUNT(mgr->activeNVMeHostdevs, 3); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, 2); @@ -560,7 +558,7 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) /* Now, try to detach the first one. */ if (virHostdevReAttachNVMeDevices(mgr, drv_name, dom_name, disks, 1) < 0) - goto cleanup; + return -1; CHECK_NVME_LIST_COUNT(mgr->activeNVMeHostdevs, 2); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, 2); @@ -568,7 +566,7 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) /* And the last one */ if (virHostdevReAttachNVMeDevices(mgr, drv_name, dom_name, &disks[2], 1) < 0) - goto cleanup; + return -1; CHECK_NVME_LIST_COUNT(mgr->activeNVMeHostdevs, 1); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, 1); @@ -576,15 +574,13 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) /* Finally, detach the middle one */ if (virHostdevReAttachNVMeDevices(mgr, drv_name, dom_name, &disks[1], 1) < 0) - goto cleanup; + return -1; CHECK_NVME_LIST_COUNT(mgr->activeNVMeHostdevs, 0); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, 0); CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, 0); - ret = 0; - cleanup: - return ret; + return 0; } -- 2.24.1
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- examples/c/misc/hellolibvirt.c | 28 +++++++++------------------- examples/c/misc/openauth.c | 22 ++++++---------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/examples/c/misc/hellolibvirt.c b/examples/c/misc/hellolibvirt.c index bfb12846e6..a598e01be2 100644 --- a/examples/c/misc/hellolibvirt.c +++ b/examples/c/misc/hellolibvirt.c @@ -10,7 +10,6 @@ static int showHypervisorInfo(virConnectPtr conn) { - int ret = 0; unsigned long hvVer, major, minor, release; const char *hvType; @@ -20,17 +19,15 @@ showHypervisorInfo(virConnectPtr conn) * hypervisor, so check what it returns. */ hvType = virConnectGetType(conn); if (!hvType) { - ret = 1; printf("Failed to get hypervisor type: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } if (0 != virConnectGetVersion(conn, &hvVer)) { - ret = 1; printf("Failed to get hypervisor version: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } major = hvVer / 1000000; @@ -44,15 +41,14 @@ showHypervisorInfo(virConnectPtr conn) minor, release); - out: - return ret; + return 0; } static int showDomains(virConnectPtr conn) { - int ret = 0, numNames, numInactiveDomains, numActiveDomains; + int numNames, numInactiveDomains, numActiveDomains; ssize_t i; int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE | VIR_CONNECT_LIST_DOMAINS_INACTIVE; @@ -64,18 +60,16 @@ showDomains(virConnectPtr conn) * unexpected results */ numActiveDomains = virConnectNumOfDomains(conn); if (numActiveDomains == -1) { - ret = 1; printf("Failed to get number of active domains: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } numInactiveDomains = virConnectNumOfDefinedDomains(conn); if (numInactiveDomains == -1) { - ret = 1; printf("Failed to get number of inactive domains: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } printf("There are %d active and %d inactive domains\n", @@ -89,10 +83,9 @@ showDomains(virConnectPtr conn) &nameList, flags); if (numNames == -1) { - ret = 1; printf("Failed to get a list of all domains: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } for (i = 0; i < numNames; i++) { @@ -105,8 +98,7 @@ showDomains(virConnectPtr conn) } free(nameList); - out: - return ret; + return 0; } @@ -126,10 +118,9 @@ main(int argc, char *argv[]) conn = virConnectOpenAuth(uri, virConnectAuthPtrDefault, 0); if (!conn) { - ret = 1; printf("No connection to hypervisor: %s\n", virGetLastErrorMessage()); - goto out; + return 1; } uri = virConnectGetURI(conn); @@ -162,6 +153,5 @@ main(int argc, char *argv[]) printf("Disconnected from hypervisor\n"); } - out: return ret; } diff --git a/examples/c/misc/openauth.c b/examples/c/misc/openauth.c index efd21c374f..4c9dd34be3 100644 --- a/examples/c/misc/openauth.c +++ b/examples/c/misc/openauth.c @@ -16,7 +16,7 @@ showError(virConnectPtr conn) err = malloc(sizeof(*err)); if (err == NULL) { printf("Could not allocate memory for error data\n"); - goto out; + return; } ret = virConnCopyLastError(conn, err); @@ -37,16 +37,12 @@ showError(virConnectPtr conn) virResetError(err); free(err); - - out: - return; } static int showHypervisorInfo(virConnectPtr conn) { - int ret = 0; unsigned long hvVer, major, minor, release; const char *hvType; @@ -56,17 +52,15 @@ showHypervisorInfo(virConnectPtr conn) * hypervisor, so check what it returns. */ hvType = virConnectGetType(conn); if (hvType == NULL) { - ret = 1; printf("Failed to get hypervisor type\n"); showError(conn); - goto out; + return 1; } if (virConnectGetVersion(conn, &hvVer) != 0) { - ret = 1; printf("Failed to get hypervisor version\n"); showError(conn); - goto out; + return 1; } major = hvVer / 1000000; @@ -80,8 +74,7 @@ showHypervisorInfo(virConnectPtr conn) minor, release); - out: - return ret; + return 0; } @@ -227,9 +220,8 @@ main(int argc, char *argv[]) AuthData authData; if (argc != 4) { - ret = 1; printf("Usage: %s <uri> <username> <password>\n", argv[0]); - goto out; + return 1; } uri = argv[1]; @@ -242,10 +234,9 @@ main(int argc, char *argv[]) conn = virConnectOpenAuth(uri, &auth, 0); if (NULL == conn) { - ret = 1; printf("No connection to hypervisor\n"); showError(conn); - goto out; + return 1; } uri = virConnectGetURI(conn); @@ -278,6 +269,5 @@ main(int argc, char *argv[]) printf("Disconnected from hypervisor\n"); } - out: return ret; } -- 2.24.1
On Mon, Jan 06, 2020 at 06:57:24PM -0300, Daniel Henrique Barboza wrote:
Hi,
This is a follow up of a cleanup I did last year [1], which was more focused on 'cleanup' labels. In this one I covered all labels that are simply a 'return' proxy call.
This wasn't a 'purge all return labels' series. Some of them are still around in cases where they help the code flow (like Jano suggested in the review at [2], for example).
I divided the series by module and by amount of changes made to make it less daunting for reviews (although cases such as domain_conf.c couldn't be avoided without splitting changes in the same file in multiple patches). The maintainer is welcome to squash the patches up as needed.
Right, that's what I will do. Like I mentioned in 01/26, I can imagine more thorough Glib-ification of some of the patches, there are many candidates with a simple straightforward way to convert and thus drop even more labels, but it was never the intent of this series and as such these adjustments can be done at any point in time independently. Reviewed-by: Erik Skultety <eskultet@redhat.com>
On 1/7/20 8:55 AM, Erik Skultety wrote:
On Mon, Jan 06, 2020 at 06:57:24PM -0300, Daniel Henrique Barboza wrote:
Hi,
This is a follow up of a cleanup I did last year [1], which was more focused on 'cleanup' labels. In this one I covered all labels that are simply a 'return' proxy call.
This wasn't a 'purge all return labels' series. Some of them are still around in cases where they help the code flow (like Jano suggested in the review at [2], for example).
I divided the series by module and by amount of changes made to make it less daunting for reviews (although cases such as domain_conf.c couldn't be avoided without splitting changes in the same file in multiple patches). The maintainer is welcome to squash the patches up as needed.
Right, that's what I will do. Like I mentioned in 01/26, I can imagine more thorough Glib-ification of some of the patches, there are many candidates with a simple straightforward way to convert and thus drop even more labels, but it was never the intent of this series and as such these adjustments can be done at any point in time independently.
I did a couple of Glib-fications last year on some QEMU files. What happens is that the Glib-fication process ends up making more labels obsolete, then you can do an extra step to remove them. Doing this work together with this series is definitely possible, but it would produce an amount of patches/changes that would be too hard to review. Thanks, DHB
Reviewed-by: Erik Skultety <eskultet@redhat.com>
participants (2)
-
Daniel Henrique Barboza -
Erik Skultety