conf: remove unneeded labels

Remove unneeded, easy to remove goto labels (cleanup|error|done|...).

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

src/conf/capabilities.c

@@ -747,11 +747,11 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps,
                        _("could not find capabilities for %s"),
                        virBufferCurrentContent(&buf));
         virBufferFreeAndReset(&buf);
-        goto error;
+        return ret;
     }
 
     if (VIR_ALLOC(ret) < 0)
-        goto error;
+        return ret;
 
     ret->ostype = foundguest->ostype;
     ret->arch = foundguest->arch.id;
@@ -764,7 +764,6 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps,
     if (foundmachine)
         ret->machinetype = foundmachine->name;
 
- error:
     return ret;
 }
 
@@ -1179,13 +1178,13 @@ virCapabilitiesFormatHostXML(virCapsHostPtr host,
 
     if (host->numa &&
         virCapabilitiesHostNUMAFormat(host->numa, buf) < 0)
-        goto error;
+        return -1;
 
     if (virCapabilitiesFormatCaches(buf, &host->cache) < 0)
-        goto error;
+        return -1;
 
     if (virCapabilitiesFormatMemoryBandwidth(buf, &host->memBW) < 0)
-        goto error;
+        return -1;
 
     for (i = 0; i < host->nsecModels; i++) {
         virBufferAddLit(buf, "<secmodel>\n");
@@ -1207,9 +1206,6 @@ virCapabilitiesFormatHostXML(virCapsHostPtr host,
     virBufferAddLit(buf, "</host>\n\n");
 
     return 0;
-
- error:
-    return -1;
 }
 
 

src/conf/cpu_conf.c

@@ -992,7 +992,6 @@ virCPUDefIsEqual(virCPUDefPtr src,
                  virCPUDefPtr dst,
                  bool reportError)
 {
-    bool identical = false;
     size_t i;
 
     if (!src && !dst)
@@ -1004,91 +1003,91 @@ virCPUDefIsEqual(virCPUDefPtr src,
 
     if ((src && !dst) || (!src && dst)) {
         MISMATCH("%s", _("Target CPU does not match source"));
-        goto cleanup;
+        return false;
     }
 
     if (src->type != dst->type) {
         MISMATCH(_("Target CPU type %s does not match source %s"),
                  virCPUTypeToString(dst->type),
                  virCPUTypeToString(src->type));
-        goto cleanup;
+        return false;
     }
 
     if (src->mode != dst->mode) {
         MISMATCH(_("Target CPU mode %s does not match source %s"),
                  virCPUModeTypeToString(dst->mode),
                  virCPUModeTypeToString(src->mode));
-        goto cleanup;
+        return false;
     }
 
     if (src->check != dst->check) {
         MISMATCH(_("Target CPU check %s does not match source %s"),
                  virCPUCheckTypeToString(dst->check),
                  virCPUCheckTypeToString(src->check));
-        goto cleanup;
+        return false;
     }
 
     if (src->arch != dst->arch) {
         MISMATCH(_("Target CPU arch %s does not match source %s"),
                  virArchToString(dst->arch),
                  virArchToString(src->arch));
-        goto cleanup;
+        return false;
     }
 
     if (STRNEQ_NULLABLE(src->model, dst->model)) {
         MISMATCH(_("Target CPU model %s does not match source %s"),
                  NULLSTR(dst->model), NULLSTR(src->model));
-        goto cleanup;
+        return false;
     }
 
     if (STRNEQ_NULLABLE(src->vendor, dst->vendor)) {
         MISMATCH(_("Target CPU vendor %s does not match source %s"),
                  NULLSTR(dst->vendor), NULLSTR(src->vendor));
-        goto cleanup;
+        return false;
     }
 
     if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) {
         MISMATCH(_("Target CPU vendor id %s does not match source %s"),
                  NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id));
-        goto cleanup;
+        return false;
     }
 
     if (src->sockets != dst->sockets) {
         MISMATCH(_("Target CPU sockets %d does not match source %d"),
                  dst->sockets, src->sockets);
-        goto cleanup;
+        return false;
     }
 
     if (src->cores != dst->cores) {
         MISMATCH(_("Target CPU cores %d does not match source %d"),
                  dst->cores, src->cores);
-        goto cleanup;
+        return false;
     }
 
     if (src->threads != dst->threads) {
         MISMATCH(_("Target CPU threads %d does not match source %d"),
                  dst->threads, src->threads);
-        goto cleanup;
+        return false;
     }
 
     if (src->nfeatures != dst->nfeatures) {
         MISMATCH(_("Target CPU feature count %zu does not match source %zu"),
                  dst->nfeatures, src->nfeatures);
-        goto cleanup;
+        return false;
     }
 
     for (i = 0; i < src->nfeatures; i++) {
         if (STRNEQ(src->features[i].name, dst->features[i].name)) {
             MISMATCH(_("Target CPU feature %s does not match source %s"),
                      dst->features[i].name, src->features[i].name);
-            goto cleanup;
+            return false;
         }
 
         if (src->features[i].policy != dst->features[i].policy) {
             MISMATCH(_("Target CPU feature policy %s does not match source %s"),
                      virCPUFeaturePolicyTypeToString(dst->features[i].policy),
                      virCPUFeaturePolicyTypeToString(src->features[i].policy));
-            goto cleanup;
+            return false;
         }
     }
 
@@ -1098,15 +1097,12 @@ virCPUDefIsEqual(virCPUDefPtr src,
          (src->cache->level != dst->cache->level ||
           src->cache->mode != dst->cache->mode))) {
         MISMATCH("%s", _("Target CPU cache does not match source"));
-        goto cleanup;
+        return false;
     }
 
 #undef MISMATCH
 
-    identical = true;
+    return true;
-
- cleanup:
-    return identical;
 }
 
 

src/conf/domain_addr.c

@@ -1175,7 +1175,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
 
     if (addrs->nbuses == 0) {
         virReportError(VIR_ERR_XML_ERROR, "%s", _("No PCI buses available"));
-        goto error;
+        return -1;
     }
 
     /* if the caller asks for "any function", give them function 0 */
@@ -1199,7 +1199,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
 
         if (virDomainPCIAddressFindUnusedFunctionOnBus(bus, &a, function,
                                                        flags, &found) < 0) {
-            goto error;
+            return -1;
         }
 
         if (found)
@@ -1223,7 +1223,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
 
         if (virDomainPCIAddressFindUnusedFunctionOnBus(bus, &a, function,
                                                        flags, &found) < 0) {
-            goto error;
+            return -1;
         }
 
         /* The isolation group for the bus will actually be changed
@@ -1236,7 +1236,7 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
     if (addrs->dryRun) {
         /* a is already set to the first new bus */
         if (virDomainPCIAddressSetGrow(addrs, &a, flags) < 0)
-            goto error;
+            return -1;
         /* this device will use the first slot of the new bus */
         a.slot = addrs->buses[a.bus].minSlot;
         goto success;
@@ -1244,7 +1244,6 @@ virDomainPCIAddressGetNextAddr(virDomainPCIAddressSetPtr addrs,
 
     virReportError(VIR_ERR_INTERNAL_ERROR,
                    "%s", _("No more available PCI slots"));
- error:
     return -1;
 
  success:

src/conf/domain_conf.c

@@ -3682,8 +3682,6 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xmlopt,
                             virDomainObjPtr domain,
                             void *parseOpaque)
 {
-    int ret = -1;
-
     if (!domain->persistent)
         return 0;
 
@@ -3692,11 +3690,9 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xmlopt,
 
     if (!(domain->newDef = virDomainDefCopy(domain->def, xmlopt,
                                             parseOpaque, false)))
-        goto out;
+        return -1;
 
-    ret = 0;
+    return 0;
- out:
-    return ret;
 }
 
 
@@ -7701,7 +7697,6 @@ static int
 virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                                      virDomainHostdevDefPtr def)
 {
-    int ret = -1;
     bool got_product, got_vendor;
     xmlNodePtr cur;
     virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb;
@@ -7715,7 +7710,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Unknown startup policy '%s'"),
                            startupPolicy);
-            goto out;
+            return -1;
         }
     }
 
@@ -7738,12 +7733,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                     if (virStrToLong_ui(vendor, NULL, 0, &usbsrc->vendor) < 0) {
                         virReportError(VIR_ERR_INTERNAL_ERROR,
                                        _("cannot parse vendor id %s"), vendor);
-                        goto out;
+                        return -1;
                     }
                 } else {
                     virReportError(VIR_ERR_INTERNAL_ERROR,
                                    "%s", _("usb vendor needs id"));
-                    goto out;
+                    return -1;
                 }
             } else if (virXMLNodeNameEqual(cur, "product")) {
                 g_autofree char *product = virXMLPropString(cur, "id");
@@ -7755,12 +7750,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                         virReportError(VIR_ERR_INTERNAL_ERROR,
                                        _("cannot parse product %s"),
                                        product);
-                        goto out;
+                        return -1;
                     }
                 } else {
                     virReportError(VIR_ERR_INTERNAL_ERROR,
                                    "%s", _("usb product needs id"));
-                    goto out;
+                    return -1;
                 }
             } else if (virXMLNodeNameEqual(cur, "address")) {
                 g_autofree char *bus = NULL;
@@ -7771,12 +7766,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                     if (virStrToLong_ui(bus, NULL, 0, &usbsrc->bus) < 0) {
                         virReportError(VIR_ERR_INTERNAL_ERROR,
                                        _("cannot parse bus %s"), bus);
-                        goto out;
+                        return -1;
                     }
                 } else {
                     virReportError(VIR_ERR_INTERNAL_ERROR,
                                    "%s", _("usb address needs bus id"));
-                    goto out;
+                    return -1;
                 }
 
                 device = virXMLPropString(cur, "device");
@@ -7785,18 +7780,18 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
                         virReportError(VIR_ERR_INTERNAL_ERROR,
                                        _("cannot parse device %s"),
                                        device);
-                        goto out;
+                        return -1;
                     }
                 } else {
                     virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                    _("usb address needs device id"));
-                    goto out;
+                    return -1;
                 }
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("unknown usb source type '%s'"),
                                cur->name);
-                goto out;
+                return -1;
             }
         }
         cur = cur->next;
@@ -7805,23 +7800,21 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
     if (got_vendor && usbsrc->vendor == 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("vendor cannot be 0."));
-        goto out;
+        return -1;
     }
 
     if (!got_vendor && got_product) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("missing vendor"));
-        goto out;
+        return -1;
     }
     if (got_vendor && !got_product) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("missing product"));
-        goto out;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
- out:
-    return ret;
 }
 
 /* The internal XML for host PCI device's original states:
@@ -7865,7 +7858,6 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
                                      virDomainHostdevDefPtr def,
                                      unsigned int flags)
 {
-    int ret = -1;
     xmlNodePtr cur;
 
     cur = node->children;
@@ -7876,25 +7868,23 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
                     &def->source.subsys.u.pci.addr;
 
                 if (virPCIDeviceAddressParseXML(cur, addr) < 0)
-                    goto out;
+                    return -1;
             } else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) &&
                        virXMLNodeNameEqual(cur, "origstates")) {
                 virDomainHostdevOrigStatesPtr states = &def->origstates;
                 if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, states) < 0)
-                    goto out;
+                    return -1;
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("unknown pci source type '%s'"),
                                cur->name);
-                goto out;
+                return -1;
             }
         }
         cur = cur->next;
     }
 
-    ret = 0;
+    return 0;
- out:
-    return ret;
 }
 
 
@@ -8622,7 +8612,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
                                 virDomainHostdevDefPtr def)
 {
     xmlNodePtr sourcenode;
-    int ret = -1;
 
     /* @type is passed in from the caller rather than read from the
      * xml document, because it is specified in different places for
@@ -8638,18 +8627,18 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unknown host device source address type '%s'"),
                            type);
-            goto error;
+            return -1;
         }
     } else {
         virReportError(VIR_ERR_XML_ERROR,
                        "%s", _("missing source address type"));
-        goto error;
+        return -1;
     }
 
     if (!(sourcenode = virXPathNode("./source", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Missing <source> element in hostdev device"));
-        goto error;
+        return -1;
     }
 
     switch (def->source.caps.type) {
@@ -8658,7 +8647,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
               virXPathString("string(./source/block[1])", ctxt))) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("Missing <block> element in hostdev storage device"));
-            goto error;
+            return -1;
         }
         break;
     case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC:
@@ -8666,7 +8655,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
               virXPathString("string(./source/char[1])", ctxt))) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("Missing <char> element in hostdev character device"));
-            goto error;
+            return -1;
         }
         break;
     case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
@@ -8674,21 +8663,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
               virXPathString("string(./source/interface[1])", ctxt))) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("Missing <interface> element in hostdev net device"));
-            goto error;
+            return -1;
         }
         if (virDomainNetIPInfoParseXML(_("Domain hostdev device"),
                                        ctxt, &def->source.caps.u.net.ip) < 0)
-            goto error;
+            return -1;
         break;
     default:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("address type='%s' not supported in hostdev interfaces"),
                        virDomainHostdevCapsTypeToString(def->source.caps.type));
-        goto error;
+        return -1;
     }
-    ret = 0;
+
- error:
+    return 0;
-    return ret;
 }
 
 
@@ -9166,13 +9154,11 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
     def->lockspace = g_steal_pointer(&lockspace);
     def->path = g_steal_pointer(&path);
 
- cleanup:
     return def;
 
  error:
     virDomainLeaseDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static int
@@ -11084,13 +11070,11 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
         break;
     }
 
- cleanup:
     return def;
 
  error:
     virDomainControllerDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -11277,13 +11261,11 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
     if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainFSDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static int
@@ -13037,13 +13019,11 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
         goto error;
     }
 
- cleanup:
     return def;
 
  error:
     virDomainChrDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainSmartcardDefPtr
@@ -13167,13 +13147,11 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
         goto error;
     }
 
- cleanup:
     return def;
 
  error:
     virDomainSmartcardDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 /* Parse the XML definition for a TPM device
@@ -13295,13 +13273,11 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
     if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainTPMDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainPanicDefPtr
@@ -13327,13 +13303,11 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt,
         goto error;
     }
 
- cleanup:
     return panic;
 
  error:
     virDomainPanicDefFree(panic);
-    panic = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 /* Parse the XML definition for an input device */
@@ -13485,13 +13459,11 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
                                        &def->virtio) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainInputDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -13524,13 +13496,11 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt,
     if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainHubDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -13649,12 +13619,11 @@ virDomainTimerDefParseXML(xmlNodePtr node,
         }
     }
 
- cleanup:
     return def;
 
  error:
     VIR_FREE(def);
-    goto cleanup;
+    return def;
 }
 
 
@@ -14541,13 +14510,12 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt,
         break;
     }
 
- cleanup:
     return def;
 
  error:
     virDomainGraphicsDefFree(def);
     def = NULL;
-    goto cleanup;
+    return NULL;
 }
 
 
@@ -14567,13 +14535,11 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node)
         goto error;
     }
 
- cleanup:
     return def;
 
  error:
     virDomainSoundCodecDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -14629,13 +14595,11 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
     if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainSoundDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -14719,13 +14683,11 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt,
     if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainWatchdogDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -14832,13 +14794,12 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt,
                                        &def->virtio) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainRNGDefFree(def);
     def = NULL;
-    goto cleanup;
+    return NULL;
 }
 
 
@@ -14898,13 +14859,11 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt,
                                        &def->virtio) < 0)
         goto error;
 
- cleanup:
     return def;
 
  error:
     virDomainMemballoonDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainNVRAMDefPtr
@@ -15350,13 +15309,11 @@ virSysinfoParseXML(xmlNodePtr node,
             goto error;
     }
 
- cleanup:
     return def;
 
  error:
     virSysinfoDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 unsigned int
@@ -15544,16 +15501,15 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node)
         return NULL;
 
     if (VIR_ALLOC(def) < 0)
-        goto cleanup;
+        return def;
 
     if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("unknown vgaconf value '%s'"), vgaconf);
-        goto cleanup;
+        return def;
     }
     def->vgaconf = val;
 
- cleanup:
     return def;
 }
 
@@ -15707,13 +15663,11 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
 
     def->driver = virDomainVideoDriverDefParseXML(node);
 
- cleanup:
     return def;
 
  error:
     virDomainVideoDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainHostdevDefPtr
@@ -15783,13 +15737,11 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt,
         }
     }
 
- cleanup:
     return def;
 
  error:
     virDomainHostdevDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 
@@ -15856,14 +15808,11 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt,
         goto error;
     }
 
-
- cleanup:
     return def;
 
  error:
     virDomainRedirdevDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 /*
@@ -15979,13 +15928,11 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node)
         goto error;
     }
 
- cleanup:
     return def;
 
  error:
     VIR_FREE(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainRedirFilterDefPtr
@@ -16284,13 +16231,11 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
     def->dh_cert = virXPathString("string(./dhCert)", ctxt);
     def->session = virXPathString("string(./session)", ctxt);
 
- cleanup:
     return def;
 
  error:
     virDomainSEVDefFree(def);
-    def = NULL;
+    return NULL;
-    goto cleanup;
 }
 
 static virDomainMemoryDefPtr
@@ -18238,7 +18183,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
 
     if (VIR_ALLOC_N(idmap, num) < 0)
-        goto cleanup;
+        return idmap;
 
     for (i = 0; i < num; i++) {
         ctxt->node = node[i];
@@ -18248,7 +18193,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("invalid idmap start/target/count settings"));
             VIR_FREE(idmap);
-            goto cleanup;
+            return NULL;
         }
     }
 
@@ -18260,10 +18205,9 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt,
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("You must map the root user of container"));
         VIR_FREE(idmap);
-        goto cleanup;
+        return NULL;
     }
 
- cleanup:
     return idmap;
 }
 
@@ -18300,13 +18244,12 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node)
         goto error;
     }
 
- cleanup:
     return iothrid;
 
  error:
     virDomainIOThreadIDDefFree(iothrid);
     iothrid = NULL;
-    goto cleanup;
+    return iothrid;
 }
 
 
@@ -29000,18 +28943,15 @@ virDomainObjFormat(virDomainObjPtr obj,
 
     if (xmlopt->privateData.format &&
         xmlopt->privateData.format(&buf, obj) < 0)
-        goto error;
+        return NULL;
 
     if (virDomainDefFormatInternal(obj->def, xmlopt, &buf, flags) < 0)
-        goto error;
+        return NULL;
 
     virBufferAdjustIndent(&buf, -2);
     virBufferAddLit(&buf, "</domstatus>\n");
 
     return virBufferContentAndReset(&buf);
-
- error:
-    return NULL;
 }
 
 static bool
@@ -29318,7 +29258,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
             rc = -1;
 
         if (abortOnError && rc != 0)
-            goto done;
+            return rc;
     }
 
     for (i = 0; i < def->nparallels; i++) {
@@ -29328,7 +29268,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
             rc = -1;
 
         if (abortOnError && rc != 0)
-            goto done;
+            return rc;
     }
 
     for (i = 0; i < def->nchannels; i++) {
@@ -29338,7 +29278,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
             rc = -1;
 
         if (abortOnError && rc != 0)
-            goto done;
+            return rc;
     }
     for (i = 0; i < def->nconsoles; i++) {
         if (virDomainSkipBackcompatConsole(def, i, false))
@@ -29349,10 +29289,9 @@ virDomainChrDefForeach(virDomainDefPtr def,
             rc = -1;
 
         if (abortOnError && rc != 0)
-            goto done;
+            return rc;
     }
 
- done:
     return rc;
 }
 
@@ -29373,10 +29312,9 @@ virDomainSmartcardDefForeach(virDomainDefPtr def,
             rc = -1;
 
         if (abortOnError && rc != 0)
-            goto done;
+            return rc;
     }
 
- done:
     return rc;
 }
 

src/conf/interface_conf.c

@@ -1070,19 +1070,19 @@ virInterfaceDefDevFormat(virBufferPtr buf,
     if (def == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("virInterfaceDefFormat NULL def"));
-        goto cleanup;
+        return -1;
     }
 
     if ((def->name == NULL) && (def->type != VIR_INTERFACE_TYPE_VLAN)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("virInterfaceDefFormat missing interface name"));
-        goto cleanup;
+        return -1;
     }
 
     if (!(type = virInterfaceTypeToString(def->type))) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected interface type %d"), def->type);
-        goto cleanup;
+        return -1;
     }
 
     virBufferAsprintf(buf, "<interface type='%s' ", type);
@@ -1125,9 +1125,6 @@ virInterfaceDefDevFormat(virBufferPtr buf,
     virBufferAddLit(buf, "</interface>\n");
 
     return 0;
-
- cleanup:
-    return -1;
 }
 
 

src/conf/network_conf.c

@@ -2240,8 +2240,6 @@ static int
 virNetworkIPDefFormat(virBufferPtr buf,
                       const virNetworkIPDef *def)
 {
-    int result = -1;
-
     virBufferAddLit(buf, "<ip");
 
     if (def->family)
@@ -2249,14 +2247,14 @@ virNetworkIPDefFormat(virBufferPtr buf,
     if (VIR_SOCKET_ADDR_VALID(&def->address)) {
         char *addr = virSocketAddrFormat(&def->address);
         if (!addr)
-            goto error;
+            return -1;
         virBufferAsprintf(buf, " address='%s'", addr);
         VIR_FREE(addr);
     }
     if (VIR_SOCKET_ADDR_VALID(&def->netmask)) {
         char *addr = virSocketAddrFormat(&def->netmask);
         if (!addr)
-            goto error;
+            return -1;
         virBufferAsprintf(buf, " netmask='%s'", addr);
         VIR_FREE(addr);
     }
@@ -2283,11 +2281,11 @@ virNetworkIPDefFormat(virBufferPtr buf,
         for (i = 0; i < def->nranges; i++) {
             char *saddr = virSocketAddrFormat(&def->ranges[i].start);
             if (!saddr)
-                goto error;
+                return -1;
             char *eaddr = virSocketAddrFormat(&def->ranges[i].end);
             if (!eaddr) {
                 VIR_FREE(saddr);
-                goto error;
+                return -1;
             }
             virBufferAsprintf(buf, "<range start='%s' end='%s'/>\n",
                               saddr, eaddr);
@@ -2305,7 +2303,7 @@ virNetworkIPDefFormat(virBufferPtr buf,
             if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) {
                 char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip);
                 if (!ipaddr)
-                    goto error;
+                    return -1;
                 virBufferAsprintf(buf, " ip='%s'", ipaddr);
                 VIR_FREE(ipaddr);
             }
@@ -2317,7 +2315,7 @@ virNetworkIPDefFormat(virBufferPtr buf,
             if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) {
                 char *ipaddr = virSocketAddrFormat(&def->bootserver);
                 if (!ipaddr)
-                    goto error;
+                    return -1;
                 virBufferEscapeString(buf, " server='%s'", ipaddr);
                 VIR_FREE(ipaddr);
             }
@@ -2332,9 +2330,7 @@ virNetworkIPDefFormat(virBufferPtr buf,
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</ip>\n");
 
-    result = 0;
+    return 0;
- error:
-    return result;
 }
 
 
@@ -2458,7 +2454,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
                         virBufferGetIndent(buf) / 2, 1) < 0) {
             xmlBufferFree(xmlbuf);
             xmlIndentTreeOutput = oldIndentTreeOutput;
-            goto error;
+            return -1;
         }
         virBufferAsprintf(buf, "%s\n", (char *) xmlBufferContent(xmlbuf));
         xmlBufferFree(xmlbuf);
@@ -2475,7 +2471,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Unknown forward type %d in network '%s'"),
                            def->forward.type, def->name);
-            goto error;
+            return -1;
         }
         virBufferAddLit(buf, "<forward");
         virBufferEscapeString(buf, " dev='%s'", dev);
@@ -2504,13 +2500,13 @@ virNetworkDefFormatBuf(virBufferPtr buf,
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("unexpected hostdev driver name type %d "),
                                def->forward.driverName);
-                goto error;
+                return -1;
             }
             virBufferAsprintf(buf, "<driver name='%s'/>\n", driverName);
         }
         if (def->forward.type == VIR_NETWORK_FORWARD_NAT) {
             if (virNetworkForwardNatDefFormat(buf, &def->forward) < 0)
-                goto error;
+                return -1;
         }
 
         /* For now, hard-coded to at most 1 forward.pfs */
@@ -2562,7 +2558,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
     case VIR_NETWORK_FORWARD_LAST:
     default:
         virReportEnumRangeError(virNetworkForwardType, def->forward.type);
-        goto error;
+        return -1;
     }
 
     if (hasbridge || def->bridge || def->macTableManager) {
@@ -2608,29 +2604,29 @@ virNetworkDefFormatBuf(virBufferPtr buf,
     }
 
     if (virNetworkDNSDefFormat(buf, &def->dns) < 0)
-        goto error;
+        return -1;
 
     if (virNetDevVlanFormat(&def->vlan, buf) < 0)
-        goto error;
+        return -1;
     if (virNetDevBandwidthFormat(def->bandwidth, 0, buf) < 0)
-        goto error;
+        return -1;
 
     for (i = 0; i < def->nips; i++) {
         if (virNetworkIPDefFormat(buf, &def->ips[i]) < 0)
-            goto error;
+            return -1;
     }
 
     for (i = 0; i < def->nroutes; i++) {
         if (virNetDevIPRouteFormat(buf, def->routes[i]) < 0)
-            goto error;
+            return -1;
     }
 
     if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0)
-        goto error;
+        return -1;
 
     for (i = 0; i < def->nPortGroups; i++)
         if (virPortGroupDefFormat(buf, &def->portGroups[i]) < 0)
-            goto error;
+            return -1;
 
     if (def->namespaceData && def->ns.format) {
         if ((def->ns.format)(buf, def->namespaceData) < 0)
@@ -2641,9 +2637,6 @@ virNetworkDefFormatBuf(virBufferPtr buf,
     virBufferAddLit(buf, "</network>\n");
 
     return 0;
-
- error:
-    return -1;
 }
 
 

src/conf/networkcommon_conf.c

@@ -290,7 +290,6 @@ int
 virNetDevIPRouteFormat(virBufferPtr buf,
                        const virNetDevIPRoute *def)
 {
-    int result = -1;
     char *addr = NULL;
 
     virBufferAddLit(buf, "<route");
@@ -299,13 +298,13 @@ virNetDevIPRouteFormat(virBufferPtr buf,
         virBufferAsprintf(buf, " family='%s'", def->family);
 
     if (!(addr = virSocketAddrFormat(&def->address)))
-        goto cleanup;
+        return -1;
     virBufferAsprintf(buf, " address='%s'", addr);
     VIR_FREE(addr);
 
     if (VIR_SOCKET_ADDR_VALID(&def->netmask)) {
         if (!(addr = virSocketAddrFormat(&def->netmask)))
-            goto cleanup;
+            return -1;
         virBufferAsprintf(buf, " netmask='%s'", addr);
         VIR_FREE(addr);
     }
@@ -313,7 +312,7 @@ virNetDevIPRouteFormat(virBufferPtr buf,
         virBufferAsprintf(buf, " prefix='%u'", def->prefix);
 
     if (!(addr = virSocketAddrFormat(&def->gateway)))
-        goto cleanup;
+        return -1;
     virBufferAsprintf(buf, " gateway='%s'", addr);
     VIR_FREE(addr);
 
@@ -321,7 +320,5 @@ virNetDevIPRouteFormat(virBufferPtr buf,
         virBufferAsprintf(buf, " metric='%u'", def->metric);
     virBufferAddLit(buf, "/>\n");
 
-    result = 0;
+    return 0;
- cleanup:
-    return result;
 }

src/conf/nwfilter_conf.c

@@ -2903,7 +2903,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
                                  _("formatter for %s %s reported error"),
                                  type,
                                  att[i].name);
-                   goto err_exit;
+                   return;
                }
             } else if ((flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) {
                 virBufferAddChar(buf, '$');
@@ -2986,7 +2986,6 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
        virBufferAsprintf(buf,
                          "<%s/>\n", type);
 
- err_exit:
     return;
 }
 

src/conf/nwfilter_params.c

@@ -672,12 +672,9 @@ virNWFilterHashTablePutAll(virHashTablePtr src,
 
     virHashForEach(src, addToTable, &atts);
     if (atts.errOccurred)
-        goto err_exit;
+        return -1;
 
     return 0;
-
- err_exit:
-    return -1;
 }
 
 /* The general purpose function virNWFilterVarValueEqual returns a

src/conf/virnetworkobj.c

@@ -1774,21 +1774,20 @@ virNetworkObjPortListExportCallback(void *payload,
 
     if (data->filter &&
         !data->filter(data->net->conn, data->def, def))
-        goto cleanup;
+        return 0;
 
     if (!data->ports) {
         data->nports++;
-        goto cleanup;
+        return 0;
     }
 
     if (!(port = virGetNetworkPort(data->net, def->uuid))) {
         data->error = true;
-        goto cleanup;
+        return 0;
     }
 
     data->ports[data->nports++] = port;
 
- cleanup:
     return 0;
 }