Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/conf/domain_addr.c | 23 +-- src/conf/domain_capabilities.c | 21 +- src/conf/domain_conf.c | 334 +++++++++++-------------------- src/conf/netdev_bandwidth_conf.c | 17 +- src/conf/network_conf.c | 25 +-- src/conf/node_device_conf.c | 28 +-- src/conf/numa_conf.c | 25 +-- src/conf/nwfilter_conf.c | 4 +- src/conf/storage_conf.c | 7 +- src/conf/virnetworkobj.c | 14 +- src/conf/virsecretobj.c | 5 +- 11 files changed, 180 insertions(+), 323 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index dd8e04576a..0e505b19c0 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1789,7 +1789,6 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, virDomainDeviceVirtioSerialAddress *addr, bool allowZero) { - int ret = -1; ssize_t port, startPort = 0; ssize_t i; unsigned int controller; @@ -1801,7 +1800,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, if (addrs->ncontrollers == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no virtio-serial controllers are available")); - goto cleanup; + return -1; } for (i = 0; i < addrs->ncontrollers; i++) { @@ -1818,7 +1817,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, if (idx == -1) { if (virDomainVirtioSerialAddrSetAutoaddController(def, addrs, i) < 0) - goto cleanup; + return -1; controller = i; port = startPort + 1; goto success; @@ -1829,8 +1828,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, virReportError(VIR_ERR_XML_ERROR, "%s", _("Unable to find a free virtio-serial port")); - cleanup: - return ret; + return -1; success: addr->bus = 0; @@ -1838,8 +1836,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, addr->controller = controller; VIR_DEBUG("Found free virtio serial controller %u port %u", addr->controller, addr->port); - ret = 0; - goto cleanup; + return 0; } static int @@ -1880,7 +1877,6 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, bool allowZero, bool portOnly) { - int ret = -1; virDomainDeviceInfo nfo = { 0 }; virDomainDeviceInfoPtr ptr = allowZero ? &nfo : info; @@ -1889,20 +1885,17 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, if (portOnly) { if (virDomainVirtioSerialAddrNextFromController(addrs, &ptr->addr.vioserial) < 0) - goto cleanup; + return -1; } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, allowZero) < 0) - goto cleanup; + return -1; } if (virDomainVirtioSerialAddrReserve(NULL, NULL, ptr, addrs) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } /* virDomainVirtioSerialAddrAutoAssign diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 3c4c7fd6d1..03d6ff141c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -288,7 +288,6 @@ virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, size_t nvalues, unsigned int *values) { - int ret = -1; size_t i; for (i = 0; i < nvalues; i++) { @@ -300,15 +299,13 @@ virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, _("integer overflow on %s. Please contact the " "libvirt development team at libvir-list(a)redhat.com&quot;), capsEnumName); - goto cleanup; + return -1; } capsEnum->values |= val; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -325,19 +322,15 @@ virDomainCapsEnumFormat(virBufferPtr buf, const char *capsEnumName, virDomainCapsValToStr valToStr) { - int ret = -1; size_t i; - if (!capsEnum->report) { - ret = 0; - goto cleanup; - } + if (!capsEnum->report) + return 0; virBufferAsprintf(buf, "<enum name='%s'", capsEnumName); if (!capsEnum->values) { virBufferAddLit(buf, "/>\n"); - ret = 0; - goto cleanup; + return 0; } virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); @@ -354,9 +347,7 @@ virDomainCapsEnumFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</enum>\n"); - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80e19a15df..c3d5dc46f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7072,7 +7072,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf, { g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) { virBufferAsprintf(buf, "<boot order='%u'", info->bootIndex); @@ -7115,11 +7114,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || - info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) /* We're done here */ - ret = 0; - goto cleanup; - } + return 0; virBufferAsprintf(&attrBuf, " type='%s'", virDomainDeviceAddressTypeToString(info->type)); @@ -7214,12 +7211,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if (virXMLFormatElement(buf, "address", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } static int @@ -8396,10 +8390,10 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, str = virXPathString("string(./rx/frames/@max)", ctxt); if (!str) - goto cleanup; + return NULL; if (VIR_ALLOC(ret) < 0) - goto cleanup; + return NULL; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, @@ -8417,12 +8411,11 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, } ret->rx_max_coalesced_frames = tmp; - cleanup: return ret; error: VIR_FREE(ret); - goto cleanup; + return NULL; } static void @@ -9837,7 +9830,6 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt, { xmlNodePtr private_node = virXPathNode("./privateData", ctxt); VIR_XPATH_NODE_AUTORESTORE(ctxt); - int ret = -1; if (!xmlopt || !xmlopt->privateData.diskParse || @@ -9847,12 +9839,9 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr ctxt, ctxt->node = private_node; if (xmlopt->privateData.diskParse(ctxt, disk) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -11309,7 +11298,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int ret = -1; int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cur; @@ -11323,7 +11311,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, virReportError(VIR_ERR_XML_ERROR, _("invalid reconnect enabled value: '%s'"), tmp); - goto cleanup; + return -1; } def->enabled = tmpVal; VIR_FREE(tmp); @@ -11335,20 +11323,18 @@ virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, virReportError(VIR_ERR_XML_ERROR, _("invalid reconnect timeout value: '%s'"), tmp); - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing timeout for chardev with " "reconnect enabled")); - goto cleanup; + return -1; } } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -12570,7 +12556,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, virSecurityLabelDefPtr* vmSeclabels, int nvmSeclabels) { - int ret = -1; bool logParsed = false; bool protocolParsed = false; int sourceParsed = 0; @@ -12685,13 +12670,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, } } - ret = 0; - cleanup: - return ret; + return 0; error: virDomainChrSourceDefClear(def); - goto cleanup; + return -1; } @@ -13886,7 +13869,6 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, VIR_XPATH_NODE_AUTORESTORE(ctxt); int enableVal; xmlNodePtr glNode; - int ret = -1; g_autofree char *fullscreen = virXMLPropString(node, "fullscreen"); g_autofree char *enable = NULL; @@ -13896,7 +13878,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, if (virStringParseYesNo(fullscreen, &def->data.sdl.fullscreen) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown fullscreen value '%s'"), fullscreen); - goto cleanup; + return -1; } } else { def->data.sdl.fullscreen = false; @@ -13911,21 +13893,19 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, if (!enable) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sdl gl element missing enable")); - goto cleanup; + return -1; } enableVal = virTristateBoolTypeFromString(enable); if (enableVal < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown enable value '%s'"), enable); - goto cleanup; + return -1; } def->data.sdl.gl = enableVal; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -14961,7 +14941,6 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, virSysinfoBaseBoardDefPtr *baseBoard, size_t *nbaseBoard) { - int ret = -1; size_t i, nboards = 0; VIR_XPATH_NODE_AUTORESTORE(ctxt); int n; @@ -14969,10 +14948,10 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *nodes = NULL; if ((n = virXPathNodeSet("./baseBoard", ctxt, &nodes)) < 0) - return ret; + return -1; if (n && VIR_ALLOC_N(boards, n) < 0) - goto cleanup; + return -1; for (i = 0; i < n; i++) { virSysinfoBaseBoardDefPtr def = boards + nboards; @@ -15002,9 +14981,8 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, *baseBoard = g_steal_pointer(&boards); *nbaseBoard = nboards; - ret = 0; - cleanup: - return ret; + + return 0; } @@ -15941,7 +15919,6 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; g_autofree char *nodemask = NULL; @@ -15950,17 +15927,17 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, case VIR_DOMAIN_MEMORY_MODEL_DIMM: if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt, &def->pagesize, false, false) < 0) - goto cleanup; + return -1; if ((nodemask = virXPathString("string(./nodemask)", ctxt))) { if (virBitmapParse(nodemask, &def->sourceNodes, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + return -1; if (virBitmapIsAllClear(def->sourceNodes)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid value of 'nodemask': %s"), nodemask); - goto cleanup; + return -1; } } break; @@ -15969,12 +15946,12 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, if (!(def->nvdimmPath = virXPathString("string(./path)", ctxt))) { virReportError(VIR_ERR_XML_DETAIL, "%s", _("path is required for model 'nvdimm'")); - goto cleanup; + return -1; } if (virDomainParseMemory("./alignsize", "./alignsize/@unit", ctxt, &def->alignsize, false, false) < 0) - goto cleanup; + return -1; if (virXPathBoolean("boolean(./pmem)", ctxt)) def->nvdimmPmem = true; @@ -15986,10 +15963,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, break; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -15998,7 +15972,6 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; int rv; @@ -16010,38 +15983,35 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, (rv == 0 && def->targetNode < 0)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid value of memory device node")); - goto cleanup; + return -1; } if (virDomainParseMemory("./size", "./size/@unit", ctxt, &def->size, true, false) < 0) - goto cleanup; + return -1; if (def->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { if (virDomainParseMemory("./label/size", "./label/size/@unit", ctxt, &def->labelsize, false, false) < 0) - goto cleanup; + return -1; if (def->labelsize && def->labelsize < 128) { virReportError(VIR_ERR_XML_ERROR, "%s", _("nvdimm label must be at least 128KiB")); - goto cleanup; + return -1; } if (def->labelsize >= def->size) { virReportError(VIR_ERR_XML_ERROR, "%s", _("label size must be smaller than NVDIMM size")); - goto cleanup; + return -1; } if (virXPathBoolean("boolean(./readonly)", ctxt)) def->readonly = true; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -16192,7 +16162,6 @@ static virDomainIOMMUDefPtr virDomainIOMMUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - virDomainIOMMUDefPtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr driver; int val; @@ -16202,17 +16171,17 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, ctxt->node = node; if (VIR_ALLOC(iommu) < 0) - goto cleanup; + return NULL; if (!(tmp = virXMLPropString(node, "model"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing model for IOMMU device")); - goto cleanup; + return NULL; } if ((val = virDomainIOMMUModelTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown IOMMU model: %s"), tmp); - goto cleanup; + return NULL; } iommu->model = val; @@ -16222,7 +16191,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp = virXMLPropString(driver, "intremap"))) { if ((val = virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown intremap value: %s"), tmp); - goto cleanup; + return NULL; } iommu->intremap = val; } @@ -16231,7 +16200,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp = virXMLPropString(driver, "caching_mode"))) { if ((val = virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown caching_mode value: %s"), tmp); - goto cleanup; + return NULL; } iommu->caching_mode = val; } @@ -16239,7 +16208,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp = virXMLPropString(driver, "iotlb"))) { if ((val = virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown iotlb value: %s"), tmp); - goto cleanup; + return NULL; } iommu->iotlb = val; } @@ -16248,16 +16217,13 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp = virXMLPropString(driver, "eim"))) { if ((val = virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown eim value: %s"), tmp); - goto cleanup; + return NULL; } iommu->eim = val; } } - ret = g_steal_pointer(&iommu); - - cleanup: - return ret; + return g_steal_pointer(&iommu); } @@ -16267,7 +16233,6 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, xmlXPathContextPtr ctxt, unsigned int flags) { - virDomainVsockDefPtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cid; int val; @@ -16277,12 +16242,12 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, ctxt->node = node; if (!(vsock = virDomainVsockDefNew(xmlopt))) - goto cleanup; + return NULL; if ((tmp = virXMLPropString(node, "model"))) { if ((val = virDomainVsockModelTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown vsock model: %s"), tmp); - goto cleanup; + return NULL; } vsock->model = val; } @@ -16297,7 +16262,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, virReportError(VIR_ERR_XML_DETAIL, _("'cid' attribute must be a positive number: %s"), tmp); - goto cleanup; + return NULL; } } @@ -16308,19 +16273,16 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, virReportError(VIR_ERR_XML_DETAIL, _("'auto' attribute can be 'yes' or 'no': %s"), tmp); - goto cleanup; + return NULL; } vsock->auto_cid = val; } } if (virDomainDeviceInfoParseXML(xmlopt, node, &vsock->info, flags) < 0) - goto cleanup; - - ret = g_steal_pointer(&vsock); + return NULL; - cleanup: - return ret; + return g_steal_pointer(&vsock); } virDomainDeviceDefPtr @@ -18480,7 +18442,6 @@ virDomainHugepagesParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainHugePagePtr hugepage) { - int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *nodeset = NULL; @@ -18488,29 +18449,27 @@ virDomainHugepagesParseXML(xmlNodePtr node, if (virDomainParseMemory("./@size", "./@unit", ctxt, &hugepage->size, true, false) < 0) - goto cleanup; + return -1; if (!hugepage->size) { virReportError(VIR_ERR_XML_DETAIL, "%s", _("hugepage size can't be zero")); - goto cleanup; + return -1; } if ((nodeset = virXMLPropString(node, "nodeset"))) { if (virBitmapParse(nodeset, &hugepage->nodemask, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + return -1; if (virBitmapIsAllClear(hugepage->nodemask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid value of 'nodeset': %s"), nodeset); - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -19159,7 +19118,6 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, unsigned int cache; int type; unsigned long long size; - int ret = -1; g_autofree char *tmp = NULL; ctxt->node = node; @@ -19168,13 +19126,13 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'id'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &cache) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'id' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); @@ -19182,13 +19140,13 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'level'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &level) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'level' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); @@ -19196,27 +19154,25 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'type'")); - goto cleanup; + return -1; } type = virCacheTypeFromString(tmp); if (type < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'type' value '%s'"), tmp); - goto cleanup; + return -1; } if (virDomainParseScaledValue("./@size", "./@unit", ctxt, &size, 1024, ULLONG_MAX, true) < 0) - goto cleanup; + return -1; if (virResctrlAllocSetCacheSize(alloc, level, type, cache, size) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -19611,7 +19567,6 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int id; unsigned int bandwidth; - int ret = -1; g_autofree char *tmp = NULL; ctxt->node = node; @@ -19620,13 +19575,13 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing memorytune attribute 'id'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &id) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid memorytune attribute 'id' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); @@ -19634,20 +19589,18 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing memorytune attribute 'bandwidth'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &bandwidth) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid memorytune attribute 'bandwidth' value '%s'"), tmp); - goto cleanup; + return -1; } if (virResctrlAllocSetMemoryBandwidth(alloc, id, bandwidth) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -24074,7 +24027,6 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr buf, virDomainXMLOptionPtr xmlopt) { g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || !xmlopt || !xmlopt->privateData.storageFormat) @@ -24083,15 +24035,12 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); if (xmlopt->privateData.storageFormat(src, &childBuf) < 0) - goto cleanup; + return -1; if (virXMLFormatElement(buf, "privateData", NULL, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -24774,18 +24723,17 @@ virDomainFSDefFormat(virBufferPtr buf, const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy); const char *src = def->src->path; g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected filesystem type %d"), def->type); - goto cleanup; + return -1; } if (!accessmode) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected accessmode %d"), def->accessmode); - goto cleanup; + return -1; } virBufferAsprintf(buf, @@ -24814,7 +24762,7 @@ virDomainFSDefFormat(virBufferPtr buf, virDomainVirtioOptionsFormat(&driverBuf, def->virtio); if (virBufferCheckError(&driverBuf) < 0) - goto cleanup; + return -1; if (virBufferUse(&driverBuf)) { virBufferAddLit(buf, "<driver"); @@ -24864,7 +24812,7 @@ virDomainFSDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<readonly/>\n"); if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) - goto cleanup; + return -1; if (def->space_hard_limit) virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>" @@ -24876,10 +24824,7 @@ virDomainFSDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</filesystem>\n"); - ret = 0; - - cleanup: - return ret; + return 0; } @@ -26006,14 +25951,13 @@ virDomainSmartcardDefFormat(virBufferPtr buf, const char *mode = virDomainSmartcardTypeToString(def->type); g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected smartcard type %d"), def->type); - goto cleanup; + return -1; } switch (def->type) { @@ -26031,24 +25975,24 @@ virDomainSmartcardDefFormat(virBufferPtr buf, case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: if (virDomainChrSourceDefFormat(&childBuf, def->data.passthru, flags) < 0) - goto cleanup; + return -1; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected smartcard type %d"), def->type); - goto cleanup; + return -1; } if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) - goto cleanup; + return -1; if (virBufferCheckError(&childBuf) < 0) - goto cleanup; + return -1; virBufferAsprintf(buf, "<smartcard mode='%s'", mode); if (def->type == VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH && virDomainChrAttrsDefFormat(buf, def->data.passthru, false) < 0) { - goto cleanup; + return -1; } if (virBufferUse(&childBuf)) { @@ -26059,10 +26003,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - ret = 0; - - cleanup: - return ret; + return 0; } static int @@ -26139,24 +26080,23 @@ virDomainSoundDefFormat(virBufferPtr buf, const char *model = virDomainSoundModelTypeToString(def->model); g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; size_t i; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected sound model %d"), def->model); - goto cleanup; + return -1; } for (i = 0; i < def->ncodecs; i++) virDomainSoundCodecDefFormat(&childBuf, def->codecs[i]); if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) - goto cleanup; + return -1; if (virBufferCheckError(&childBuf) < 0) - goto cleanup; + return -1; virBufferAsprintf(buf, "<sound model='%s'", model); if (virBufferUse(&childBuf)) { @@ -26167,10 +26107,7 @@ virDomainSoundDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -26532,19 +26469,18 @@ virDomainVideoDefFormat(virBufferPtr buf, { const char *model = virDomainVideoTypeToString(def->type); g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected video model %d"), def->type); - goto cleanup; + return -1; } virBufferAddLit(buf, "<video>\n"); virBufferAdjustIndent(buf, 2); virDomainVirtioOptionsFormat(&driverBuf, def->virtio); if (virBufferCheckError(&driverBuf) < 0) - goto cleanup; + return -1; if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf) || def->backend != VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT) { virBufferAddLit(buf, "<driver"); @@ -26586,15 +26522,12 @@ virDomainVideoDefFormat(virBufferPtr buf, } if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) - goto cleanup; + return -1; virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</video>\n"); - ret = 0; - - cleanup: - return ret; + return 0; } static int @@ -27606,40 +27539,37 @@ virDomainCachetuneDefFormat(virBufferPtr buf, { g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; size_t i = 0; - int ret = -1; g_autofree char *vcpus = NULL; virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachCache(resctrl->alloc, virDomainCachetuneDefFormatHelper, &childrenBuf) < 0) - goto cleanup; + return -1; for (i = 0; i < resctrl->nmonitors; i++) { if (virDomainResctrlMonDefFormatHelper(resctrl->monitors[i], VIR_RESCTRL_MONITOR_TYPE_CACHE, &childrenBuf) < 0) - goto cleanup; + return -1; } if (virBufferCheckError(&childrenBuf) < 0) - goto cleanup; + return -1; - if (!virBufferUse(&childrenBuf)) { - ret = 0; - goto cleanup; - } + if (!virBufferUse(&childrenBuf)) + return 0; vcpus = virBitmapFormat(resctrl->vcpus); if (!vcpus) - goto cleanup; + return -1; virBufferAsprintf(buf, "<cachetune vcpus='%s'", vcpus); if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) { const char *alloc_id = virResctrlAllocGetID(resctrl->alloc); if (!alloc_id) - goto cleanup; + return -1; virBufferAsprintf(buf, " id='%s'", alloc_id); } @@ -27648,9 +27578,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf, virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "</cachetune>\n"); - ret = 0; - cleanup: - return ret; + return 0; } @@ -27674,33 +27602,30 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, unsigned int flags) { g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; g_autofree char *vcpus = NULL; virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachMemory(resctrl->alloc, virDomainMemorytuneDefFormatHelper, &childrenBuf) < 0) - goto cleanup; + return -1; if (virBufferCheckError(&childrenBuf) < 0) - goto cleanup; + return -1; - if (!virBufferUse(&childrenBuf)) { - ret = 0; - goto cleanup; - } + if (!virBufferUse(&childrenBuf)) + return 0; vcpus = virBitmapFormat(resctrl->vcpus); if (!vcpus) - goto cleanup; + return -1; virBufferAsprintf(buf, "<memorytune vcpus='%s'", vcpus); if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) { const char *alloc_id = virResctrlAllocGetID(resctrl->alloc); if (!alloc_id) - goto cleanup; + return -1; virBufferAsprintf(buf, " id='%s'", alloc_id); } @@ -27709,9 +27634,7 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "</memorytune>\n"); - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -27721,7 +27644,6 @@ virDomainCputuneDefFormat(virBufferPtr buf, { size_t i; g_auto(virBuffer) childrenBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; virBufferSetChildIndent(&childrenBuf, buf); @@ -27769,7 +27691,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, continue; if (!(cpumask = virBitmapFormat(vcpu->cpumask))) - goto cleanup; + return -1; virBufferAsprintf(&childrenBuf, "<vcpupin vcpu='%zu' cpuset='%s'/>\n", i, cpumask); @@ -27782,7 +27704,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, virBufferAddLit(&childrenBuf, "<emulatorpin "); if (!(cpumask = virBitmapFormat(def->cputune.emulatorpin))) - goto cleanup; + return -1; virBufferAsprintf(&childrenBuf, "cpuset='%s'/>\n", cpumask); VIR_FREE(cpumask); @@ -27799,7 +27721,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, def->iothreadids[i]->iothread_id); if (!(cpumask = virBitmapFormat(def->iothreadids[i]->cpumask))) - goto cleanup; + return -1; virBufferAsprintf(&childrenBuf, "cpuset='%s'/>\n", cpumask); VIR_FREE(cpumask); @@ -27837,10 +27759,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, virBufferAddLit(buf, "</cputune>\n"); } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -27911,7 +27830,6 @@ virDomainIOMMUDefFormat(virBufferPtr buf, g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -27933,18 +27851,15 @@ virDomainIOMMUDefFormat(virBufferPtr buf, } if (virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL) < 0) - goto cleanup; + return -1; virBufferAsprintf(&attrBuf, " model='%s'", virDomainIOMMUModelTypeToString(iommu->model)); if (virXMLFormatElement(buf, "iommu", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -27953,7 +27868,6 @@ virDomainMemtuneFormat(virBufferPtr buf, const virDomainMemtune *mem) { g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -27979,7 +27893,7 @@ virDomainMemtuneFormat(virBufferPtr buf, } if (virXMLFormatElement(buf, "memtune", NULL, &childBuf) < 0) - goto cleanup; + return -1; virBufferSetChildIndent(&childBuf, buf); @@ -28002,11 +27916,9 @@ virDomainMemtuneFormat(virBufferPtr buf, virBufferAddLit(&childBuf, "<discard/>\n"); if (virXMLFormatElement(buf, "memoryBacking", NULL, &childBuf) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -28017,7 +27929,6 @@ virDomainVsockDefFormat(virBufferPtr buf, g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; if (vsock->model) { virBufferAsprintf(&attrBuf, " model='%s'", @@ -28033,18 +27944,15 @@ virDomainVsockDefFormat(virBufferPtr buf, if (vsock->guest_cid != 0) virBufferAsprintf(&cidAttrBuf, " address='%u'", vsock->guest_cid); if (virXMLFormatElement(&childBuf, "cid", &cidAttrBuf, NULL) < 0) - goto cleanup; + return -1; if (virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0) < 0) - goto cleanup; + return -1; if (virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 9af2173b7b..dd1a63a5cf 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -264,15 +264,11 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, unsigned int class_id, virBufferPtr buf) { - int ret = -1; - if (!buf) - goto cleanup; + return -1; - if (!def) { - ret = 0; - goto cleanup; - } + if (!def) + return 0; virBufferAddLit(buf, "<bandwidth"); if (class_id) @@ -281,14 +277,11 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, virBufferAdjustIndent(buf, 2); if (virNetDevBandwidthRateFormat(def->in, buf, "inbound") < 0 || virNetDevBandwidthRateFormat(def->out, buf, "outbound") < 0) - goto cleanup; + return -1; virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</bandwidth>\n"); - ret = 0; - - cleanup: - return ret; + return 0; } void diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 7f8e43b25c..5d62231b0f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3062,18 +3062,17 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, unsigned int fflags G_GNUC_UNUSED) { size_t i; - int ret = -1; virNetworkIPDefPtr ipdef = virNetworkIPDefByIndex(def, parentIndex); virSocketAddrRange range; memset(&range, 0, sizeof(range)); if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "range") < 0) - goto cleanup; + return -1; /* ipdef is the ip element that needs its range array updated */ if (!ipdef) - goto cleanup; + return -1; /* parse the xml into a virSocketAddrRange */ if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { @@ -3081,18 +3080,18 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("dhcp ranges cannot be modified, " "only added or deleted")); - goto cleanup; + return -1; } if (virSocketAddrRangeParseXML(def->name, ipdef, ctxt->node, &range) < 0) - goto cleanup; + return -1; if (VIR_SOCKET_ADDR_FAMILY(&ipdef->address) != VIR_SOCKET_ADDR_FAMILY(&range.start)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("the address family of a dhcp range must match " "the address family of the dhcp element's parent")); - goto cleanup; + return -1; } /* check if an entry with same name/address/ip already exists */ @@ -3107,7 +3106,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { if (virNetworkDefUpdateCheckMultiDHCP(def, ipdef) < 0) - goto cleanup; + return -1; if (i < ipdef->nranges) { char *startip = virSocketAddrFormat(&range.start); @@ -3122,7 +3121,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, endip ? endip : "unknown"); VIR_FREE(startip); VIR_FREE(endip); - goto cleanup; + return -1; } /* add to beginning/end of list */ @@ -3130,14 +3129,14 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST ? 0 : ipdef->nranges, ipdef->nranges, range) < 0) - goto cleanup; + return -1; } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { if (i == ipdef->nranges) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate a matching dhcp range entry " "in network '%s'"), def->name); - goto cleanup; + return -1; } /* remove it */ @@ -3146,12 +3145,10 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, } else { virNetworkDefUpdateUnknownCommand(command); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 7eb52dbf85..5ced615f1f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2115,7 +2115,6 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, char **wwpn) { virNodeDevCapsDefPtr cap = NULL; - int ret = -1; cap = def->caps; while (cap != NULL) { @@ -2132,12 +2131,10 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, if (cap == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Device is not a fibre channel HBA")); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -2504,7 +2501,7 @@ virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, ret = virPCIGetPhysicalFunction(sysfsPath, &pci_dev->physical_function); if (ret < 0) - goto cleanup; + return ret; if (pci_dev->physical_function) pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; @@ -2513,13 +2510,12 @@ virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, &pci_dev->num_virtual_functions, &pci_dev->max_virtual_functions); if (ret < 0) - goto cleanup; + return ret; if (pci_dev->num_virtual_functions > 0 || pci_dev->max_virtual_functions > 0) pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; - cleanup: return ret; } @@ -2528,7 +2524,7 @@ static int virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev) { size_t i; - int tmpGroup, ret = -1; + int tmpGroup; virPCIDeviceAddress addr; /* this could be a refresh, so clear out the old data */ @@ -2545,23 +2541,19 @@ virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev) tmpGroup = virPCIDeviceAddressGetIOMMUGroupNum(&addr); if (tmpGroup == -1) { /* error was already reported */ - goto cleanup; + return -1; } - if (tmpGroup == -2) { + if (tmpGroup == -2) /* -2 return means there is no iommu_group data */ - ret = 0; - goto cleanup; - } + return 0; if (tmpGroup >= 0) { if (virPCIDeviceAddressGetIOMMUGroupAddresses(&addr, &pci_dev->iommuGroupDevices, &pci_dev->nIommuGroupDevices) < 0) - goto cleanup; + return -1; pci_dev->iommuGroupNumber = tmpGroup; } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 6720d5620d..4bc22ec7d9 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -390,24 +390,22 @@ int virDomainNumatuneGetMode(virDomainNumaPtr numatune, int cellid, virDomainNumatuneMemMode *mode) { - int ret = -1; virDomainNumatuneMemMode tmp_mode; if (!numatune) - return ret; + return -1; if (virDomainNumatuneNodeSpecified(numatune, cellid)) tmp_mode = numatune->mem_nodes[cellid].mode; else if (numatune->memory.specified) tmp_mode = numatune->memory.mode; else - goto cleanup; + return -1; if (mode) *mode = tmp_mode; - ret = 0; - cleanup: - return ret; + + return 0; } virBitmapPtr @@ -498,8 +496,6 @@ virDomainNumatuneSet(virDomainNumaPtr numa, int mode, virBitmapPtr nodeset) { - int ret = -1; - /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) return 0; @@ -517,7 +513,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported numatune mode '%d'"), mode); - goto cleanup; + return -1; } if (placement != -1 && @@ -525,7 +521,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported numatune placement '%d'"), mode); - goto cleanup; + return -1; } if (mode != -1) @@ -534,7 +530,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, if (nodeset) { virBitmapFree(numa->memory.nodeset); if (!(numa->memory.nodeset = virBitmapNewCopy(nodeset))) - goto cleanup; + return -1; if (placement == -1) placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC; } @@ -551,7 +547,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nodeset for NUMA memory tuning must be set " "if 'placement' is 'static'")); - goto cleanup; + return -1; } /* setting nodeset when placement auto is invalid */ @@ -566,10 +562,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, numa->memory.specified = true; - ret = 0; - - cleanup: - return ret; + return 0; } static bool diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index cd97eb87ac..5c9d6ee811 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2087,13 +2087,11 @@ virNWFilterIncludeParse(xmlNodePtr cur) if (!ret->params) goto err_exit; - cleanup: return ret; err_exit: virNWFilterIncludeDefFree(ret); - ret = NULL; - goto cleanup; + return NULL; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f212eefe25..58ce29c101 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -343,17 +343,14 @@ int virStoragePoolOptionsPoolTypeSetXMLNamespace(int type, virXMLNamespacePtr ns) { - int ret = -1; virStoragePoolTypeInfoPtr backend = virStoragePoolTypeInfoLookup(type); if (!backend) - goto cleanup; + return -1; backend->poolOptions.ns = *ns; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e7017bffa9..c958c678ce 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -766,14 +766,13 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr obj, unsigned int flags) { bool isActive; - int ret = -1; isActive = virNetworkObjIsActive(obj); if (!isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("network is not running")); - goto cleanup; + return -1; } if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { @@ -781,18 +780,16 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a " "transient network")); - goto cleanup; + return -1; } /* this should already have been done by the driver, but do it * anyway just in case. */ if (isActive && (virNetworkObjSetDefTransient(obj, false, xmlopt) < 0)) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -1676,10 +1673,9 @@ virNetworkObjLookupPort(virNetworkObjPtr net, virReportError(VIR_ERR_NO_NETWORK_PORT, _("Network port with UUID %s does not exist"), uuidstr); - goto cleanup; + return NULL; } - cleanup: return ret; } diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index ebf6ca7680..81c9f2c346 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -732,14 +732,13 @@ virSecretObjGetValue(virSecretObjPtr obj) virUUIDFormat(def->uuid, uuidstr); virReportError(VIR_ERR_NO_SECRET, _("secret '%s' does not have a value"), uuidstr); - goto cleanup; + return NULL; } if (VIR_ALLOC_N(ret, obj->value_size) < 0) - goto cleanup; + return NULL; memcpy(ret, obj->value, obj->value_size); - cleanup: return ret; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/storage/storage_backend_fs.c | 13 +++---- src/storage/storage_backend_rbd.c | 58 ++++++++++--------------------- src/storage/storage_backend_zfs.c | 21 ++++------- src/storage/storage_driver.c | 38 +++++++------------- src/storage/storage_util.c | 18 ++++------ 5 files changed, 50 insertions(+), 98 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02b824867a..2b180c3b31 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -58,36 +58,33 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, virNetfsDiscoverState *state = data; const char *name, *path; virStoragePoolSource *src = NULL; - int ret = -1; path = groups[0]; if (!(name = strrchr(path, '/'))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid netfs path (no /): %s"), path); - goto cleanup; + return -1; } name += 1; if (*name == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid netfs path (ends in /): %s"), path); - goto cleanup; + return -1; } if (!(src = virStoragePoolSourceListNewSource(&state->list))) - goto cleanup; + return -1; if (VIR_ALLOC_N(src->hosts, 1) < 0) - goto cleanup; + return -1; src->nhost = 1; src->hosts[0].name = g_strdup(state->host); src->dir = g_strdup(path); src->format = VIR_STORAGE_POOL_NETFS_NFS; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 1c59c18b0d..7341a40f6c 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -411,17 +411,15 @@ volStorageBackendRBDGetFeatures(rbd_image_t image, const char *volname, uint64_t *features) { - int r, ret = -1; + int r; if ((r = rbd_get_features(image, features)) < 0) { virReportSystemError(-r, _("failed to get the features of RBD image " "%s"), volname); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } #if LIBRBD_VERSION_CODE > 265 @@ -467,7 +465,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, rbd_image_t *image, rbd_image_info_t *info) { - int r, ret = -1; + int r; size_t allocation = 0; if ((r = rbd_diff_iterate2(image, NULL, 0, info->size, 0, 1, @@ -475,17 +473,15 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, &allocation)) < 0) { virReportSystemError(-r, _("failed to iterate RBD image '%s'"), vol->name); - goto cleanup; + return -1; } VIR_DEBUG("Found %zu bytes allocated for RBD image %s", allocation, vol->name); vol->target.allocation = allocation; - ret = 0; - cleanup: - return ret; + return 0; } #else @@ -971,14 +967,13 @@ virStorageBackendRBDImageInfo(rbd_image_t image, uint64_t *stripe_unit, uint64_t *stripe_count) { - int ret = -1; int r = 0; uint8_t oldformat; if ((r = rbd_get_old_format(image, &oldformat)) < 0) { virReportSystemError(-r, _("failed to get the format of RBD image %s"), volname); - goto cleanup; + return -1; } if (oldformat != 0) { @@ -986,28 +981,25 @@ virStorageBackendRBDImageInfo(rbd_image_t image, _("RBD image %s is old format. Does not support " "extended features and striping"), volname); - goto cleanup; + return -1; } if (volStorageBackendRBDGetFeatures(image, volname, features) < 0) - goto cleanup; + return -1; if ((r = rbd_get_stripe_unit(image, stripe_unit)) < 0) { virReportSystemError(-r, _("failed to get the stripe unit of RBD image %s"), volname); - goto cleanup; + return -1; } if ((r = rbd_get_stripe_count(image, stripe_count)) < 0) { virReportSystemError(-r, _("failed to get the stripe count of RBD image %s"), volname); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } /* Callback function for rbd_diff_iterate() */ @@ -1122,7 +1114,6 @@ virStorageBackendRBDSnapshotCreate(rbd_image_t image, char *imgname, char *snapname) { - int ret = -1; int r = -1; VIR_DEBUG("Creating RBD snapshot %s@%s", imgname, snapname); @@ -1130,13 +1121,10 @@ virStorageBackendRBDSnapshotCreate(rbd_image_t image, if ((r = rbd_snap_create(image, snapname)) < 0) { virReportSystemError(-r, _("failed to create RBD snapshot %s@%s"), imgname, snapname); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } static int @@ -1145,7 +1133,6 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t image, char *snapname) { int r = -1; - int ret = -1; int protected; VIR_DEBUG("Querying if RBD snapshot %s@%s is protected", imgname, snapname); @@ -1153,7 +1140,7 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t image, if ((r = rbd_snap_is_protected(image, snapname, &protected)) < 0) { virReportSystemError(-r, _("failed to verify if RBD snapshot %s@%s " "is protected"), imgname, snapname); - goto cleanup; + return -1; } if (protected == 0) { @@ -1163,16 +1150,13 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t image, if ((r = rbd_snap_protect(image, snapname)) < 0) { virReportSystemError(-r, _("failed to protect RBD snapshot %s@%s"), imgname, snapname); - goto cleanup; + return -1; } } else { VIR_DEBUG("RBD Snapshot %s@%s is already protected", imgname, snapname); } - ret = 0; - - cleanup: - return ret; + return 0; } static int @@ -1392,7 +1376,6 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, uint64_t stripe_count) { int r = -1; - int ret = -1; unsigned long long offset = 0; unsigned long long length; @@ -1405,7 +1388,7 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, virReportSystemError(-r, _("discarding %llu bytes failed on " "RBD image %s at offset %llu"), length, imgname, offset); - goto cleanup; + return -1; } VIR_DEBUG("Discarded %llu bytes of RBD image %s at offset %llu", @@ -1414,10 +1397,7 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, offset += length; } - ret = 0; - - cleanup: - return ret; + return 0; } static int diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index c3057fede6..448616abe5 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -68,16 +68,13 @@ virStorageBackendZFSVolModeNeeded(void) if ((ret < 0) || (exit_code != 2)) { VIR_WARN("Command 'zfs get' either failed " "to run or exited with unexpected status"); - goto cleanup; + return ret; } if (strstr(error, " volmode ")) - ret = 1; + return 1; else - ret = 0; - - cleanup: - return ret; + return 0; } static int @@ -294,7 +291,6 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - int ret = -1; int volmode_needed = -1; g_autoptr(virCommand) cmd = NULL; @@ -316,7 +312,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, volmode_needed = virStorageBackendZFSVolModeNeeded(); if (volmode_needed < 0) - goto cleanup; + return -1; /** * $ zfs create -o volmode=dev -V 10240K test/volname * $ zfs create -o volmode=dev -s -V 10240K test/volname @@ -347,15 +343,12 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, virCommandAddArgFormat(cmd, "%s/%s", def->source.name, vol->name); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; if (virStorageBackendZFSFindVols(pool, vol) < 0) - goto cleanup; - - ret = 0; - cleanup: - return ret; + return -1; + return 0; } static int diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b8332af01..6b18ca71d0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -625,7 +625,6 @@ storageConnectFindStoragePoolSources(virConnectPtr conn, { int backend_type; virStorageBackendPtr backend; - char *ret = NULL; if (virConnectFindStoragePoolSourcesEnsureACL(conn) < 0) return NULL; @@ -634,24 +633,21 @@ storageConnectFindStoragePoolSources(virConnectPtr conn, if (backend_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown storage pool type %s"), type); - goto cleanup; + return NULL; } backend = virStorageBackendForType(backend_type); if (backend == NULL) - goto cleanup; + return NULL; if (!backend->findPoolSources) { virReportError(VIR_ERR_NO_SUPPORT, _("pool type '%s' does not support source " "discovery"), type); - goto cleanup; + return NULL; } - ret = backend->findPoolSources(srcSpec, flags); - - cleanup: - return ret; + return backend->findPoolSources(srcSpec, flags); } @@ -1775,25 +1771,22 @@ storageVolDeleteInternal(virStorageBackendPtr backend, bool updateMeta) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); - int ret = -1; if (!backend->deleteVol) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support vol deletion")); - goto cleanup; + return -1; } if (backend->deleteVol(obj, voldef, flags) < 0) - goto cleanup; + return -1; /* The disk backend updated the pool data including removing the * voldef from the pool (for both the deleteVol and the createVol * failure path. */ - if (def->type == VIR_STORAGE_POOL_DISK) { - ret = 0; - goto cleanup; - } + if (def->type == VIR_STORAGE_POOL_DISK) + return 0; /* Update pool metadata - don't update meta data from error paths * in this module since the allocation/available weren't adjusted yet. @@ -1805,10 +1798,8 @@ storageVolDeleteInternal(virStorageBackendPtr backend, } virStoragePoolObjRemoveVol(obj, voldef); - ret = 0; - cleanup: - return ret; + return 0; } @@ -2802,20 +2793,15 @@ static int storageConnectStoragePoolEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret = -1; - if (virConnectStoragePoolEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->storageEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7b934b61e0..0cbdfcefd7 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -336,7 +336,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, virReportSystemError(errno, _("cannot extend file '%s'"), vol->target.path); - goto cleanup; + return ret; } /* Avoid issues with older kernel's <linux/fs.h> namespace pollution. */ @@ -356,7 +356,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, virReportSystemError(errno, _("cannot allocate %llu bytes in file '%s'"), vol->target.allocation, vol->target.path); - goto cleanup; + return ret; } } #endif @@ -368,7 +368,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, * been able to allocate the required space. */ if ((ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, !need_alloc, reflink_copy)) < 0) - goto cleanup; + return ret; /* If the new allocation is greater than the original capacity, * but fallocate failed, fill the rest with zeroes. @@ -381,7 +381,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, ret = -errno; virReportSystemError(errno, _("cannot fill file '%s'"), vol->target.path); - goto cleanup; + return ret; } } @@ -389,10 +389,9 @@ createRawFile(int fd, virStorageVolDefPtr vol, ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); - goto cleanup; + return ret; } - cleanup: return ret; } @@ -3784,7 +3783,6 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, char **block_device) { char *blockp = NULL; - int retval = -1; /* old-style; just parse out the sd */ if (!(blockp = strrchr(block_name, ':'))) { @@ -3792,7 +3790,7 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse block name %s"), block_name); - goto cleanup; + return -1; } else { blockp++; *block_device = g_strdup(blockp); @@ -3800,9 +3798,7 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, VIR_DEBUG("Block device is '%s'", *block_device); } - retval = 0; - cleanup: - return retval; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/nwfilter/nwfilter_ebiptables_driver.c | 132 +++++++++------------- 1 file changed, 56 insertions(+), 76 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 50db150151..70743983ef 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -367,13 +367,12 @@ ebtablesHandleEthHdr(virFirewallPtr fw, { char macaddr[VIR_MAC_STRING_BUFLEN]; char macmask[VIR_MAC_STRING_BUFLEN]; - int ret = -1; if (HAS_ENTRY_ITEM(&ethHdr->dataSrcMACAddr)) { if (printDataType(vars, macaddr, sizeof(macaddr), &ethHdr->dataSrcMACAddr) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, reverse ? "-d" : "-s", @@ -385,7 +384,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), &ethHdr->dataSrcMACMask) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -398,7 +397,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), &ethHdr->dataDstMACAddr) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, reverse ? "-s" : "-d", @@ -410,7 +409,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), &ethHdr->dataDstMACMask) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -419,9 +418,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -789,7 +786,6 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; - int ret = -1; *srcmacskipped = false; @@ -802,7 +798,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-m", "mac", @@ -815,9 +811,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, NULL); } - ret = 0; - cleanup: - return ret; + return 0; } @@ -837,7 +831,6 @@ iptablesHandleIPHdr(virFirewallPtr fw, const char *dst = "--destination"; const char *srcrange = "--src-range"; const char *dstrange = "--dst-range"; - int ret = -1; if (directionIn) { src = "--destination"; @@ -850,7 +843,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPAddr) < 0) - goto cleanup; + return -1; if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataSrcIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -861,7 +854,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataSrcIPMask) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -872,7 +865,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPFrom) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -886,7 +879,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataSrcIPTo) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -899,7 +892,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPAddr) < 0) - goto cleanup; + return -1; if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataDstIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -909,7 +902,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDstIPMask) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -920,7 +913,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPFrom) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -933,7 +926,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataDstIPTo) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -946,7 +939,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDSCP) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-m", "dscp", @@ -967,9 +960,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -983,7 +974,6 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, char number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))]; char str[MAX_IPSET_NAME_LENGTH]; - int ret = -1; if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { @@ -991,7 +981,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, str, sizeof(str), &ipHdr->dataIPSet) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-m", "set", @@ -1001,7 +991,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataTypeDirection(vars, str, sizeof(str), &ipHdr->dataIPSetFlags, directionIn) < 0) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, str); } @@ -1011,7 +1001,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataConnlimitAbove) < 0) - goto cleanup; + return -1; /* place connlimit after potential -m state --state ... since this is the most useful order */ @@ -1035,9 +1025,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, NULL); } - ret = 0; - cleanup: - return ret; + return 0; } @@ -1181,7 +1169,6 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, bool hasICMPType = false; virFirewallRulePtr fwrule; size_t fwruleargs; - int ret = -1; PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); @@ -1200,14 +1187,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.tcpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.tcpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPFlags)) { char *flags; @@ -1216,11 +1203,11 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virFirewallRuleAddArg(fw, fwrule, "--tcp-flags"); if (!(flags = virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.dataTCPFlags.u.tcpFlags.mask))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); if (!(flags = virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.dataTCPFlags.u.tcpFlags.flags))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); } @@ -1229,13 +1216,13 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.tcpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPOption)) { if (printDataType(vars, number, sizeof(number), &rule->p.tcpHdrFilter.dataTCPOption) < 0) - goto cleanup; + return -1; if (ENTRY_WANT_NEG_SIGN(&rule->p.tcpHdrFilter.dataTCPOption)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1259,20 +1246,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.udpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; case VIR_NWFILTER_RULE_PROTOCOL_UDPLITE: @@ -1289,14 +1276,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpliteHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpliteHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; break; @@ -1314,14 +1301,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.espHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.espHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; break; @@ -1339,14 +1326,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.ahHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.ahHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; break; @@ -1364,20 +1351,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.sctpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.sctpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.sctpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; case VIR_NWFILTER_RULE_PROTOCOL_ICMP: @@ -1400,14 +1387,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.icmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.icmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { const char *parm; @@ -1416,8 +1403,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (maySkipICMP) { virFirewallRemoveRule(fw, fwrule); - ret = 0; - goto cleanup; + return 0; } if (rule->prtclType == VIR_NWFILTER_RULE_PROTOCOL_ICMP) @@ -1428,7 +1414,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &rule->p.icmpHdrFilter.dataICMPType) < 0) - goto cleanup; + return -1; if (ENTRY_WANT_NEG_SIGN(&rule->p.icmpHdrFilter.dataICMPType)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1438,7 +1424,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, numberalt, sizeof(numberalt), &rule->p.icmpHdrFilter.dataICMPCode) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", number, numberalt); @@ -1461,14 +1447,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.igmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.igmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; break; @@ -1486,14 +1472,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.allHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.allHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; break; @@ -1501,7 +1487,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected protocol %d"), rule->prtclType); - goto cleanup; + return -1; } if ((srcMacSkipped && @@ -1540,14 +1526,12 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.allHdrFilter.ipHdr, directionIn) < 0) - goto cleanup; + return -1; virFirewallRuleAddArgList(fw, fwrule, "-j", target, NULL); - ret = 0; - cleanup: - return ret; + return 0; } @@ -2483,8 +2467,6 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, const char *ifname, virNWFilterVarCombIterPtr vars) { - int ret = -1; - if (virNWFilterRuleIsProtocolEthernet(rule)) { if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_OUT || rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) { @@ -2495,7 +2477,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT) < 0) - goto cleanup; + return -1; } if (rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN || @@ -2507,7 +2489,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, false) < 0) - goto cleanup; + return -1; } } else { virFirewallLayer layer; @@ -2518,7 +2500,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("unexpected protocol type")); - goto cleanup; + return -1; } if (iptablesCreateRuleInstance(fw, @@ -2526,12 +2508,10 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, rule, ifname, vars) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/remote/remote_daemon.c | 38 +++++++++++++++++--------------------- src/remote/remote_driver.c | 15 +++++---------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 7e63e18034..346415e96b 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -399,7 +399,6 @@ daemonSetupNetworking(virNetServerPtr srv, int unix_sock_ro_mask = 0; int unix_sock_rw_mask = 0; int unix_sock_adm_mask = 0; - int ret = -1; g_autoptr(virSystemdActivation) act = NULL; virSystemdActivationMap actmap[] = { { .name = DAEMON_NAME ".socket", .family = AF_UNIX, .path = sock_path }, @@ -453,22 +452,22 @@ daemonSetupNetworking(virNetServerPtr srv, if (config->unix_sock_group) { if (virGetGroupID(config->unix_sock_group, &unix_sock_gid) < 0) - return ret; + return -1; } if (virStrToLong_i(config->unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_ro_perms); - goto cleanup; + return -1; } if (virStrToLong_i(config->unix_sock_admin_perms, NULL, 8, &unix_sock_adm_mask) != 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_admin_perms); - goto cleanup; + return -1; } if (virStrToLong_i(config->unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_rw_perms); - goto cleanup; + return -1; } if (virNetServerAddServiceUNIX(srv, @@ -482,7 +481,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; if (sock_path_ro && virNetServerAddServiceUNIX(srv, act, @@ -495,7 +494,7 @@ daemonSetupNetworking(virNetServerPtr srv, true, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; if (sock_path_adm && virNetServerAddServiceUNIX(srvAdm, @@ -509,7 +508,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->admin_max_queued_clients, config->admin_max_client_requests) < 0) - goto cleanup; + return -1; #ifdef WITH_IP if (((ipsock && config->listen_tcp) || act) && @@ -524,7 +523,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; if (((ipsock && config->listen_tls) || (act && virSystemdActivationHasName(act, DAEMON_NAME "-tls.socket")))) { virNetTLSContextPtr ctxt = NULL; @@ -535,17 +534,17 @@ daemonSetupNetworking(virNetServerPtr srv, if (!config->ca_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No CA certificate path set to match server key/cert")); - goto cleanup; + return -1; } if (!config->cert_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No server certificate path set to match server key")); - goto cleanup; + return -1; } if (!config->key_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No server key path set to match server cert")); - goto cleanup; + return -1; } VIR_DEBUG("Using CA='%s' cert='%s' key='%s'", config->ca_file, config->cert_file, config->key_file); @@ -557,7 +556,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->tls_priority, config->tls_no_sanity_certificate ? false : true, config->tls_no_verify_certificate ? false : true))) - goto cleanup; + return -1; } else { if (!(ctxt = virNetTLSContextNewServerPath(NULL, !privileged, @@ -565,7 +564,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->tls_priority, config->tls_no_sanity_certificate ? false : true, config->tls_no_verify_certificate ? false : true))) - goto cleanup; + return -1; } VIR_DEBUG("Registering TLS socket %s:%s", @@ -582,7 +581,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->max_queued_clients, config->max_client_requests) < 0) { virObjectUnref(ctxt); - goto cleanup; + return -1; } virObjectUnref(ctxt); } @@ -590,19 +589,16 @@ daemonSetupNetworking(virNetServerPtr srv, if (act && virSystemdActivationComplete(act) < 0) - goto cleanup; + return -1; #if WITH_SASL if (virNetServerNeedsAuth(srv, REMOTE_AUTH_SASL) && !(saslCtxt = virNetSASLContextNewServer( (const char *const*)config->sasl_allowed_username_list))) - goto cleanup; + return -1; #endif - ret = 0; - - cleanup: - return ret; + return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83477243fc..67ae0fe286 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4182,20 +4182,18 @@ static int remoteAuthInteract(virConnectPtr conn, struct remoteAuthInteractState *state, virConnectAuthPtr auth) { - int ret = -1; - VIR_DEBUG("Starting SASL interaction"); remoteAuthInteractStateClear(state, false); /* Fills state->interact with any values from the auth config file */ if (remoteAuthFillFromConfig(conn, state) < 0) - goto cleanup; + return -1; /* Populates state->cred for anything not found in the auth config */ if (remoteAuthMakeCredentials(state->interact, &state->cred, &state->ncred) < 0) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Failed to make auth credentials")); - goto cleanup; + return -1; } /* If there was anything not in the auth config, we need to @@ -4206,13 +4204,13 @@ static int remoteAuthInteract(virConnectPtr conn, if (!auth || !auth->cb) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("No authentication callback available")); - goto cleanup; + return -1; } if ((*(auth->cb))(state->cred, state->ncred, auth->cbdata) < 0) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Failed to collect auth credentials")); - goto cleanup; + return -1; } /* Copy user's responses from cred into interact */ @@ -4227,10 +4225,7 @@ static int remoteAuthInteract(virConnectPtr conn, * of this method, rather than the end. */ - ret = 0; - - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/lxc/lxc_cgroup.c | 70 ++++++++++++++++------------------------ src/lxc/lxc_container.c | 17 ++++------ src/lxc/lxc_controller.c | 44 +++++++++++-------------- src/lxc/lxc_driver.c | 39 +++++++++------------- src/lxc/lxc_process.c | 34 ++++++++----------- 5 files changed, 81 insertions(+), 123 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 5efb495b56..549595f538 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -38,29 +38,25 @@ VIR_LOG_INIT("lxc.lxc_cgroup"); static int virLXCCgroupSetupCpuTune(virDomainDefPtr def, virCgroupPtr cgroup) { - int ret = -1; - if (def->cputune.sharesSpecified) { unsigned long long val; if (virCgroupSetCpuShares(cgroup, def->cputune.shares) < 0) - goto cleanup; + return -1; if (virCgroupGetCpuShares(cgroup, &val) < 0) - goto cleanup; + return -1; def->cputune.shares = val; } if (def->cputune.quota != 0 && virCgroupSetCpuCfsQuota(cgroup, def->cputune.quota) < 0) - goto cleanup; + return -1; if (def->cputune.period != 0 && virCgroupSetCpuCfsPeriod(cgroup, def->cputune.period) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -160,26 +156,22 @@ static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, static int virLXCCgroupSetupMemTune(virDomainDefPtr def, virCgroupPtr cgroup) { - int ret = -1; - if (virCgroupSetMemory(cgroup, virDomainDefGetMemoryInitial(def)) < 0) - goto cleanup; + return -1; if (virMemoryLimitIsSet(def->mem.hard_limit)) if (virCgroupSetMemoryHardLimit(cgroup, def->mem.hard_limit) < 0) - goto cleanup; + return -1; if (virMemoryLimitIsSet(def->mem.soft_limit)) if (virCgroupSetMemorySoftLimit(cgroup, def->mem.soft_limit) < 0) - goto cleanup; + return -1; if (virMemoryLimitIsSet(def->mem.swap_hard_limit)) if (virCgroupSetMemSwapHardLimit(cgroup, def->mem.swap_hard_limit) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -307,7 +299,6 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, virCgroupPtr cgroup) { int capMknod = def->caps_features[VIR_DOMAIN_CAPS_FEATURE_MKNOD]; - int ret = -1; size_t i; static virLXCCgroupDevicePolicy devices[] = { {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_NULL}, @@ -321,13 +312,13 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, {0, 0, 0}}; if (virCgroupDenyAllDevices(cgroup) < 0) - goto cleanup; + return -1; /* white list mknod if CAP_MKNOD has to be kept */ if (capMknod == VIR_TRISTATE_SWITCH_ON) { if (virCgroupAllowAllDevices(cgroup, VIR_CGROUP_DEVICE_MKNOD) < 0) - goto cleanup; + return -1; } for (i = 0; devices[i].type != 0; i++) { @@ -337,7 +328,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, dev->major, dev->minor, VIR_CGROUP_DEVICE_RWM) < 0) - goto cleanup; + return -1; } VIR_DEBUG("Allowing any disk block devs"); @@ -352,7 +343,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW) | VIR_CGROUP_DEVICE_MKNOD, false) < 0) - goto cleanup; + return -1; } VIR_DEBUG("Allowing any filesystem block devs"); @@ -365,7 +356,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, def->fss[i]->readonly ? VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW, false) < 0) - goto cleanup; + return -1; } VIR_DEBUG("Allowing any hostdev block devs"); @@ -383,12 +374,12 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, if ((usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL)) == NULL) - goto cleanup; + return -1; if (virUSBDeviceFileIterate(usb, virLXCSetupHostUSBDeviceCgroup, cgroup) < 0) { virUSBDeviceFree(usb); - goto cleanup; + return -1; } virUSBDeviceFree(usb); break; @@ -399,14 +390,14 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, hostdev->source.caps.u.storage.block, VIR_CGROUP_DEVICE_RW | VIR_CGROUP_DEVICE_MKNOD, false) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: if (virCgroupAllowDevicePath(cgroup, hostdev->source.caps.u.misc.chardev, VIR_CGROUP_DEVICE_RW | VIR_CGROUP_DEVICE_MKNOD, false) < 0) - goto cleanup; + return -1; break; default: break; @@ -418,13 +409,11 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def, if (virCgroupAllowDevice(cgroup, 'c', LXC_DEV_MAJ_PTY, -1, VIR_CGROUP_DEVICE_RWM) < 0) - goto cleanup; + return -1; VIR_DEBUG("Device whitelist complete"); - ret = 0; - cleanup: - return ret; + return 0; } @@ -482,25 +471,20 @@ int virLXCCgroupSetup(virDomainDefPtr def, virCgroupPtr cgroup, virBitmapPtr nodemask) { - int ret = -1; - if (virLXCCgroupSetupCpuTune(def, cgroup) < 0) - goto cleanup; + return -1; if (virLXCCgroupSetupCpusetTune(def, cgroup, nodemask) < 0) - goto cleanup; + return -1; if (virLXCCgroupSetupBlkioTune(def, cgroup) < 0) - goto cleanup; + return -1; if (virLXCCgroupSetupMemTune(def, cgroup) < 0) - goto cleanup; + return -1; if (virLXCCgroupSetupDeviceACL(def, cgroup) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 88dc2e2bdf..61b4622d7b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -488,7 +488,6 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, size_t nveths, char **veths) { - int ret = -1; size_t i; const char *newname; virDomainNetDefPtr netDef; @@ -497,18 +496,18 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, for (i = 0; i < nveths; i++) { if (!(netDef = lxcContainerGetNetDef(vmDef, veths[i]))) - goto cleanup; + return -1; newname = netDef->ifname_guest; if (!newname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing device name for container-side veth")); - goto cleanup; + return -1; } VIR_DEBUG("Renaming %s to %s", veths[i], newname); if (virNetDevSetName(veths[i], newname) < 0) - goto cleanup; + return -1; /* Only enable this device if there is a reason to do so (either * at least one IP was specified, or link state was set to up in @@ -518,22 +517,20 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { VIR_DEBUG("Enabling %s", newname); if (virNetDevSetOnline(newname, true) < 0) - goto cleanup; + return -1; } /* set IP addresses and routes */ if (virNetDevIPInfoAddToDev(newname, &netDef->guestIP) < 0) - goto cleanup; + return -1; } /* enable lo device only if there were other net devices */ if ((veths || privNet) && virNetDevSetOnline("lo", true) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0c5b9e713d..dda7b375cb 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -358,7 +358,6 @@ static int virLXCControllerValidateNICs(virLXCControllerPtr ctrl) static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) { size_t i; - int ret = -1; /* Gather the ifindexes of the "parent" veths for all interfaces * implemented with a veth pair. These will be used when calling @@ -383,11 +382,11 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) continue; if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, &nicindex) < 0) - goto cleanup; + return -1; if (VIR_EXPAND_N(ctrl->nicindexes, ctrl->nnicindexes, 1) < 0) - goto cleanup; + return -1; VIR_DEBUG("Index %d for %s", nicindex, ctrl->def->nets[i]->ifname); ctrl->nicindexes[ctrl->nnicindexes-1] = nicindex; @@ -407,17 +406,15 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), virDomainNetTypeToString(actualType)); - goto cleanup; + return -1; case VIR_DOMAIN_NET_TYPE_LAST: default: virReportEnumRangeError(virDomainNetType, actualType); - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -605,7 +602,6 @@ static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) { size_t i; - int ret = -1; VIR_DEBUG("Setting up loop devices for filesystems"); @@ -630,33 +626,33 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs format %s is not supported"), virStorageFileFormatTypeToString(fs->format)); - goto cleanup; + return -1; } fd = virLXCControllerSetupLoopDeviceFS(fs); if (fd < 0) - goto cleanup; + return -1; VIR_DEBUG("Saving loop fd %d", fd); if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } ctrl->loopDevFds[ctrl->nloopDevs - 1] = fd; } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_NBD) { if (virLXCControllerSetupNBDDeviceFS(fs) < 0) - goto cleanup; + return -1; /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to * the cgroup*/ if (virLXCControllerAppendNBDPids(ctrl, fs->src->path) < 0) - goto cleanup; + return -1; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs driver %s is not supported"), virDomainFSDriverTypeToString(fs->fsdriver)); - goto cleanup; + return -1; } } @@ -684,7 +680,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk format %s is not supported"), virStorageFileFormatTypeToString(format)); - goto cleanup; + return -1; } /* We treat 'none' as meaning 'raw' since we @@ -693,12 +689,12 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) */ fd = virLXCControllerSetupLoopDeviceDisk(disk); if (fd < 0) - goto cleanup; + return -1; VIR_DEBUG("Saving loop fd %d", fd); if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } ctrl->loopDevFds[ctrl->nloopDevs - 1] = fd; } else if (!driver || STREQ(driver, "nbd")) { @@ -707,29 +703,27 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Disk cache mode %s is not supported"), virDomainDiskCacheTypeToString(disk->cachemode)); - goto cleanup; + return -1; } if (virLXCControllerSetupNBDDeviceDisk(disk) < 0) - goto cleanup; + return -1; /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to * the cgroup*/ if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource(disk)) < 0) - goto cleanup; + return -1; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk driver %s is not supported"), driver); - goto cleanup; + return -1; } } VIR_DEBUG("Setup all loop devices"); - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 41a6a446bd..5caef1a472 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3440,7 +3440,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; if (virDomainNetInsert(vmdef, net) < 0) - goto cleanup; + return ret; dev->data.net = NULL; ret = 0; break; @@ -3464,7 +3464,6 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, break; } - cleanup: return ret; } @@ -3482,7 +3481,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) - goto cleanup; + return -1; oldDev.data.net = vmdef->nets[idx]; if (virDomainDefCompatibleDevice(vmdef, dev, &oldDev, @@ -3505,7 +3504,6 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, break; } - cleanup: return ret; } @@ -3535,7 +3533,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) - goto cleanup; + return ret; /* this is guaranteed to succeed */ virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); @@ -3561,7 +3559,6 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, break; } - cleanup: return ret; } @@ -4499,12 +4496,12 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, { virLXCDomainObjPrivatePtr priv = vm->privateData; virDomainHostdevDefPtr def = NULL; - int idx, ret = -1; + int idx; if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot attach disk until init PID is known")); - goto cleanup; + return -1; } if ((idx = virDomainHostdevFind(vm->def, @@ -4513,18 +4510,18 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.storage.block); - goto cleanup; + return -1; } if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("devices cgroup isn't mounted")); - goto cleanup; + return -1; } if (lxcDomainAttachDeviceUnlink(vm, def->source.caps.u.storage.block) < 0) { virDomainAuditHostdev(vm, def, "detach", false); - goto cleanup; + return -1; } virDomainAuditHostdev(vm, def, "detach", true); @@ -4536,10 +4533,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); - ret = 0; - - cleanup: - return ret; + return 0; } @@ -4549,12 +4543,12 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, { virLXCDomainObjPrivatePtr priv = vm->privateData; virDomainHostdevDefPtr def = NULL; - int idx, ret = -1; + int idx; if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot attach disk until init PID is known")); - goto cleanup; + return -1; } if ((idx = virDomainHostdevFind(vm->def, @@ -4563,18 +4557,18 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.misc.chardev); - goto cleanup; + return -1; } if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("devices cgroup isn't mounted")); - goto cleanup; + return -1; } if (lxcDomainAttachDeviceUnlink(vm, def->source.caps.u.misc.chardev) < 0) { virDomainAuditHostdev(vm, def, "detach", false); - goto cleanup; + return -1; } virDomainAuditHostdev(vm, def, "detach", true); @@ -4586,10 +4580,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); - ret = 0; - - cleanup: - return ret; + return 0; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 450053d163..9549b70372 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -281,7 +281,6 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, virDomainNetDefPtr net, const char *brname) { - char *ret = NULL; char *parentVeth; char *containerVeth = NULL; virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(net); @@ -289,45 +288,42 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, VIR_DEBUG("calling vethCreate()"); parentVeth = net->ifname; if (virNetDevVethCreate(&parentVeth, &containerVeth) < 0) - goto cleanup; + return NULL; VIR_DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVeth); if (net->ifname == NULL) net->ifname = parentVeth; if (virNetDevSetMAC(containerVeth, &net->mac) < 0) - goto cleanup; + return NULL; if (brname) { if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, vm->uuid, vport, virDomainNetGetActualVlan(net)) < 0) - goto cleanup; + return NULL; } else { if (virNetDevBridgeAddPort(brname, parentVeth) < 0) - goto cleanup; + return NULL; } } if (virNetDevSetOnline(parentVeth, true) < 0) - goto cleanup; + return NULL; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_ETHERNET) { /* Set IP info for the host side, but only if the type is * 'ethernet'. */ if (virNetDevIPInfoAddToDev(parentVeth, &net->hostIP) < 0) - goto cleanup; + return NULL; } if (net->filter && virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) - goto cleanup; - - ret = containerVeth; + return NULL; - cleanup: - return ret; + return containerVeth; } @@ -1044,7 +1040,6 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, { int retries = 10; int got = 0; - int ret = -1; char *filter_next = buf; buf[0] = '\0'; @@ -1064,7 +1059,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, if (bytes < 0) { virReportSystemError(errno, "%s", _("Failure while reading log output")); - goto cleanup; + return -1; } got += bytes; @@ -1086,13 +1081,11 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Out of space while reading log output: %s"), buf); - goto cleanup; + return -1; } - if (isdead) { - ret = got; - goto cleanup; - } + if (isdead) + return got; g_usleep(100*1000); retries--; @@ -1102,8 +1095,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, _("Timed out while reading log output: %s"), buf); - cleanup: - return ret; + return -1; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/node_device/node_device_driver.c | 11 +++-------- src/node_device/node_device_udev.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 7ef55f45e9..38a4da0b9b 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -588,20 +588,15 @@ int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret = -1; - if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->nodeDeviceEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } int diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 525e71f80c..0ebf4bebeb 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1264,7 +1264,6 @@ udevSetParent(struct udev_device *device, const char *parent_sysfs_path = NULL; virNodeDeviceObjPtr obj = NULL; virNodeDeviceDefPtr objdef; - int ret = -1; parent_device = device; do { @@ -1278,7 +1277,7 @@ udevSetParent(struct udev_device *device, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get syspath for parent of '%s'"), udev_device_get_syspath(parent_device)); - goto cleanup; + return -1; } if ((obj = virNodeDeviceObjListFindBySysfsPath(driver->devs, @@ -1295,10 +1294,7 @@ udevSetParent(struct udev_device *device, if (!def->parent) def->parent = g_strdup("computer"); - ret = 0; - - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/secret/secret_driver.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6d2844f3b7..2989a3acff 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -614,20 +614,15 @@ static int secretConnectSecretEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret = -1; - if (virConnectSecretEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->secretEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/openvz/openvz_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 4646308c48..f12c91aa88 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -873,12 +873,11 @@ openvzLocateConfDir(void) while (conf_dir_list[i]) { if (virFileExists(conf_dir_list[i])) { ret = g_strdup(conf_dir_list[i]); - goto cleanup; + return ret; } i++; } - cleanup: return ret; } -- 2.21.0

qemuMonitorJSONBlockIoThrottleInfo uses a macro called GET_THROTTLE_STATS that's defined outside of the function, which references a 'cleanup' label. GET_THROTTLE_STATS is only used inside qemuMonitorJSONBlockIoThrottleInfo (in fact, the macro is undef right after it) thus it is safe to erase the 'cleanup' reference inside the macro, then proceed with the usual cleanup label removal inside qemuMonitorJSONBlockIoThrottleInfo. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/qemu/qemu_monitor_json.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 99f55c420a..31e10c5127 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5195,7 +5195,7 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, _("block_io_throttle field '%s' missing " \ "in qemu's output"), \ #STORE); \ - goto cleanup; \ + return -1; \ } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, @@ -5203,7 +5203,6 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, const char *qdevid, virDomainBlockIoTuneInfoPtr reply) { - int ret = -1; size_t i; bool found = false; @@ -5217,7 +5216,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } current_qdev = virJSONValueObjectGetString(temp_dev, "qdev"); @@ -5227,7 +5226,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } if ((drivealias && current_drive && STRNEQ(current_drive, drivealias)) || @@ -5239,7 +5238,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle inserted entry " "was not in expected format")); - goto cleanup; + return -1; } GET_THROTTLE_STATS("bps", total_bytes_sec); GET_THROTTLE_STATS("bps_rd", read_bytes_sec); @@ -5271,12 +5270,10 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find throttling info for device '%s'"), drivealias ? drivealias : qdevid); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } #undef GET_THROTTLE_STATS #undef GET_THROTTLE_STATS_OPTIONAL -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/qemu/qemu_cgroup.c | 15 ++-- src/qemu/qemu_domain.c | 92 ++++++++-------------- src/qemu/qemu_domain_address.c | 31 +++----- src/qemu/qemu_driver.c | 140 ++++++++++++--------------------- src/qemu/qemu_hotplug.c | 45 +++++------ src/qemu/qemu_interface.c | 26 +++--- src/qemu/qemu_migration.c | 38 +++------ src/qemu/qemu_process.c | 77 ++++++------------ src/qemu/qemu_tpm.c | 20 ++--- 9 files changed, 172 insertions(+), 312 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f8bb270117..96d77542ba 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1077,7 +1077,6 @@ qemuSetupCgroup(virDomainObjPtr vm, int *nicindexes) { qemuDomainObjPrivatePtr priv = vm->privateData; - int ret = -1; if (!vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1092,23 +1091,21 @@ qemuSetupCgroup(virDomainObjPtr vm, return 0; if (qemuSetupDevicesCgroup(vm) < 0) - goto cleanup; + return -1; if (qemuSetupBlkioCgroup(vm) < 0) - goto cleanup; + return -1; if (qemuSetupMemoryCgroup(vm) < 0) - goto cleanup; + return -1; if (qemuSetupCpuCgroup(vm) < 0) - goto cleanup; + return -1; if (qemuSetupCpusetCgroup(vm) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } int diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3e8da13794..72bcd74a3a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2300,7 +2300,6 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, { g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER; qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - int ret = -1; if (src->nodestorage || src->nodeformat) { virBufferAddLit(buf, "<nodenames>\n"); @@ -2315,7 +2314,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, virBufferAsprintf(buf, "<reservations mgralias='%s'/>\n", src->pr->mgralias); if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) - goto cleanup; + return -1; virBufferSetChildIndent(&tmp, buf); @@ -2328,12 +2327,9 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, virBufferAsprintf(&tmp, "<TLSx509 alias='%s'/>\n", src->tlsAlias); if (virXMLFormatElement(buf, "objects", NULL, &tmp) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -2615,7 +2611,6 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, { g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; - int ret = -1; virBufferSetChildIndent(&childBuf, buf); @@ -2625,15 +2620,12 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, VIR_DOMAIN_DEF_FORMAT_STATUS, xmlopt) < 0) - goto cleanup; + return -1; if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -2647,7 +2639,6 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; - int ret = -1; for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i]; @@ -2662,16 +2653,13 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, diskPriv->migrSource, priv->driver->xmlopt) < 0) - goto cleanup; + return -1; if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0) - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -2683,7 +2671,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; qemuDomainJob job = priv->job.active; - int ret = -1; if (!qemuDomainTrackJob(job)) job = QEMU_JOB_NONE; @@ -2709,18 +2696,15 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT && qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) - goto cleanup; + return -1; if (priv->job.migParams) qemuMigrationParamsFormat(&childBuf, priv->job.migParams); if (virXMLFormatElement(buf, "job", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -4032,11 +4016,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, bool addDefaultUSBKBD = false; bool addDefaultUSBMouse = false; bool addPanicDevice = false; - int ret = -1; /* add implicit input devices */ if (qemuDomainDefAddImplicitInputDevice(def) < 0) - goto cleanup; + return -1; /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -4149,12 +4132,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0 && virDomainDefAddUSBController(def, 0, usbModel) < 0) - goto cleanup; + return -1; if (addImplicitSATA && virDomainDefMaybeAddController( def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) - goto cleanup; + return -1; pciRoot = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0); @@ -4169,11 +4152,11 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model='pci-root' for this machine type, " "but model='%s' was found instead"), virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)) { - goto cleanup; + return -1; } } @@ -4192,18 +4175,18 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model='pcie-root' for this machine type, " "but model='%s' was found instead"), virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)) { - goto cleanup; + return -1; } } if (addDefaultMemballoon && !def->memballoon) { virDomainMemballoonDefPtr memballoon; if (VIR_ALLOC(memballoon) < 0) - goto cleanup; + return -1; memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; def->memballoon = memballoon; @@ -4238,14 +4221,14 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; if (addDefaultUSBMouse && def->ngraphics > 0 && virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; if (addPanicDevice) { size_t j; @@ -4264,14 +4247,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic) < 0) { VIR_FREE(panic); - goto cleanup; + return -1; } } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -13323,19 +13304,16 @@ qemuDomainPopulateDevices(virQEMUDriverConfigPtr cfg, { const char *const *devices = (const char *const *) cfg->cgroupDeviceACL; size_t i; - int ret = -1; if (!devices) devices = defaultDeviceACL; for (i = 0; devices[i]; i++) { if (qemuDomainCreateDevice(devices[i], data, true) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -13686,7 +13664,6 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, const struct qemuDomainCreateDeviceData *data) { virDomainLoaderDefPtr loader = vm->def->os.loader; - int ret = -1; VIR_DEBUG("Setting up loader"); @@ -13694,16 +13671,16 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, switch ((virDomainLoader) loader->type) { case VIR_DOMAIN_LOADER_TYPE_ROM: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_LOADER_TYPE_PFLASH: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; if (loader->nvram && qemuDomainCreateDevice(loader->nvram, data, false) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_LOADER_TYPE_NONE: @@ -13713,9 +13690,7 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, } VIR_DEBUG("Setup loader"); - ret = 0; - cleanup: - return ret; + return 0; } @@ -14307,7 +14282,6 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver G_GNUC_UNUSED, char * const *devMountsPath, size_t ndevMountsPath) { - int ret = -1; size_t i; if (STRPREFIX(file, QEMU_DEVPREFIX)) { @@ -14322,13 +14296,11 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver G_GNUC_UNUSED, if (virProcessRunInMountNamespace(vm->pid, qemuDomainDetachDeviceUnlinkHelper, (void *)file) < 0) - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index fa40ba4f7d..092357f5f7 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -223,7 +223,6 @@ static int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) { size_t i; - int ret = -1; /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ @@ -234,7 +233,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET) < 0) - goto cleanup; + return -1; } for (i = 0; i < def->ncontrollers; i++) { @@ -246,7 +245,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &cont->info, VIO_ADDR_SCSI) < 0) { - goto cleanup; + return -1; } } @@ -257,7 +256,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &def->serials[i]->info, VIO_ADDR_SERIAL) < 0) - goto cleanup; + return -1; } if (def->nvram) { @@ -265,15 +264,12 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; if (qemuDomainAssignSpaprVIOAddress(def, &def->nvram->info, VIO_ADDR_NVRAM) < 0) - goto cleanup; + return -1; } /* No other devices are currently supported on spapr-vio */ - ret = 0; - - cleanup: - return ret; + return 0; } @@ -1376,7 +1372,6 @@ static int qemuDomainSetupIsolationGroups(virDomainDefPtr def) { int idx; - int ret = -1; /* Only pSeries guests care about isolation groups at the moment */ if (!qemuDomainIsPSeries(def)) @@ -1384,7 +1379,7 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) idx = virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0); if (idx < 0) - goto cleanup; + return -1; /* We want to prevent hostdevs from being plugged into the default PHB: * we can make sure that doesn't happen by locking its isolation group */ @@ -1394,13 +1389,10 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) if (virDomainDeviceInfoIterate(def, qemuDomainFillDeviceIsolationGroupIter, NULL) < 0) { - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -1500,7 +1492,6 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, void *opaque) { virDomainPCIAddressSetPtr addrs = opaque; - int ret = -1; virPCIDeviceAddressPtr addr = &info->addr.pci; if (!virDeviceInfoPCIAddressIsPresent(info) || @@ -1577,12 +1568,10 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, if (virDomainPCIAddressReserveAddr(addrs, addr, info->pciConnectFlags, info->isolationGroup) < 0) { - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af8cbf40f4..1b9469ad1d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3671,7 +3671,6 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - int ret = -1; VIR_DEBUG("Waiting for dump completion"); while (!priv->job.dumpCompleted && !priv->job.abortJob) { @@ -3688,14 +3687,11 @@ qemuDumpWaitForCompletion(virDomainObjPtr vm) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("memory-only dump failed for unknown reason")); - goto cleanup; + return -1; } qemuDomainJobInfoUpdateTime(priv->job.current); - ret = 0; - - cleanup: - return ret; + return 0; } @@ -3739,19 +3735,18 @@ qemuDumpToFd(virQEMUDriverPtr driver, dumpformat); ret = -1; ignore_value(qemuDomainObjExitMonitor(driver, vm)); - goto cleanup; + return ret; } } ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); if ((qemuDomainObjExitMonitor(driver, vm) < 0) || ret < 0) - goto cleanup; + return ret; if (detach) ret = qemuDumpWaitForCompletion(vm); - cleanup: return ret; } @@ -7417,13 +7412,12 @@ static int qemuConnectListDefinedDomains(virConnectPtr conn, int ret = -1; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; ret = virDomainObjListGetInactiveNames(driver->domains, names, nnames, virConnectListDefinedDomainsCheckACL, conn); - cleanup: return ret; } @@ -7433,13 +7427,12 @@ static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) int ret = -1; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; ret = virDomainObjListNumOfDomains(driver->domains, false, virConnectNumOfDefinedDomainsCheckACL, conn); - cleanup: return ret; } @@ -7976,22 +7969,21 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virDomainDiskDefPtr disk = dev->data.disk; virDomainDiskDefPtr orig_disk = NULL; virDomainDeviceDef oldDev = { .type = dev->type }; - int ret = -1; if (!(orig_disk = virDomainDiskByTarget(vm->def, disk->dst))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("disk '%s' not found"), disk->dst); - goto cleanup; + return -1; } oldDev.data.disk = orig_disk; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, true) < 0) - goto cleanup; + return -1; if (!qemuDomainDiskChangeSupported(disk, orig_disk)) - goto cleanup; + return -1; if (!virStorageSourceIsSameLocation(disk->src, orig_disk->src)) { /* Disk source can be changed only for removable devices */ @@ -8000,12 +7992,12 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk source can be changed only in removable " "drives")); - goto cleanup; + return -1; } if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, dev->data.disk->src, force) < 0) - goto cleanup; + return -1; dev->data.disk->src = NULL; } @@ -8013,9 +8005,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, orig_disk->startupPolicy = dev->data.disk->startupPolicy; orig_disk->snapshot = dev->data.disk->snapshot; - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -12334,20 +12324,16 @@ qemuConnectDomainEventRegister(virConnectPtr conn, virFreeCallback freecb) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectDomainEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virDomainEventStateRegister(conn, driver->domainEventState, callback, opaque, freecb) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -12356,20 +12342,16 @@ qemuConnectDomainEventDeregister(virConnectPtr conn, virConnectDomainEventCallback callback) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectDomainEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virDomainEventStateDeregister(conn, driver->domainEventState, callback) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -12385,7 +12367,7 @@ qemuConnectDomainEventRegisterAny(virConnectPtr conn, int ret = -1; if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virDomainEventStateRegisterID(conn, driver->domainEventState, @@ -12393,7 +12375,6 @@ qemuConnectDomainEventRegisterAny(virConnectPtr conn, callback, opaque, freecb, &ret) < 0) ret = -1; - cleanup: return ret; } @@ -12403,20 +12384,16 @@ qemuConnectDomainEventDeregisterAny(virConnectPtr conn, int callbackID) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -15025,7 +15002,6 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); - int ret = -1; size_t i; bool active = virDomainObjIsActive(vm); bool reuse = (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; @@ -15039,7 +15015,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && qemuDomainDiskBlockJobIsActive(dom_disk)) - goto cleanup; + return -1; switch ((virDomainSnapshotLocation) disk->snapshot) { case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: @@ -15050,12 +15026,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, _("active qemu domains require external disk " "snapshots; disk %s requested internal"), disk->name); - goto cleanup; + return -1; } if (qemuDomainSnapshotPrepareDiskInternal(dom_disk, active) < 0) - goto cleanup; + return -1; if (vm->def->disks[i]->src->format > 0 && vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) { @@ -15065,7 +15041,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); - goto cleanup; + return -1; } break; @@ -15079,12 +15055,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, "is unsupported: %s"), disk->name, virStorageFileFormatTypeToString(disk->src->format)); - goto cleanup; + return -1; } if (qemuDomainSnapshotPrepareDiskExternal(dom_disk, disk, active, reuse, blockdev) < 0) - goto cleanup; + return -1; external++; break; @@ -15100,7 +15076,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected code path")); - goto cleanup; + return -1; } } @@ -15108,7 +15084,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nothing selected for snapshot")); - goto cleanup; + return -1; } /* internal snapshot requires a disk image to store the memory image to, and @@ -15118,7 +15094,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("internal and full system snapshots require all " "disks to be selected for snapshot")); - goto cleanup; + return -1; } /* disk snapshot requires at least one disk */ @@ -15126,7 +15102,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk-only snapshots require at least " "one disk to be selected for snapshot")); - goto cleanup; + return -1; } /* For now, we don't allow mixing internal and external disks. @@ -15138,7 +15114,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("mixing internal and external targets for a snapshot " "is not yet supported")); - goto cleanup; + return -1; } /* internal snapshots + pflash based loader have the following problems: @@ -15155,17 +15131,14 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("internal snapshots of a VM with pflash based " "firmware are not supported")); - goto cleanup; + return -1; } /* Alter flags to let later users know what we learned. */ if (external && !active) *flags |= VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY; - ret = 0; - - cleanup: - return ret; + return 0; } @@ -17420,7 +17393,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, case QEMU_BLOCKJOB_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid job type '%d'"), job->type); - goto cleanup; + return -1; case QEMU_BLOCKJOB_TYPE_PULL: case QEMU_BLOCKJOB_TYPE_COMMIT: @@ -17429,7 +17402,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_INVALID, _("job type '%s' does not support pivot"), qemuBlockjobTypeToString(job->type)); - goto cleanup; + return -1; case QEMU_BLOCKJOB_TYPE_COPY: case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: @@ -17440,7 +17413,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, _("block job '%s' not ready for pivot yet"), job->name); - goto cleanup; + return -1; } qemuDomainObjEnterMonitor(driver, vm); @@ -17450,18 +17423,17 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, ret = qemuMonitorDrivePivot(priv->mon, job->name); if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret = -1; - goto cleanup; + return ret; } /* The pivot failed. The block job in QEMU remains in the synchronised state */ if (ret < 0) - goto cleanup; + return ret; if (disk && disk->mirror) disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT; job->state = QEMU_BLOCKJOB_STATE_PIVOTING; - cleanup: return ret; } @@ -19806,18 +19778,14 @@ qemuConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) - goto cleanup; - - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); + return -1; - cleanup: - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static char * @@ -19879,7 +19847,7 @@ qemuConnectDomainQemuMonitorEventRegister(virConnectPtr conn, int ret = -1; if (virConnectDomainQemuMonitorEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virDomainQemuMonitorEventStateRegisterID(conn, driver->domainEventState, @@ -19888,7 +19856,6 @@ qemuConnectDomainQemuMonitorEventRegister(virConnectPtr conn, &ret) < 0) ret = -1; - cleanup: return ret; } @@ -19898,19 +19865,15 @@ qemuConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, int callbackID) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectDomainQemuMonitorEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -20792,13 +20755,12 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED, { size_t i; struct _virDomainInterfaceStats tmp; - int ret = -1; if (!virDomainObjIsActive(dom)) return 0; if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0) - goto cleanup; + return -1; /* Check the path is one of the domain's network interfaces. */ for (i = 0; i < dom->def->nnets; i++) { @@ -20813,7 +20775,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED, actualType = virDomainNetGetActualType(net); if (virTypedParamListAddString(params, net->ifname, "net.%zu.name", i) < 0) - goto cleanup; + return -1; if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) { @@ -20846,9 +20808,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED, "tx.drop", tmp.tx_drop); } - ret = 0; - cleanup: - return ret; + return 0; } #undef QEMU_ADD_NET_PARAM diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef0c..e70bc018f7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3300,23 +3300,19 @@ qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainLeaseDefPtr lease) { - int ret = -1; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); if (virDomainLeaseInsertPreAlloc(vm->def) < 0) - goto cleanup; + return -1; if (virDomainLockLeaseAttach(driver->lockManager, cfg->uri, vm, lease) < 0) { virDomainLeaseInsertPreAlloced(vm->def, NULL); - goto cleanup; + return -1; } virDomainLeaseInsertPreAlloced(vm->def, lease); - ret = 0; - - cleanup: - return ret; + return 0; } @@ -3331,7 +3327,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, if (!oldbridge || !newbridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); - goto cleanup; + return -1; } VIR_DEBUG("Change bridge for interface %s: %s -> %s", @@ -3340,7 +3336,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, if (virNetDevExists(newbridge) != 1) { virReportError(VIR_ERR_OPERATION_FAILED, _("bridge %s doesn't exist"), newbridge); - goto cleanup; + return -1; } ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); @@ -3364,12 +3360,10 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, _("unable to recover former state by adding port " "to bridge %s"), oldbridge); } - goto cleanup; + return ret; } /* caller will replace entire olddev with newdev in domain nets list */ - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -4019,14 +4013,14 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_DEVICE_MISSING, _("cannot find existing graphics device to modify of " "type '%s'"), type); - goto cleanup; + return -1; } if (dev->nListens != olddev->nListens) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the number of listen addresses " "on '%s' graphics"), type); - goto cleanup; + return -1; } for (i = 0; i < dev->nListens; i++) { @@ -4037,7 +4031,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the type of listen address " "on '%s' graphics"), type); - goto cleanup; + return ret; } switch (newlisten->type) { @@ -4046,7 +4040,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } break; @@ -4056,7 +4050,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } break; @@ -4066,7 +4060,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen socket setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } break; @@ -4084,12 +4078,12 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.vnc.port != dev->data.vnc.port))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on vnc graphics")); - goto cleanup; + return ret; } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on vnc graphics")); - goto cleanup; + return ret; } /* If a password lifetime was, or is set, or action if connected has @@ -4108,7 +4102,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, cfg->vncPassword, QEMU_ASYNC_JOB_NONE); if (ret < 0) - goto cleanup; + return ret; /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.vnc.auth.passwd); @@ -4130,13 +4124,13 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.spice.tlsPort != dev->data.spice.tlsPort))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on spice graphics")); - goto cleanup; + return ret; } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on spice graphics")); - goto cleanup; + return ret; } /* We must reset the password if it has changed but also if: @@ -4160,7 +4154,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_NONE); if (ret < 0) - goto cleanup; + return ret; /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.spice.auth.passwd); @@ -4188,7 +4182,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; } - cleanup: return ret; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 70832e0c9a..5846f636cb 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -53,7 +53,6 @@ VIR_LOG_INIT("qemu.qemu_interface"); int qemuInterfaceStartDevice(virDomainNetDefPtr net) { - int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); switch (actualType) { @@ -71,7 +70,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBAdd(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; @@ -84,9 +83,9 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * some sort of "blip" in the physdev's status. */ if (physdev && virNetDevGetOnline(physdev, &isOnline) < 0) - goto cleanup; + return -1; if (!isOnline && virNetDevSetOnline(physdev, true) < 0) - goto cleanup; + return -1; /* macvtap devices share their MAC address with the guest * domain, and if they are set online prior to the domain CPUs @@ -101,13 +100,13 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * we are starting the domain CPUs. */ if (virNetDevSetOnline(net->ifname, true) < 0) - goto cleanup; + return -1; break; } case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0) - goto cleanup; + return -1; break; @@ -124,9 +123,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) break; } - ret = 0; - cleanup: - return ret; + return 0; } /** @@ -159,7 +156,6 @@ qemuInterfaceStartDevices(virDomainDefPtr def) int qemuInterfaceStopDevice(virDomainNetDefPtr net) { - int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); switch (actualType) { @@ -173,7 +169,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBDel(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; @@ -186,7 +182,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) * on this network. */ if (virNetDevSetOnline(net->ifname, false) < 0) - goto cleanup; + return -1; /* also mark the physdev down for passthrough macvtap, as the * physdev has the same MAC address as the macvtap device. @@ -194,7 +190,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_PASSTHRU && physdev && virNetDevSetOnline(physdev, false) < 0) - goto cleanup; + return -1; break; } @@ -212,9 +208,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } - ret = 0; - cleanup: - return ret; + return 0; } /** diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3f90536339..02787e81d8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1771,7 +1771,6 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G_GNUC_UNUSED, qemuMigrationCookiePtr cookie) { virDomainNetDefPtr netptr; - int ret = -1; size_t i; for (i = 0; i < cookie->network->nnets; i++) { @@ -1788,7 +1787,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G_GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to run command to set OVS port data for " "interface %s"), netptr->ifname); - goto cleanup; + return -1; } break; default: @@ -1796,9 +1795,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G_GNUC_UNUSED, } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -1849,7 +1846,6 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - int ret = -1; int rv; VIR_DEBUG("Setting up incoming migration with URI %s", uri); @@ -1860,21 +1856,16 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, rv = qemuMonitorMigrateIncoming(priv->mon, uri); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) - goto cleanup; + return -1; - if (asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) { + if (asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) /* qemuMigrationDstWaitForCompletion is called from the Finish phase */ - ret = 0; - goto cleanup; - } + return 0; if (qemuMigrationDstWaitForCompletion(driver, vm, asyncJob, false) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -4666,9 +4657,9 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!(flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) - goto cleanup; + return ret; } else if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) { - goto cleanup; + return ret; } qemuMigrationJobStartPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); @@ -4703,7 +4694,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!virDomainObjIsActive(vm)) qemuDomainRemoveInactiveJob(driver, vm); - cleanup: return ret; } @@ -5327,7 +5317,6 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; bool storage = false; size_t i; - int ret = -1; VIR_DEBUG("Canceling unfinished outgoing migration of domain %s", vm->def->name); @@ -5335,7 +5324,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -5357,12 +5346,9 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, if (storage && qemuMigrationSrcNBDCopyCancel(driver, vm, false, QEMU_ASYNC_JOB_NONE, NULL) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e0dc26658..20bf67568b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2255,24 +2255,21 @@ qemuProcessRefreshPRManagerState(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; qemuMonitorPRManagerInfoPtr prManagerInfo; const char *managedAlias = qemuDomainGetManagedPRAlias(); - int ret = -1; if (!(prManagerInfo = virHashLookup(info, managedAlias))) { virReportError(VIR_ERR_OPERATION_FAILED, _("missing info on pr-manager %s"), managedAlias); - goto cleanup; + return -1; } priv->prDaemonRunning = prManagerInfo->connected; if (!priv->prDaemonRunning && qemuProcessStartManagedPRDaemon(vm) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -4998,16 +4995,15 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr graphics; bool allocate = !(flags & VIR_QEMU_PROCESS_START_PRETEND); size_t i; - int ret = -1; for (i = 0; i < vm->def->ngraphics; i++) { graphics = vm->def->graphics[i]; if (qemuProcessGraphicsSetupRenderNode(graphics, qemuCaps) < 0) - goto cleanup; + return -1; if (qemuProcessGraphicsSetupListen(driver, graphics, vm) < 0) - goto cleanup; + return -1; } if (allocate) { @@ -5015,7 +5011,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics = vm->def->graphics[i]; if (qemuProcessGraphicsReservePorts(graphics, false) < 0) - goto cleanup; + return -1; } } @@ -5023,13 +5019,10 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics = vm->def->graphics[i]; if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) < 0) - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -5130,20 +5123,15 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *path) { - int ret = -1; - if (virFileMakePathWithMode(path, 0750) < 0) { virReportSystemError(errno, _("Cannot create directory '%s'"), path); - goto cleanup; + return -1; } if (qemuSecurityDomainSetPathLabel(driver, vm, path, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -8499,30 +8487,29 @@ static int qemuProcessQMPInit(qemuProcessQMPPtr proc) { char *template = NULL; - int ret = -1; VIR_DEBUG("proc=%p, emulator=%s", proc, proc->binary); if (virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir) < 0) - goto cleanup; + return -1; if (!(proc->uniqDir = mkdtemp(template))) { virReportSystemError(errno, _("Failed to create unique directory with " "template '%s' for probing QEMU"), template); - goto cleanup; + return -1; } if (qemuProcessQEMULabelUniqPath(proc) < 0) - goto cleanup; + return -1; if (virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor") < 0) - goto cleanup; + return -1; if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath) < 0) - goto cleanup; + return -1; /* * Normally we'd use runDir for pid files, but because we're using @@ -8530,12 +8517,9 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) * than libvirtd. So we're using libDir which QEMU can write to */ if (virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid") < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -8544,7 +8528,6 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) { const char *machine; int status = 0; - int ret = -1; int rc; if (proc->forceTCG) @@ -8588,7 +8571,7 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) virCommandSetErrorBuffer(proc->cmd, &(proc->stdErr)); if (virCommandRun(proc->cmd, &status) < 0) - goto cleanup; + return -1; if (status != 0) { VIR_DEBUG("QEMU %s exited with status %d", proc->binary, status); @@ -8596,18 +8579,15 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) _("Failed to start QEMU binary %s for probing: %s"), proc->binary, proc->stdErr ? proc->stdErr : _("unknown error")); - goto cleanup; + return -1; } if ((rc = virPidFileReadPath(proc->pidfile, &proc->pid)) < 0) { virReportSystemError(-rc, _("Failed to read pidfile %s"), proc->pidfile); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } @@ -8680,21 +8660,16 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) int qemuProcessQMPStart(qemuProcessQMPPtr proc) { - int ret = -1; - VIR_DEBUG("proc=%p, emulator=%s", proc, proc->binary); if (qemuProcessQMPInit(proc) < 0) - goto cleanup; + return -1; if (qemuProcessQMPLaunch(proc) < 0) - goto cleanup; + return -1; if (qemuProcessQMPConnectMonitor(proc) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f21dbf9727..18390f9278 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -320,8 +320,6 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, uid_t qemu_user, const char *shortName) { - int ret = -1; - if (virTPMEmulatorInit() < 0) return -1; @@ -332,17 +330,17 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, /* ... and adjust ownership */ if (virDirCreate(logDir, 0730, swtpm_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; /* create logfile name ... */ if (!tpm->data.emulator.logfile && virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir, vmname) < 0) - goto cleanup; + return -1; if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { - goto cleanup; + return -1; } /* ... and make sure it can be accessed by swtpm_user */ @@ -350,7 +348,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, virReportSystemError(errno, _("Could not chown on swtpm logfile %s"), tpm->data.emulator.logfile); - goto cleanup; + return -1; } /* @@ -362,20 +360,16 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, */ if (virDirCreate(swtpmStateDir, 0770, qemu_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; /* create the socket filename */ if (!tpm->data.emulator.source.data.nix.path && !(tpm->data.emulator.source.data.nix.path = qemuTPMCreateEmulatorSocket(swtpmStateDir, shortName))) - goto cleanup; + return -1; tpm->data.emulator.source.type = VIR_DOMAIN_CHR_TYPE_UNIX; - ret = 0; - - cleanup: - - return ret; + return 0; } /* -- 2.21.0

On 11/12/19 1:40 PM, Ján Tomko wrote: Thanks for the reviews. Just saw you pushed almost all of the series, dropping the patch you mentioned holding back 3 patches pending review. I'll send a v2 with these 3 remaining patches. DHB

On Mon, Oct 21, 2019 at 03:19:03PM -0300, Daniel Henrique Barboza wrote: How did you come up with -2 here? Jano

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/util/vircgroupv1.c | 18 ++++--------- src/util/vircommand.c | 11 +++----- src/util/virdbus.c | 30 +++++++-------------- src/util/virfile.c | 19 +++++-------- src/util/virhash.c | 6 ++--- src/util/virhostcpu.c | 20 ++++++-------- src/util/virhostdev.c | 7 ++--- src/util/virhostmem.c | 55 +++++++++++++------------------------- src/util/virjson.c | 30 +++++++++------------ src/util/virmacmap.c | 10 +++---- src/util/virnetdevbridge.c | 21 +++++---------- src/util/virnuma.c | 27 +++++++------------ src/util/virpci.c | 7 ++--- src/util/virprocess.c | 19 +++++-------- src/util/virresctrl.c | 7 ++--- src/util/virstoragefile.c | 46 +++++++++++-------------------- src/util/virutil.c | 19 ++++++------- 17 files changed, 117 insertions(+), 235 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 0820c5d638..d70e910b4c 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -708,7 +708,6 @@ virCgroupV1AddTask(virCgroupPtr group, pid_t pid, unsigned int flags) { - int ret = -1; size_t i; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -724,12 +723,10 @@ virCgroupV1AddTask(virCgroupPtr group, continue; if (virCgroupSetValueI64(group, i, "tasks", pid) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -1845,18 +1842,13 @@ static int virCgroupV1AllowAllDevices(virCgroupPtr group, int perms) { - int ret = -1; - if (virCgroupV1AllowDevice(group, 'b', -1, -1, perms) < 0) - goto cleanup; + return -1; if (virCgroupV1AllowDevice(group, 'c', -1, -1, perms) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 223a2a824e..240a670ea1 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -405,8 +405,6 @@ virCommandHandshakeChild(virCommandPtr cmd) static int virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups) { - int ret = -1; - if (cmd->uid != (uid_t)-1 || cmd->gid != (gid_t)-1 || cmd->capabilities || (cmd->flags & VIR_EXEC_CLEAR_CAPS)) { VIR_DEBUG("Setting child uid:gid to %d:%d with caps %llx", @@ -414,7 +412,7 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups) if (virSetUIDGIDWithCaps(cmd->uid, cmd->gid, groups, ngroups, cmd->capabilities, !!(cmd->flags & VIR_EXEC_CLEAR_CAPS)) < 0) - goto cleanup; + return -1; } if (cmd->pwd) { @@ -422,13 +420,10 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups) if (chdir(cmd->pwd) < 0) { virReportSystemError(errno, _("Unable to change to %s"), cmd->pwd); - goto cleanup; + return -1; } } - ret = 0; - - cleanup: - return ret; + return 0; } # ifdef __linux__ diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 89c9cb3e24..e44d2bc6a1 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1194,7 +1194,6 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret = -1; if (!dbus_message_iter_init(msg, &iter)) { if (*types != '\0') { @@ -1202,15 +1201,12 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, _("No args present for signature %s"), types); } else { - ret = 0; + return 0; } - goto cleanup; + return -1; } - ret = virDBusMessageIterDecode(&iter, types, args); - - cleanup: - return ret; + return virDBusMessageIterDecode(&iter, types, args); } @@ -1399,25 +1395,21 @@ int virDBusCreateMethodV(DBusMessage **call, const char *types, va_list args) { - int ret = -1; - if (!(*call = dbus_message_new_method_call(destination, path, iface, member))) { virReportOOMError(); - goto cleanup; + return -1; } if (virDBusMessageEncodeArgs(*call, types, args) < 0) { virDBusMessageUnref(*call); *call = NULL; - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -1471,22 +1463,18 @@ int virDBusCreateReplyV(DBusMessage **reply, const char *types, va_list args) { - int ret = -1; - if (!(*reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN))) { virReportOOMError(); - goto cleanup; + return -1; } if (virDBusMessageEncodeArgs(*reply, types, args) < 0) { virDBusMessageUnref(*reply); *reply = NULL; - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virfile.c b/src/util/virfile.c index c4d544be73..10526dc644 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3610,27 +3610,25 @@ int virFileGetHugepageSize(const char *path, unsigned long long *size) { - int ret = -1; struct statfs fs; if (statfs(path, &fs) < 0) { virReportSystemError(errno, _("cannot determine filesystem for '%s'"), path); - goto cleanup; + return -1; } if (fs.f_type != HUGETLBFS_MAGIC) { virReportError(VIR_ERR_INTERNAL_ERROR, _("not a hugetlbfs mount: '%s'"), path); - goto cleanup; + return -1; } *size = fs.f_bsize / 1024; /* we are storing size in KiB */ - ret = 0; - cleanup: - return ret; + + return 0; } # define PROC_MEMINFO "/proc/meminfo" @@ -3802,12 +3800,11 @@ virFileSetupDev(const char *path, { const unsigned long mount_flags = MS_NOSUID; const char *mount_fs = "tmpfs"; - int ret = -1; if (virFileMakePath(path) < 0) { virReportSystemError(errno, _("Failed to make path %s"), path); - goto cleanup; + return -1; } VIR_DEBUG("Mount devfs on %s type=tmpfs flags=0x%lx, opts=%s", @@ -3816,12 +3813,10 @@ virFileSetupDev(const char *path, virReportSystemError(errno, _("Failed to mount devfs on %s type %s (%s)"), path, mount_fs, mount_options); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virhash.c b/src/util/virhash.c index 05a3b803f2..1df7f6efca 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -646,15 +646,13 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) ret = iter(entry->payload, entry->name, data); if (ret < 0) - goto cleanup; + return ret; entry = next; } } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index d544d36c61..5a7b61e0d7 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -776,7 +776,6 @@ virHostCPUGetStatsLinux(FILE *procstat, virNodeCPUStatsPtr params, int *nparams) { - int ret = -1; char line[1024]; unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; @@ -785,15 +784,14 @@ virHostCPUGetStatsLinux(FILE *procstat, if ((*nparams) == 0) { /* Current number of cpu stats supported by linux */ *nparams = LINUX_NB_CPU_STATS; - ret = 0; - goto cleanup; + return 0; } if ((*nparams) != LINUX_NB_CPU_STATS) { virReportInvalidArg(*nparams, _("nparams in %s must be equal to %d"), __FUNCTION__, LINUX_NB_CPU_STATS); - goto cleanup; + return -1; } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { @@ -816,22 +814,21 @@ virHostCPUGetStatsLinux(FILE *procstat, if (virHostCPUStatsAssign(&params[0], VIR_NODE_CPU_STATS_KERNEL, (sys + irq + softirq) * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; if (virHostCPUStatsAssign(&params[1], VIR_NODE_CPU_STATS_USER, (usr + ni) * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; if (virHostCPUStatsAssign(&params[2], VIR_NODE_CPU_STATS_IDLE, idle * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; if (virHostCPUStatsAssign(&params[3], VIR_NODE_CPU_STATS_IOWAIT, iowait * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; - ret = 0; - goto cleanup; + return 0; } } @@ -839,8 +836,7 @@ virHostCPUGetStatsLinux(FILE *procstat, _("Invalid cpuNum in %s"), __FUNCTION__); - cleanup: - return ret; + return 0; } diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 010eb551a9..c35b6ff3b6 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -80,7 +80,6 @@ struct virHostdevIsPCINodeDeviceUsedData { static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddressPtr devAddr, void *opaque) { virPCIDevicePtr actual; - int ret = -1; struct virHostdevIsPCINodeDeviceUsedData *helperData = opaque; actual = virPCIDeviceListFindByIDs(helperData->mgr->activePCIHostdevs, @@ -106,12 +105,10 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddressPtr devAddr, void *o virReportError(VIR_ERR_OPERATION_INVALID, _("PCI device %s is in use"), virPCIDeviceGetName(actual)); - goto cleanup; + return -1; } iommu_owner: - ret = 0; - cleanup: - return ret; + return 0; } static int virHostdevManagerOnceInit(void) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index c1dfc1225c..0918ede7c2 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -142,7 +142,6 @@ virHostMemGetStatsLinux(FILE *meminfo, virNodeMemoryStatsPtr params, int *nparams) { - int ret = -1; size_t i = 0, j = 0, k = 0; int found = 0; int nr_param; @@ -169,15 +168,14 @@ virHostMemGetStatsLinux(FILE *meminfo, if ((*nparams) == 0) { /* Current number of memory stats supported by linux */ *nparams = nr_param; - ret = 0; - goto cleanup; + return 0; } if ((*nparams) != nr_param) { virReportInvalidArg(nparams, _("nparams in %s must be %d"), __FUNCTION__, nr_param); - goto cleanup; + return -1; } while (fgets(line, sizeof(line), meminfo) != NULL) { @@ -200,7 +198,7 @@ virHostMemGetStatsLinux(FILE *meminfo, if (p == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no prefix found")); - goto cleanup; + return -1; } p++; } @@ -219,7 +217,7 @@ virHostMemGetStatsLinux(FILE *meminfo, if (virStrcpyStatic(param->field, convp->field) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel memory too long for destination")); - goto cleanup; + return -1; } param->value = val; found++; @@ -233,13 +231,10 @@ virHostMemGetStatsLinux(FILE *meminfo, if (found == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no available memory line found")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } #endif @@ -620,14 +615,12 @@ static int virHostMemGetInfoFake(unsigned long long *mem, unsigned long long *freeMem) { - int ret = -1; - if (mem) { double total = physmem_total(); if (!total) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot determine free memory")); - goto cleanup; + return -1; } *mem = (unsigned long long) total; @@ -639,15 +632,13 @@ virHostMemGetInfoFake(unsigned long long *mem, if (!avail) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot determine free memory")); - goto cleanup; + return -1; } *freeMem = (unsigned long long) avail; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -658,7 +649,6 @@ virHostMemGetCellsFree(unsigned long long *freeMems, { unsigned long long mem; int n, lastCell, numCells; - int ret = -1; int maxCell; if (!virNumaIsAvailable()) @@ -672,7 +662,7 @@ virHostMemGetCellsFree(unsigned long long *freeMems, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, maxCell); - goto cleanup; + return -1; } lastCell = startCell + maxCells - 1; if (lastCell > maxCell) @@ -683,10 +673,7 @@ virHostMemGetCellsFree(unsigned long long *freeMems, freeMems[numCells++] = mem; } - ret = numCells; - - cleanup: - return ret; + return numCells; } int @@ -734,7 +721,6 @@ virHostMemGetFreePages(unsigned int npages, unsigned int cellCount, unsigned long long *counts) { - int ret = -1; int cell, lastCell; size_t i, ncounts = 0; @@ -745,7 +731,7 @@ virHostMemGetFreePages(unsigned int npages, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, lastCell); - goto cleanup; + return -1; } lastCell = MIN(lastCell, startCell + (int) cellCount - 1); @@ -756,7 +742,7 @@ virHostMemGetFreePages(unsigned int npages, unsigned long long page_free; if (virNumaGetPageInfo(cell, page_size, 0, NULL, &page_free) < 0) - goto cleanup; + return -1; counts[ncounts++] = page_free; } @@ -765,12 +751,10 @@ virHostMemGetFreePages(unsigned int npages, if (!ncounts) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no suitable info found")); - goto cleanup; + return -1; } - ret = ncounts; - cleanup: - return ret; + return ncounts; } int @@ -781,7 +765,6 @@ virHostMemAllocPages(unsigned int npages, unsigned int cellCount, bool add) { - int ret = -1; int cell, lastCell; size_t i, ncounts = 0; @@ -792,7 +775,7 @@ virHostMemAllocPages(unsigned int npages, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, lastCell); - goto cleanup; + return -1; } lastCell = MIN(lastCell, startCell + (int) cellCount - 1); @@ -803,13 +786,11 @@ virHostMemAllocPages(unsigned int npages, unsigned long long page_count = pageCounts[i]; if (virNumaSetPagePoolSize(cell, page_size, page_count, add) < 0) - goto cleanup; + return -1; ncounts++; } } - ret = ncounts; - cleanup: - return ret; + return ncounts; } diff --git a/src/util/virjson.c b/src/util/virjson.c index eb6207f13f..1b1be81a1a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -160,7 +160,6 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, { char type; char *key; - int ret = -1; int rc; while ((key = va_arg(args, char *)) != NULL) { @@ -169,7 +168,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' is too short, missing type prefix"), key); - goto cleanup; + return -1; } type = key[0]; @@ -187,7 +186,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null value"), key); - goto cleanup; + return -1; } rc = virJSONValueObjectAppendString(obj, key, val); } break; @@ -202,7 +201,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not be negative"), key); - goto cleanup; + return -1; } if (!val && (type == 'z' || type == 'y')) @@ -231,7 +230,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not be negative"), key); - goto cleanup; + return -1; } if (!val && (type == 'Z' || type == 'Y')) @@ -296,7 +295,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null value"), key); - goto cleanup; + return -1; } if ((rc = virJSONValueObjectAppend(obj, key, *val)) == 0) @@ -315,11 +314,11 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null value"), key); - goto cleanup; + return -1; } if (!(jsonMap = virJSONValueNewArrayFromBitmap(map))) - goto cleanup; + return -1; if ((rc = virJSONValueObjectAppend(obj, key, jsonMap)) < 0) virJSONValueFree(jsonMap); @@ -328,23 +327,18 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported data type '%c' for arg '%s'"), type, key - 2); - goto cleanup; + return -1; } if (rc < 0) - goto cleanup; + return -1; } /* verify that we added at least one key-value pair */ - if (virJSONValueObjectKeysNumber(obj) == 0) { - ret = 0; - goto cleanup; - } - - ret = 1; + if (virJSONValueObjectKeysNumber(obj) == 0) + return 0; - cleanup: - return ret; + return 1; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 43cefc1e8e..ee8633281b 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -85,22 +85,18 @@ virMacMapAddLocked(virMacMapPtr mgr, const char *domain, const char *mac) { - int ret = -1; char **macsList = NULL; if ((macsList = virHashLookup(mgr->macs, domain)) && virStringListHasString((const char**) macsList, mac)) { - ret = 0; - goto cleanup; + return 0; } if (virStringListAdd(&macsList, mac) < 0 || virHashUpdateEntry(mgr->macs, domain, macsList) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index edf4cc6236..5dca8fdfae 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -274,16 +274,13 @@ virNetDevBridgePortGetLearning(const char *brname, const char *ifname, bool *enable) { - int ret = -1; unsigned long value; if (virNetDevBridgePortGet(brname, ifname, "learning", &value) < 0) - goto cleanup; + return -1; *enable = !!value; - ret = 0; - cleanup: - return ret; + return 0; } @@ -301,16 +298,13 @@ virNetDevBridgePortGetUnicastFlood(const char *brname, const char *ifname, bool *enable) { - int ret = -1; unsigned long value; if (virNetDevBridgePortGet(brname, ifname, "unicast_flood", &value) < 0) - goto cleanup; + return -1; *enable = !!value; - ret = 0; - cleanup: - return ret; + return 0; } @@ -863,16 +857,13 @@ int virNetDevBridgeGetVlanFiltering(const char *brname, bool *enable) { - int ret = -1; unsigned long value; if (virNetDevBridgeGet(brname, "vlan_filtering", &value) < 0) - goto cleanup; + return -1; *enable = !!value; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 448833d8d1..761770979b 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -93,7 +93,6 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, { nodemask_t mask; int node = -1; - int ret = -1; int bit = 0; size_t i; int maxnode = 0; @@ -140,7 +139,7 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA memory tuning in 'preferred' mode " "only supports single node")); - goto cleanup; + return -1; } numa_set_bind_policy(0); @@ -155,10 +154,8 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, case VIR_DOMAIN_NUMATUNE_MEM_LAST: break; } - ret = 0; - cleanup: - return ret; + return 0; } bool @@ -466,7 +463,6 @@ virNumaGetDistances(int node, int **distances, int *ndistances) { - int ret = -1; int max_node; size_t i; @@ -478,10 +474,10 @@ virNumaGetDistances(int node, } if ((max_node = virNumaGetMaxNode()) < 0) - goto cleanup; + return -1; if (VIR_ALLOC_N(*distances, max_node + 1) < 0) - goto cleanup; + return -1; *ndistances = max_node + 1; @@ -492,9 +488,7 @@ virNumaGetDistances(int node, (*distances)[i] = numa_distance(node, i); } - ret = 0; - cleanup: - return ret; + return 0; } #else /* !(WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET) */ @@ -689,7 +683,6 @@ virNumaGetPageInfo(int node, unsigned long long *page_avail, unsigned long long *page_free) { - int ret = -1; long system_page_size = virGetSystemPageSize(); /* sysconf() returns page size in bytes, @@ -701,10 +694,10 @@ virNumaGetPageInfo(int node, * account. The problem is huge pages cut off regular memory. */ if (node == -1) { if (virHostMemGetInfo(&memsize, &memfree) < 0) - goto cleanup; + return -1; } else { if (virNumaGetNodeMemory(node, &memsize, &memfree) < 0) - goto cleanup; + return -1; } /* see description above */ @@ -717,12 +710,10 @@ virNumaGetPageInfo(int node, *page_free = memfree / system_page_size; } else { if (virNumaGetHugePageInfo(node, page_size, page_avail, page_free) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..a39c2be29f 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1908,18 +1908,15 @@ virPCIDeviceAddressGetIOMMUGroupAddresses(virPCIDeviceAddressPtr devAddr, virPCIDeviceAddressPtr **iommuGroupDevices, size_t *nIommuGroupDevices) { - int ret = -1; virPCIDeviceAddressList addrList = { iommuGroupDevices, nIommuGroupDevices }; if (virPCIDeviceAddressIOMMUGroupIterate(devAddr, virPCIGetIOMMUGroupAddressesAddOne, &addrList) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b5fda05e0c..2073664303 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -349,7 +349,6 @@ int virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay) { size_t i; - int ret = -1; /* This is in 1/5th seconds since polling is on a 0.2s interval */ unsigned int polldelay = (force ? 200 : 75) + (extradelay*5); const char *signame = "TERM"; @@ -393,10 +392,9 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay) virReportSystemError(errno, _("Failed to terminate process %lld with SIG%s"), (long long)pid, signame); - goto cleanup; + return -1; } - ret = signum == SIGTERM ? 0 : 1; - goto cleanup; /* process is dead */ + return signum == SIGTERM ? 0 : 1; } g_usleep(200 * 1000); @@ -406,8 +404,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay) _("Failed to terminate process %lld with SIG%s"), (long long)pid, signame); - cleanup: - return ret; + return 0; } @@ -1183,23 +1180,19 @@ virProcessRunInFork(virProcessForkCallback cb, int virProcessSetupPrivateMountNS(void) { - int ret = -1; - if (unshare(CLONE_NEWNS) < 0) { virReportSystemError(errno, "%s", _("Cannot unshare mount namespace")); - goto cleanup; + return -1; } if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", _("Failed to switch root mount into slave mode")); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } #else /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */ diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 29ea52a16f..90eee9e6b5 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -871,7 +871,6 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl, virResctrlInfoPerLevelPtr i_level = NULL; virResctrlInfoPerTypePtr i_type = NULL; size_t i = 0; - int ret = -1; if (virResctrlInfoIsEmpty(resctrl)) return 0; @@ -928,14 +927,12 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl, memcpy((*controls)[*ncontrols - 1], &i_type->control, sizeof(i_type->control)); } - ret = 0; - cleanup: - return ret; + return 0; error: while (*ncontrols) VIR_FREE((*controls)[--*ncontrols]); VIR_FREE(*controls); - goto cleanup; + return -1; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index be2b5479bb..b640957bb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -601,11 +601,10 @@ vmdk4GetBackingStore(char **res, static const char prefix[] = "parentFileNameHint=\""; char *start, *end; size_t len; - int ret = BACKING_STORE_ERROR; g_autofree char *desc = NULL; if (VIR_ALLOC_N(desc, VIR_STORAGE_MAX_HEADER) < 0) - goto cleanup; + return BACKING_STORE_ERROR; *res = NULL; /* @@ -617,10 +616,9 @@ vmdk4GetBackingStore(char **res, */ *format = VIR_STORAGE_FILE_AUTO; - if (buf_size <= 0x200) { - ret = BACKING_STORE_INVALID; - goto cleanup; - } + if (buf_size <= 0x200) + return BACKING_STORE_INVALID; + len = buf_size - 0x200; if (len > VIR_STORAGE_MAX_HEADER) len = VIR_STORAGE_MAX_HEADER; @@ -629,27 +627,21 @@ vmdk4GetBackingStore(char **res, start = strstr(desc, prefix); if (start == NULL) { *format = VIR_STORAGE_FILE_NONE; - ret = BACKING_STORE_OK; - goto cleanup; + return BACKING_STORE_OK; } start += strlen(prefix); end = strchr(start, '"'); - if (end == NULL) { - ret = BACKING_STORE_INVALID; - goto cleanup; - } + if (end == NULL) + return BACKING_STORE_INVALID; + if (end == start) { *format = VIR_STORAGE_FILE_NONE; - ret = BACKING_STORE_OK; - goto cleanup; + return BACKING_STORE_OK; } *end = '\0'; *res = g_strdup(start); - ret = BACKING_STORE_OK; - - cleanup: - return ret; + return BACKING_STORE_OK; } static int @@ -2391,20 +2383,15 @@ virStorageSourceInitChainElement(virStorageSourcePtr newelem, virStorageSourcePtr old, bool transferLabels) { - int ret = -1; - if (transferLabels && !newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) - goto cleanup; + return -1; newelem->shared = old->shared; newelem->readonly = old->readonly; - ret = 0; - - cleanup: - return ret; + return 0; } @@ -3440,7 +3427,6 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src, virJSONValuePtr servers = virJSONValueObjectGetArray(json, "server"); size_t nservers; size_t i; - int ret = -1; src->type = VIR_STORAGE_TYPE_NETWORK; src->protocol = VIR_STORAGE_NET_PROTOCOL_RBD; @@ -3465,20 +3451,18 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src, nservers = virJSONValueArraySize(servers); if (VIR_ALLOC_N(src->hosts, nservers) < 0) - goto cleanup; + return -1; src->nhosts = nservers; for (i = 0; i < nservers; i++) { if (virStorageSourceParseBackingJSONInetSocketAddress(src->hosts + i, virJSONValueArrayGet(servers, i)) < 0) - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/src/util/virutil.c b/src/util/virutil.c index f2528e257c..8862a6b800 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1331,7 +1331,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, unsigned long long capBits, bool clearExistingCaps) { size_t i; - int capng_ret, ret = -1; + int capng_ret; bool need_setgid = false; bool need_setuid = false; bool need_setpcap = false; @@ -1383,7 +1383,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) { virReportSystemError(errno, "%s", _("prctl failed to set KEEPCAPS")); - goto cleanup; + return -1; } /* Change to the temp capabilities */ @@ -1401,18 +1401,18 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot apply process capabilities %d"), capng_ret); - goto cleanup; + return -1; } } if (virSetUIDGID(uid, gid, groups, ngroups) < 0) - goto cleanup; + return -1; /* Tell it we are done keeping capabilities */ if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0)) { virReportSystemError(errno, "%s", _("prctl failed to reset KEEPCAPS")); - goto cleanup; + return -1; } # ifdef PR_CAP_AMBIENT @@ -1430,7 +1430,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, _("prctl failed to enable '%s' in the " "AMBIENT set"), capstr); - goto cleanup; + return -1; } } } @@ -1454,13 +1454,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, if (((capng_ret = capng_apply(CAPNG_SELECT_CAPS)) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot apply process capabilities %d"), capng_ret); - ret = -1; - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } #else -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/libvirt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 33b43305a1..9d783761e6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -796,22 +796,19 @@ static int virConnectGetDefaultURI(virConfPtr conf, char **name) { - int ret = -1; const char *defname = getenv("LIBVIRT_DEFAULT_URI"); if (defname && *defname) { VIR_DEBUG("Using LIBVIRT_DEFAULT_URI '%s'", defname); *name = g_strdup(defname); } else { if (virConfGetValueString(conf, "uri_default", name) < 0) - goto cleanup; + return -1; if (*name) VIR_DEBUG("Using config file uri '%s'", *name); } - ret = 0; - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/libxl/libxl_driver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5cc6b87b8c..267f2106b2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4066,7 +4066,6 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr orig; virDomainDiskDefPtr disk; - int ret = -1; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -4074,31 +4073,28 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) if (!(orig = virDomainDiskByTarget(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("target %s doesn't exist."), disk->dst); - goto cleanup; + return -1; } if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("this disk doesn't support update")); - goto cleanup; + return -1; } if (virDomainDiskSetSource(orig, virDomainDiskGetSource(disk)) < 0) - goto cleanup; + return -1; virDomainDiskSetType(orig, virDomainDiskGetType(disk)); virDomainDiskSetFormat(orig, virDomainDiskGetFormat(disk)); if (virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk)) < 0) - goto cleanup; + return -1; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent update of device is not supported")); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/network/bridge_driver.c | 172 ++++++++++++++---------------------- 1 file changed, 68 insertions(+), 104 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fcaa6a48ae..0ba7f91c20 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1010,7 +1010,7 @@ networkKillDaemon(pid_t pid, daemonName, pid, networkName, signame, virStrerror(errno, ebuf, sizeof(ebuf))); } - goto cleanup; + return ret; } /* NB: since networks have no reference count like * domains, there is no safe way to unlock the network @@ -1032,7 +1032,6 @@ networkKillDaemon(pid_t pid, VIR_WARN("Timed out waiting after SIG%s to %s process %d " "(network '%s')", signame, daemonName, pid, networkName); - cleanup: return ret; } @@ -3205,19 +3204,15 @@ networkConnectListAllNetworks(virConnectPtr conn, unsigned int flags) { virNetworkDriverStatePtr driver = networkGetDriver(); - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); if (virConnectListAllNetworksEnsureACL(conn) < 0) - goto cleanup; - - ret = virNetworkObjListExport(conn, driver->networks, nets, - virConnectListAllNetworksCheckACL, - flags); + return -1; - cleanup: - return ret; + return virNetworkObjListExport(conn, driver->networks, nets, + virConnectListAllNetworksCheckACL, + flags); } @@ -3233,14 +3228,13 @@ networkConnectNetworkEventRegisterAny(virConnectPtr conn, int ret = -1; if (virConnectNetworkEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virNetworkEventStateRegisterID(conn, driver->networkEventState, net, eventID, callback, opaque, freecb, &ret) < 0) ret = -1; - cleanup: return ret; } @@ -3250,20 +3244,16 @@ networkConnectNetworkEventDeregisterAny(virConnectPtr conn, int callbackID) { virNetworkDriverStatePtr driver = networkGetDriver(); - int ret = -1; if (virConnectNetworkEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->networkEventState, callbackID, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -3367,24 +3357,20 @@ static int networkBridgeNameValidate(virNetworkObjListPtr nets, virNetworkDefPtr def) { - int ret = -1; - if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); - goto cleanup; + return -1; } } else { /* Allocate a bridge name */ if (networkFindUnusedBridgeName(nets, def) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } @@ -4537,7 +4523,6 @@ networkAllocatePort(virNetworkObjPtr obj, virPortGroupDefPtr portgroup = NULL; virNetworkForwardIfDefPtr dev = NULL; size_t i; - int ret = -1; virNetDevVPortProfilePtr portprofile = NULL; netdef = virNetworkObjGetDef(obj); @@ -4547,7 +4532,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } VIR_DEBUG("Interface port group %s", port->group); @@ -4561,7 +4546,7 @@ networkAllocatePort(virNetworkObjPtr obj, if (portgroup && portgroup->bandwidth && virNetDevBandwidthCopy(&port->bandwidth, portgroup->bandwidth) < 0) - goto cleanup; + return -1; } if (port->vlan.nTags == 0) { @@ -4572,7 +4557,7 @@ networkAllocatePort(virNetworkObjPtr obj, vlan = &netdef->vlan; if (vlan && virNetDevVlanCopy(&port->vlan, vlan) < 0) - goto cleanup; + return -1; } if (!port->trustGuestRxFilters) { @@ -4590,7 +4575,7 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->virtPortProfile, portgroup ? portgroup->virtPortProfile : NULL) < 0) { - goto cleanup; + return -1; } if (portprofile) { VIR_FREE(port->virtPortProfile); @@ -4618,18 +4603,18 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses IP forwarding"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->class_id) < 0) - goto cleanup; + return -1; break; case VIR_NETWORK_FORWARD_HOSTDEV: { port->plugtype = VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI; if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; /* pick first dev with 0 connections */ for (i = 0; i < netdef->forward.nifs; i++) { @@ -4643,7 +4628,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.hostdevpci.addr = dev->device.pci; port->plug.hostdevpci.driver = netdef->forward.driverName; @@ -4659,7 +4644,7 @@ networkAllocatePort(virNetworkObjPtr obj, "via PCI passthrough"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } } break; @@ -4683,12 +4668,12 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a bridge device"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } } if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->class_id) < 0) - goto cleanup; + return -1; break; } @@ -4722,7 +4707,7 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a macvtap device"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } } @@ -4734,12 +4719,12 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } else { /* pick an interface from the pool */ if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both * require exclusive access to a device, so current @@ -4774,7 +4759,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.direct.linkdev = g_strdup(dev->device.dev); } @@ -4783,15 +4768,15 @@ networkAllocatePort(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); - goto cleanup; + return -1; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, port->ownername, &port->mac) < 0) - goto cleanup; + return -1; if (virNetDevVPortProfileCheckComplete(port->virtPortProfile, true) < 0) - goto cleanup; + return -1; /* make sure that everything now specified for the device is * actually supported on this type of network. NB: network, @@ -4816,7 +4801,7 @@ networkAllocatePort(virNetworkObjPtr obj, "is requesting a vlan tag, but that is not " "supported for this type of network"), netdef->name); - goto cleanup; + return -1; } } @@ -4827,7 +4812,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bandwidth settings are not supported " "for hostdev interfaces")); - goto cleanup; + return -1; } netdef->connections++; @@ -4841,15 +4826,13 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->connections--; if (dev) dev->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); VIR_DEBUG("Port allocated"); - ret = 0; - cleanup: - return ret; + return 0; } @@ -4869,7 +4852,6 @@ networkNotifyPort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev = NULL; size_t i; - int ret = -1; netdef = virNetworkObjGetDef(obj); @@ -4877,14 +4859,14 @@ networkNotifyPort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } switch (port->plugtype) { case VIR_NETWORK_PORT_PLUG_TYPE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a plug")); - goto cleanup; + return -1; case VIR_NETWORK_PORT_PLUG_TYPE_NETWORK: case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: @@ -4892,13 +4874,13 @@ networkNotifyPort(virNetworkObjPtr obj, if (!netdef->bridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a network bridge")); - goto cleanup; + return -1; } break; case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; /* find the matching interface and increment its connections */ for (i = 0; i < netdef->forward.nifs; i++) { @@ -4917,7 +4899,7 @@ networkNotifyPort(virNetworkObjPtr obj, "in use by network port '%s'"), netdef->name, port->plug.direct.linkdev, port->uuid); - goto cleanup; + return -1; } /* PASSTHROUGH mode and PRIVATE Mode + 802.1Qbh both require @@ -4933,14 +4915,14 @@ networkNotifyPort(virNetworkObjPtr obj, _("network '%s' claims dev='%s' is already in " "use by a different port"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; /* find the matching interface and increment its connections */ for (i = 0; i < netdef->forward.nifs; i++) { @@ -4962,7 +4944,7 @@ networkNotifyPort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } /* PASSTHROUGH mode, PRIVATE Mode + 802.1Qbh, and hostdev (PCI @@ -4978,7 +4960,7 @@ networkNotifyPort(virNetworkObjPtr obj, netdef->name, dev->device.pci.domain, dev->device.pci.bus, dev->device.pci.slot, dev->device.pci.function); - goto cleanup; + return -1; } break; @@ -4986,7 +4968,7 @@ networkNotifyPort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } netdef->connections++; @@ -4999,13 +4981,11 @@ networkNotifyPort(virNetworkObjPtr obj, if (dev) dev->connections--; netdef->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); - ret = 0; - cleanup: - return ret; + return 0; } @@ -5028,7 +5008,6 @@ networkReleasePort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev = NULL; size_t i; - int ret = -1; netdef = virNetworkObjGetDef(obj); @@ -5041,7 +5020,7 @@ networkReleasePort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: if (networkUnplugBandwidth(obj, port->bandwidth, &port->class_id) < 0) - goto cleanup; + return -1; break; case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: @@ -5050,7 +5029,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } for (i = 0; i < netdef->forward.nifs; i++) { @@ -5067,7 +5046,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' doesn't have dev='%s' " "in use by domain"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; @@ -5077,7 +5056,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a hostdev mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } for (i = 0; i < netdef->forward.nifs; i++) { @@ -5099,14 +5078,14 @@ networkReleasePort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } break; case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } virNetworkObjMacMgrDel(obj, driver->dnsmasqStateDir, port->ownername, &port->mac); @@ -5119,9 +5098,7 @@ networkReleasePort(virNetworkObjPtr obj, VIR_HOOK_SUBOP_BEGIN); networkLogAllocation(netdef, dev, &port->mac, false); - ret = 0; - cleanup: - return ret; + return 0; } @@ -5152,7 +5129,6 @@ networkCheckBandwidth(virNetworkObjPtr obj, virMacAddrPtr ifaceMac, unsigned long long *new_rate) { - int ret = -1; virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetDevBandwidthPtr netBand = def->bandwidth; unsigned long long tmp_floor_sum = virNetworkObjGetFloorSum(obj); @@ -5201,7 +5177,7 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->peak, def->name); - goto cleanup; + return -1; } } else if (tmp_floor_sum > netBand->in->average) { /* tmp_floor_sum can be between 'average' and 'peak' iff 'peak' is set. @@ -5215,15 +5191,13 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->average, def->name); - goto cleanup; + return -1; } if (new_rate) *new_rate = tmp_new_rate; - ret = 0; - cleanup: - return ret; + return 0; } @@ -5266,20 +5240,19 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, unsigned long long tmp_floor_sum = virNetworkObjGetFloorSum(obj); ssize_t next_id = 0; int plug_ret; - int ret = -1; /* generate new class_id */ if ((next_id = networkNextClassID(obj)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate next class ID")); - goto cleanup; + return -1; } plug_ret = virNetDevBandwidthPlug(def->bridge, def->bandwidth, mac, ifaceBand, next_id); if (plug_ret < 0) { ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } /* QoS was set, generate new class ID */ @@ -5294,7 +5267,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, virNetworkObjSetFloorSum(obj, tmp_floor_sum); *class_id = 0; ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } /* update rate for non guaranteed NICs */ new_rate -= tmp_floor_sum; @@ -5303,9 +5276,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, VIR_WARN("Unable to update rate for 1:2 class on %s bridge", def->bridge); - ret = 0; - cleanup: - return ret; + return 0; } @@ -5315,7 +5286,6 @@ networkPlugBandwidth(virNetworkObjPtr obj, virNetDevBandwidthPtr ifaceBand, unsigned int *class_id) { - int ret = -1; int plug_ret; unsigned long long new_rate = 0; char ifmac[VIR_MAC_STRING_BUFLEN]; @@ -5323,24 +5293,19 @@ networkPlugBandwidth(virNetworkObjPtr obj, if ((plug_ret = networkCheckBandwidth(obj, ifaceBand, NULL, mac, &new_rate)) < 0) { /* helper reported error */ - goto cleanup; + return -1; } - if (plug_ret > 0) { + if (plug_ret > 0) /* no QoS needs to be set; claim success */ - ret = 0; - goto cleanup; - } + return 0; virMacAddrFormat(mac, ifmac); if (networkPlugBandwidthImpl(obj, mac, ifaceBand, class_id, new_rate) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } @@ -5360,7 +5325,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, if (!def->bandwidth || !def->bandwidth->in) { VIR_WARN("Network %s has no bandwidth but unplug requested", def->name); - goto cleanup; + return 0; } /* we must remove class from bridge */ new_rate = def->bandwidth->in->average; @@ -5370,7 +5335,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, ret = virNetDevBandwidthUnplug(def->bridge, *class_id); if (ret < 0) - goto cleanup; + return ret; /* update sum of 'floor'-s of attached NICs */ tmp_floor_sum -= ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); @@ -5383,7 +5348,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, tmp_floor_sum += ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); ignore_value(virBitmapSetBit(classIdMap, *class_id)); - goto cleanup; + return ret; } /* update rate for non guaranteed NICs */ new_rate -= tmp_floor_sum; @@ -5395,7 +5360,6 @@ networkUnplugBandwidth(virNetworkObjPtr obj, *class_id = 0; } - cleanup: return ret; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- examples/c/domain/suspend.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c index af61129ecc..322f0d60df 100644 --- a/examples/c/domain/suspend.c +++ b/examples/c/domain/suspend.c @@ -86,7 +86,6 @@ parse_argv(int argc, char *argv[], const char **dom_name, unsigned int *seconds) { - int ret = -1; int arg; unsigned long val; char *p; @@ -116,12 +115,12 @@ parse_argv(int argc, char *argv[], val = strtoul(optarg, &p, 10); if (errno || *p || p == optarg) { ERROR("Invalid number: '%s'", optarg); - goto cleanup; + return -1; } *seconds = val; if (*seconds != val) { ERROR("Integer overflow: %ld", val); - goto cleanup; + return -1; } break; case ':': @@ -142,9 +141,7 @@ parse_argv(int argc, char *argv[], if (argc > optind) *dom_name = argv[optind]; - ret = 0; - cleanup: - return ret; + return 0; } static int -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- tools/virsh-completer-network.c | 8 ++----- tools/virsh-domain.c | 41 +++++++++++---------------------- tools/vsh.c | 14 +++++------ 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c index 0097fca7cc..8f0048ed6f 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -74,21 +74,17 @@ virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i = 0; - char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); if (VIR_ALLOC_N(tmp, VIR_NETWORK_EVENT_ID_LAST + 1) < 0) - goto cleanup; + return NULL; for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++) tmp[i] = g_strdup(virshNetworkEventCallbacks[i].name); - ret = g_steal_pointer(&tmp); - - cleanup: - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2f3ac2d430..af43078205 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2583,7 +2583,6 @@ virshBlockJobInfo(vshControl *ctl, virshControlPtr priv = ctl->privData; unsigned long long speed; unsigned int flags = 0; - bool ret = false; int rc = -1; /* If bytes were requested, or if raw mode is not forcing a MiB/s @@ -2605,7 +2604,7 @@ virshBlockJobInfo(vshControl *ctl, } G_GNUC_FALLTHROUGH; default: - goto cleanup; + return false; } } speed = info.bandwidth; @@ -2614,7 +2613,7 @@ virshBlockJobInfo(vshControl *ctl, if (rc < 0) { flags &= ~VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES; if ((rc = virDomainGetBlockJobInfo(dom, path, &info, flags)) < 0) - goto cleanup; + return false; speed = info.bandwidth; /* Scale to bytes/s unless in raw mode */ if (!raw) { @@ -2622,7 +2621,7 @@ virshBlockJobInfo(vshControl *ctl, if (speed >> 20 != info.bandwidth) { vshError(ctl, _("overflow in converting %ld MiB/s to bytes\n"), info.bandwidth); - goto cleanup; + return false; } } } @@ -2630,8 +2629,7 @@ virshBlockJobInfo(vshControl *ctl, if (rc == 0) { if (!raw) vshPrintExtra(ctl, _("No current block job for %s"), path); - ret = true; - goto cleanup; + return true; } if (raw) { @@ -2650,10 +2648,7 @@ virshBlockJobInfo(vshControl *ctl, vshPrint(ctl, "\n"); } - ret = true; - - cleanup: - return ret; + return true; } @@ -2994,34 +2989,31 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name, unsigned int flags) { - bool ret = false; int state; virshControlPtr priv = ctl->privData; if ((state = virshDomainState(ctl, dom, NULL)) < 0) { vshError(ctl, "%s", _("Unable to get domain status")); - goto cleanup; + return false; } if (state == VIR_DOMAIN_SHUTOFF) { vshError(ctl, "%s", _("The domain is not running")); - goto cleanup; + return false; } if (!isatty(STDIN_FILENO)) { vshError(ctl, "%s", _("Cannot run interactive console without a controlling TTY")); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Escape character is %s\n"), priv->escapeChar); fflush(stdout); if (virshRunConsole(ctl, dom, name, flags) == 0) - ret = true; - - cleanup: + return true; - return ret; + return false; } static bool @@ -5056,7 +5048,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, field, param->type, value) < 0) { vshSaveLibvirtError(); - goto cleanup; + return ret; } ret = 0; break; @@ -5065,7 +5057,6 @@ cmdSchedInfoUpdateOne(vshControl *ctl, if (ret < 0) vshError(ctl, _("invalid scheduler option: %s"), field); - cleanup: return ret; } @@ -9733,26 +9724,22 @@ static bool cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - bool ret = false; unsigned int flags = 0; unsigned int pid_value; /* API uses unsigned int, not pid_t */ virshControlPtr priv = ctl->privData; if (vshCommandOptUInt(ctl, cmd, "pid", &pid_value) <= 0) - goto cleanup; + return false; if (!(dom = virDomainQemuAttach(priv->conn, pid_value, flags))) { vshError(ctl, _("Failed to attach to pid %u"), pid_value); - goto cleanup; + return false; } vshPrintExtra(ctl, _("Domain %s attached to pid %u\n"), virDomainGetName(dom), pid_value); virshDomainFree(dom); - ret = true; - - cleanup: - return ret; + return true; } /* diff --git a/tools/vsh.c b/tools/vsh.c index 3f8b7f2186..40747edcb2 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2537,11 +2537,10 @@ vshTreePrintInternal(vshControl *ctl, { size_t i; int nextlastdev = -1; - int ret = -1; const char *dev = (lookup)(devid, false, opaque); if (virBufferError(indent)) - goto cleanup; + return -1; /* Print this device, with indent if not at root */ vshPrint(ctl, "%s%s%s\n", virBufferCurrentContent(indent), @@ -2552,7 +2551,7 @@ vshTreePrintInternal(vshControl *ctl, virBufferAddChar(indent, devid == lastdev ? ' ' : '|'); virBufferAddChar(indent, ' '); if (virBufferError(indent)) - goto cleanup; + return -1; } /* Determine the index of the last child device */ @@ -2570,7 +2569,7 @@ vshTreePrintInternal(vshControl *ctl, /* Finally print all children */ virBufferAddLit(indent, " "); if (virBufferError(indent)) - goto cleanup; + return -1; for (i = 0; i < num_devices; i++) { const char *parent = (lookup)(i, true, opaque); @@ -2578,7 +2577,7 @@ vshTreePrintInternal(vshControl *ctl, vshTreePrintInternal(ctl, lookup, opaque, num_devices, i, nextlastdev, false, indent) < 0) - goto cleanup; + return -1; } virBufferTrim(indent, " ", -1); @@ -2589,9 +2588,8 @@ vshTreePrintInternal(vshControl *ctl, if (!root) virBufferTrim(indent, NULL, 2); - ret = 0; - cleanup: - return ret; + + return 0; } int -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- tests/commandtest.c | 17 ++++---- tests/domainconftest.c | 5 +-- tests/networkxml2firewalltest.c | 13 ++---- tests/nsstest.c | 27 ++++++------- tests/nwfilterebiptablestest.c | 4 +- tests/nwfilterxml2firewalltest.c | 16 +++----- tests/qemuhotplugtest.c | 19 ++++----- tests/qemuxml2argvtest.c | 11 ++--- tests/storagebackendsheepdogtest.c | 5 +-- tests/virauthconfigtest.c | 11 ++--- tests/vircgroupmock.c | 11 ++--- tests/virendiantest.c | 58 ++++++++++++-------------- tests/virkeycodetest.c | 14 ++----- tests/virmacmaptest.c | 5 +-- tests/virnetdevtest.c | 11 ++--- tests/virpcimock.c | 31 +++++--------- tests/virpcitest.c | 3 +- tests/virpolkittest.c | 65 +++++++++--------------------- tests/virstringtest.c | 18 +++------ 19 files changed, 126 insertions(+), 218 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 6ff2039ab1..4fbbde9559 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -949,12 +949,11 @@ test23(const void *unused G_GNUC_UNUSED) /* Not strictly a virCommand test, but this is the easiest place * to test this lower-level interface. It takes a double fork to * test virProcessExitWithStatus. */ - int ret = -1; int status = -1; pid_t pid; if ((pid = virFork()) < 0) - goto cleanup; + return -1; if (pid == 0) { if ((pid = virFork()) < 0) _exit(EXIT_FAILURE); @@ -967,14 +966,14 @@ test23(const void *unused G_GNUC_UNUSED) } if (virProcessWait(pid, &status, true) < 0) - goto cleanup; + return -1; if (!WIFEXITED(status) || WEXITSTATUS(status) != 42) { printf("Unexpected status %d\n", status); - goto cleanup; + return -1; } if ((pid = virFork()) < 0) - goto cleanup; + return -1; if (pid == 0) { if ((pid = virFork()) < 0) _exit(EXIT_FAILURE); @@ -989,15 +988,13 @@ test23(const void *unused G_GNUC_UNUSED) } if (virProcessWait(pid, &status, true) < 0) - goto cleanup; + return -1; if (!WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) { printf("Unexpected status %d\n", status); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } static int test25(const void *unused G_GNUC_UNUSED) diff --git a/tests/domainconftest.c b/tests/domainconftest.c index e7bdc99438..5b7bf4bbec 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -83,10 +83,10 @@ mymain(void) int ret = 0; if ((caps = virTestGenericCapsInit()) == NULL) - goto cleanup; + return EXIT_SUCCESS; if (!(xmlopt = virTestGenericDomainXMLConfInit())) - goto cleanup; + return EXIT_SUCCESS; #define DO_TEST_GET_FS(fspath, expect) \ do { \ @@ -107,7 +107,6 @@ mymain(void) virObjectUnref(caps); virObjectUnref(xmlopt); - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index b8e974971a..6ee311f384 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -165,20 +165,16 @@ mymain(void) return EXIT_AM_SKIP; } - ret = -1; - goto cleanup; + return EXIT_FAILURE; } if (virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_srcdir) < 0) { - ret = -1; - goto cleanup; + return EXIT_FAILURE; } - if (virTestLoadFile(basefile, &baseargs) < 0) { - ret = -1; - goto cleanup; - } + if (virTestLoadFile(basefile, &baseargs) < 0) + return EXIT_FAILURE; DO_TEST("nat-default"); DO_TEST("nat-tftp"); @@ -187,7 +183,6 @@ mymain(void) DO_TEST("nat-ipv6"); DO_TEST("route-default"); - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/nsstest.c b/tests/nsstest.c index 734e4cbc07..d146100747 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -41,7 +41,6 @@ testGetHostByName(const void *opaque) { const struct testNSSData *data = opaque; const bool existent = data->hostname && data->ipAddr && data->ipAddr[0]; - int ret = -1; struct hostent resolved; char buf[BUF_SIZE] = { 0 }; char **addrList; @@ -64,16 +63,16 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s failed due to internal error", data->hostname); - goto cleanup; + return -1; } else if (rv == NSS_STATUS_NOTFOUND) { /* Resolving failed. Should it? */ if (!existent) - ret = 0; + return 0; else virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s failed", data->hostname); - goto cleanup; + return -1; } /* Resolving succeeded. Should it? */ @@ -81,7 +80,7 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s succeeded but was expected to fail", data->hostname); - goto cleanup; + return -1; } /* Now lets see if resolved address match our expectations. */ @@ -89,7 +88,7 @@ testGetHostByName(const void *opaque) if (!resolved.h_name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "resolved.h_name empty"); - goto cleanup; + return -1; } if (data->af != AF_UNSPEC && @@ -97,7 +96,7 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Expected AF_INET (%d) got %d", data->af, resolved.h_addrtype); - goto cleanup; + return -1; } if ((resolved.h_addrtype == AF_INET && resolved.h_length != 4) || @@ -107,13 +106,13 @@ testGetHostByName(const void *opaque) "Expected %d bytes long address, got %d", resolved.h_addrtype == AF_INET ? 4 : 16, resolved.h_length); - goto cleanup; + return -1; } if (!resolved.h_addr_list) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "resolved.h_addr_list empty"); - goto cleanup; + return -1; } addrList = resolved.h_addr_list; @@ -133,7 +132,7 @@ testGetHostByName(const void *opaque) if (!(ipAddr = virSocketAddrFormat(&sa))) { /* error reported by helper */ - goto cleanup; + return -1; } if (STRNEQ_NULLABLE(data->ipAddr[i], ipAddr)) { @@ -141,7 +140,7 @@ testGetHostByName(const void *opaque) "Unexpected address %s, expecting %s", ipAddr, NULLSTR(data->ipAddr[i])); VIR_FREE(ipAddr); - goto cleanup; + return -1; } VIR_FREE(ipAddr); @@ -153,12 +152,10 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Expected %s address, got NULL", data->ipAddr[i]); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 61b3284397..97f2ff8ac8 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -539,8 +539,7 @@ mymain(void) return EXIT_AM_SKIP; } - ret = -1; - goto cleanup; + return EXIT_FAILURE; } if (virTestRun("ebiptablesAllTeardown", @@ -578,7 +577,6 @@ mymain(void) NULL) < 0) ret = -1; - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index bef3790da2..84a4656c5b 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -328,24 +328,22 @@ static int testSetOneParameter(virHashTablePtr vars, const char *name, const char *value) { - int ret = -1; virNWFilterVarValuePtr val; if ((val = virHashLookup(vars, name)) == NULL) { val = virNWFilterVarValueCreateSimpleCopyValue(value); if (!val) - goto cleanup; + return -1; if (virHashUpdateEntry(vars, name, val) < 0) { virNWFilterVarValueFree(val); - goto cleanup; + return -1; } } else { if (virNWFilterVarValueAddValueCopy(val, value) < 0) - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + + return 0; } static int testSetDefaultParameters(virHashTablePtr vars) @@ -474,8 +472,7 @@ mymain(void) fprintf(stderr, "iptables/ip6tables/ebtables tools not present"); return EXIT_AM_SKIP; } - ret = -1; - goto cleanup; + return EXIT_FAILURE; } DO_TEST("ah"); @@ -518,7 +515,6 @@ mymain(void) DO_TEST("udplite-ipv6"); DO_TEST("vlan"); - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ff2b38c83..90cbf56408 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -62,17 +62,16 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virDomainObjPtr *vm, const char *domxml) { - int ret = -1; qemuDomainObjPrivatePtr priv = NULL; const unsigned int parseFlags = 0; if (!(*vm = virDomainObjNew(xmlopt))) - goto cleanup; + return -1; priv = (*vm)->privateData; if (!(priv->qemuCaps = virQEMUCapsNew())) - goto cleanup; + return -1; virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); @@ -84,31 +83,29 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) - goto cleanup; + return -1; if (!((*vm)->def = virDomainDefParseString(domxml, driver.caps, driver.xmlopt, NULL, parseFlags))) - goto cleanup; + return -1; if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, &driver, *vm, true) < 0) { - goto cleanup; + return -1; } if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) - goto cleanup; + return -1; (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID; if (qemuDomainSetPrivatePaths(&driver, *vm) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd330df3e0..b795075d49 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -365,10 +365,8 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, virDomainObjPtr vm, virCapsPtr caps) { - int ret = -1; - if (!caps) - goto cleanup; + return -1; virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch); @@ -376,17 +374,14 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, if (testAddCPUModels(info->qemuCaps, !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0) - goto cleanup; + return -1; virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_QEMU); - ret = 0; - - cleanup: - return ret; + return 0; } diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index a5403e7136..62f3208a91 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -160,11 +160,11 @@ mymain(void) if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", abs_srcdir) < 0) - goto cleanup; + return EXIT_SUCCESS; if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", abs_srcdir) < 0) - goto cleanup; + return EXIT_SUCCESS; #define DO_TEST_NODE(collie) \ do { \ @@ -202,7 +202,6 @@ mymain(void) ++test; } - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 42e62cd874..e3bd927dcb 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -41,7 +41,6 @@ struct ConfigLookupData { static int testAuthLookup(const void *args) { - int ret = -1; const struct ConfigLookupData *data = args; const char *actual = NULL; int rv; @@ -53,7 +52,7 @@ static int testAuthLookup(const void *args) &actual); if (rv < 0) - goto cleanup; + return -1; if (data->expect) { if (!actual || @@ -62,7 +61,7 @@ static int testAuthLookup(const void *args) data->expect, data->hostname, data->service, data->credname, NULLSTR(actual)); - goto cleanup; + return -1; } } else { if (actual) { @@ -70,13 +69,11 @@ static int testAuthLookup(const void *args) data->hostname, data->service, data->credname, actual); - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 7bbaa6dd0f..1b7394232e 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -103,7 +103,6 @@ static int make_file(const char *path, static int make_controller_v1(const char *path, mode_t mode) { - int ret = -1; const char *controller; if (!STRPREFIX(path, fakesysfscgroupdir)) { @@ -118,12 +117,12 @@ static int make_controller_v1(const char *path, mode_t mode) return symlink("cpu,cpuacct", path); if (real_mkdir(path, mode) < 0) - goto cleanup; + return -1; # define MAKE_FILE(name, value) \ do { \ if (make_file(path, name, value) < 0) \ - goto cleanup; \ + return -1; \ } while (0) if (STRPREFIX(controller, "cpu,cpuacct")) { @@ -224,14 +223,12 @@ static int make_controller_v1(const char *path, mode_t mode) } else { errno = EINVAL; - goto cleanup; + return -1; } # undef MAKE_FILE - ret = 0; - cleanup: - return ret; + return 0; } diff --git a/tests/virendiantest.c b/tests/virendiantest.c index 7e2eff66dc..38adef9353 100644 --- a/tests/virendiantest.c +++ b/tests/virendiantest.c @@ -30,38 +30,35 @@ test1(const void *data G_GNUC_UNUSED) * unaligned access. */ char array[] = { 1, 2, 3, 4, 5, 6, 7, 8, 0x89, 0x8a, 0x8b, 0x8c, 0x8d }; - int ret = -1; if (virReadBufInt64BE(array) != 0x0102030405060708ULL) - goto cleanup; + return -1; if (virReadBufInt64BE(array + 5) != 0x060708898a8b8c8dULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array) != 0x0807060504030201ULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array + 5) != 0x8d8c8b8a89080706ULL) - goto cleanup; + return -1; if (virReadBufInt32BE(array) != 0x01020304U) - goto cleanup; + return -1; if (virReadBufInt32BE(array + 9) != 0x8a8b8c8dU) - goto cleanup; + return -1; if (virReadBufInt32LE(array) != 0x04030201U) - goto cleanup; + return -1; if (virReadBufInt32LE(array + 9) != 0x8d8c8b8aU) - goto cleanup; + return -1; if (virReadBufInt16BE(array) != 0x0102U) - goto cleanup; + return -1; if (virReadBufInt16BE(array + 11) != 0x8c8dU) - goto cleanup; + return -1; if (virReadBufInt16LE(array) != 0x0201U) - goto cleanup; + return -1; if (virReadBufInt16LE(array + 11) != 0x8d8cU) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } static int @@ -70,38 +67,35 @@ test2(const void *data G_GNUC_UNUSED) /* Unsigned char should work without cast, even if unaligned access. */ unsigned char array[] = { 1, 2, 3, 4, 5, 6, 7, 8, 0x89, 0x8a, 0x8b, 0x8c, 0x8d }; - int ret = -1; if (virReadBufInt64BE(array) != 0x0102030405060708ULL) - goto cleanup; + return -1; if (virReadBufInt64BE(array + 5) != 0x060708898a8b8c8dULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array) != 0x0807060504030201ULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array + 5) != 0x8d8c8b8a89080706ULL) - goto cleanup; + return -1; if (virReadBufInt32BE(array) != 0x01020304U) - goto cleanup; + return -1; if (virReadBufInt32BE(array + 9) != 0x8a8b8c8dU) - goto cleanup; + return -1; if (virReadBufInt32LE(array) != 0x04030201U) - goto cleanup; + return -1; if (virReadBufInt32LE(array + 9) != 0x8d8c8b8aU) - goto cleanup; + return -1; if (virReadBufInt16BE(array) != 0x0102U) - goto cleanup; + return -1; if (virReadBufInt16BE(array + 11) != 0x8c8dU) - goto cleanup; + return -1; if (virReadBufInt16LE(array) != 0x0201U) - goto cleanup; + return -1; if (virReadBufInt16LE(array + 11) != 0x8d8cU) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index c2e756cdd0..298409e919 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -35,7 +35,6 @@ VIR_LOG_INIT("tests.keycodetest"); static int testKeycodeMapping(const void *data G_GNUC_UNUSED) { - int ret = -1; int got; #define TRANSLATE(from, to, val, want) \ @@ -45,7 +44,7 @@ static int testKeycodeMapping(const void *data G_GNUC_UNUSED) val)) != want) { \ fprintf(stderr, "Translating %d from %s to %s, got %d want %d\n", \ val, #from, #to, got, want); \ - goto cleanup; \ + return -1; \ } \ } while (0) @@ -60,15 +59,12 @@ static int testKeycodeMapping(const void *data G_GNUC_UNUSED) #undef TRANSLATE - ret = 0; - cleanup: - return ret; + return 0; } static int testKeycodeStrings(const void *data G_GNUC_UNUSED) { - int ret = -1; int got; #define TRANSLATE(from, str, want) \ @@ -77,7 +73,7 @@ static int testKeycodeStrings(const void *data G_GNUC_UNUSED) str)) != want) { \ fprintf(stderr, "Converting %s from %s, got %d want %d\n", \ str, #from, got, want); \ - goto cleanup; \ + return -1; \ } \ } while (0) @@ -90,9 +86,7 @@ static int testKeycodeStrings(const void *data G_GNUC_UNUSED) #undef TRANSLATE - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 995aff1178..73b8265a42 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -170,8 +170,7 @@ mymain(void) #define DO_TEST_FLUSH_PROLOGUE \ do { \ if (!(mgr = virMacMapNew(NULL))) { \ - ret = -1; \ - goto cleanup; \ + return EXIT_FAILURE; \ } \ } while (0) @@ -228,7 +227,7 @@ mymain(void) DO_TEST_FLUSH("dom1", "9e:89:49:99:51:0e", "89:b4:3f:08:88:2c", "54:0b:4c:e2:0a:39"); DO_TEST_FLUSH("dom1", "bb:88:07:19:51:9d", "b7:f1:1a:40:a2:95", "88:94:39:a3:90:b4"); DO_TEST_FLUSH_EPILOGUE("complex"); - cleanup: + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 5d266a28ee..aadbeb1ef4 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -35,31 +35,28 @@ struct testVirNetDevGetLinkInfoData { static int testVirNetDevGetLinkInfo(const void *opaque) { - int ret = -1; const struct testVirNetDevGetLinkInfoData *data = opaque; virNetDevIfLink lnk; if (virNetDevGetLinkInfo(data->ifname, &lnk) < 0) - goto cleanup; + return -1; if (lnk.state != data->state) { fprintf(stderr, "Fetched link state (%s) doesn't match the expected one (%s)", virNetDevIfStateTypeToString(lnk.state), virNetDevIfStateTypeToString(data->state)); - goto cleanup; + return -1; } if (lnk.speed != data->speed) { fprintf(stderr, "Fetched link speed (%u) doesn't match the expected one (%u)", lnk.speed, data->speed); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } static int diff --git a/tests/virpcimock.c b/tests/virpcimock.c index d7dc0b00f0..50bd79737d 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -314,7 +314,6 @@ find_fd(int fd, size_t *indx) static int add_fd(int fd, const char *path) { - int ret = -1; size_t i; if (find_fd(fd, &i)) { @@ -325,38 +324,34 @@ add_fd(int fd, const char *path) if (VIR_REALLOC_N_QUIET(callbacks, nCallbacks + 1) < 0) { errno = ENOMEM; - goto cleanup; + return -1; } callbacks[nCallbacks].path = g_strdup(path); callbacks[nCallbacks++].fd = fd; - ret = 0; - cleanup: - return ret; + + return 0; } static int remove_fd(int fd) { - int ret = -1; size_t i; if (find_fd(fd, &i)) { struct fdCallback cb = callbacks[i]; if (pci_driver_handle_change(cb.fd, cb.path) < 0) - goto cleanup; + return -1; VIR_FREE(cb.path); if (VIR_DELETE_ELEMENT(callbacks, i, nCallbacks) < 0) { errno = EINVAL; - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } @@ -931,36 +926,30 @@ pci_driver_handle_change(int fd G_GNUC_UNUSED, const char *path) static int pci_driver_handle_bind(const char *path) { - int ret = -1; struct pciDevice *dev = pci_device_find_by_content(path); struct pciDriver *driver = pci_driver_find_by_path(path); if (!driver || !dev) { /* No driver, no device or failing driver requested */ errno = ENODEV; - goto cleanup; + return -1; } - ret = pci_driver_bind(driver, dev); - cleanup: - return ret; + return pci_driver_bind(driver, dev); } static int pci_driver_handle_unbind(const char *path) { - int ret = -1; struct pciDevice *dev = pci_device_find_by_content(path); if (!dev || !dev->driver) { /* No device, device not binded or failing driver requested */ errno = ENODEV; - goto cleanup; + return -1; } - ret = pci_driver_unbind(dev->driver, dev); - cleanup: - return ret; + return pci_driver_unbind(dev->driver, dev); } diff --git a/tests/virpcitest.c b/tests/virpcitest.c index de2ffc7d41..f9c36d5af8 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -224,13 +224,12 @@ testVirPCIDeviceIsAssignable(const void *opaque) virPCIDevicePtr dev; if (!(dev = virPCIDeviceNew(data->domain, data->bus, data->slot, data->function))) - goto cleanup; + return -1; if (virPCIDeviceIsAssignable(dev, true)) ret = 0; virPCIDeviceFree(dev); - cleanup: return ret; } diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index 97fa877445..fe7a3b5b91 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -145,26 +145,20 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, static int testPolkitAuthSuccess(const void *opaque G_GNUC_UNUSED) { - int ret = -1; - if (virPolkitCheckAuth("org.libvirt.test.success", THE_PID, THE_TIME, THE_UID, NULL, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } static int testPolkitAuthDenied(const void *opaque G_GNUC_UNUSED) { - int ret = -1; int rv; virErrorPtr err; @@ -177,28 +171,24 @@ static int testPolkitAuthDenied(const void *opaque G_GNUC_UNUSED) if (rv == 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv != -2) { - goto cleanup; + return -1; } err = virGetLastError(); if (!err || !strstr(err->message, _("access denied by policy"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) { - int ret = -1; int rv; virErrorPtr err; @@ -211,9 +201,9 @@ static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) if (rv == 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv != -2) { - goto cleanup; + return -1; } err = virGetLastError(); @@ -221,19 +211,15 @@ static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) err->code != VIR_ERR_AUTH_UNAVAILABLE || !strstr(err->message, _("no polkit agent available to authenticate"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } static int testPolkitAuthCancelled(const void *opaque G_GNUC_UNUSED) { - int ret = -1; int rv; virErrorPtr err; @@ -246,28 +232,24 @@ static int testPolkitAuthCancelled(const void *opaque G_GNUC_UNUSED) if (rv == 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv != -2) { - goto cleanup; + return -1; } err = virGetLastError(); if (!err || !strstr(err->message, _("user cancelled authentication process"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } static int testPolkitAuthDetailsSuccess(const void *opaque G_GNUC_UNUSED) { - int ret = -1; const char *details[] = { "org.libvirt.test.person", "Fred", NULL, @@ -279,18 +261,14 @@ static int testPolkitAuthDetailsSuccess(const void *opaque G_GNUC_UNUSED) THE_UID, details, true) < 0) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } static int testPolkitAuthDetailsDenied(const void *opaque G_GNUC_UNUSED) { - int ret = -1; int rv; virErrorPtr err; const char *details[] = { @@ -307,22 +285,19 @@ static int testPolkitAuthDetailsDenied(const void *opaque G_GNUC_UNUSED) if (rv == 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv != -2) { - goto cleanup; + return -1; } err = virGetLastError(); if (!err || !strstr(err->message, _("access denied by policy"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1e408f2757..fc5f9bf937 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -39,7 +39,6 @@ struct testStreqData { static int testStreq(const void *args) { const struct testStreqData *data = args; - int ret = -1; bool equal = true; bool streq_rv, strneq_rv; size_t i; @@ -63,19 +62,17 @@ static int testStreq(const void *args) virFilePrintf(stderr, "STREQ not working correctly. Expected %d got %d", (int) equal, (int) streq_rv); - goto cleanup; + return -1; } if (strneq_rv == equal) { virFilePrintf(stderr, "STRNEQ not working correctly. Expected %d got %d", (int) equal, (int) strneq_rv); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } struct testSplitData { @@ -381,7 +378,6 @@ testStringSortCompare(const void *opaque G_GNUC_UNUSED) const char *sortrlist[] = { "turducken", "tasty", "goat", "chicken", "astro", }; - int ret = -1; size_t i; qsort(randlist, G_N_ELEMENTS(randlist), sizeof(randlist[0]), @@ -393,18 +389,16 @@ testStringSortCompare(const void *opaque G_GNUC_UNUSED) if (STRNEQ(randlist[i], sortlist[i])) { fprintf(stderr, "sortlist[%zu] '%s' != randlist[%zu] '%s'\n", i, sortlist[i], i, randlist[i]); - goto cleanup; + return -1; } if (STRNEQ(randrlist[i], sortrlist[i])) { fprintf(stderr, "sortrlist[%zu] '%s' != randrlist[%zu] '%s'\n", i, sortrlist[i], i, randrlist[i]); - goto cleanup; + return -1; } } - ret = 0; - cleanup: - return ret; + return 0; } -- 2.21.0

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com&gt; --- src/bhyve/bhyve_device.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 4913be8422..ddbe20d31d 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -36,7 +36,6 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { - int ret = -1; if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) return 0; @@ -56,12 +55,10 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, if (virDomainPCIAddressReserveAddr(addrs, addr, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0) < 0) { - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } virDomainPCIAddressSetPtr @@ -169,13 +166,11 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs = NULL; bhyveDomainObjPrivatePtr priv = NULL; - int ret = -1; - if (!(addrs = bhyveDomainPCIAddressSetCreate(def, 1))) - goto cleanup; + return -1; if (bhyveAssignDevicePCISlots(def, addrs) < 0) - goto cleanup; + return -1; if (obj && obj->privateData) { priv = obj->privateData; @@ -188,10 +183,7 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, } } - ret = 0; - - cleanup: - return ret; + return 0; } int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj) -- 2.21.0