conf: eliminate useless error label in virDomainFeaturesDefParse()

The error: label in this function just does "return -1", so replace
all the "goto error" in the function with "return -1".

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1273068f3232458e52ebe321f7e69c777c99c3f0..f076c0718c08fa753f3ab1fcc9a0cf7e1ffe30d9 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19321,14 +19321,14 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
     int n;
 
     if ((n = virXPathNodeSet("./features/*", ctxt, &nodes)) < 0)
-        goto error;
+        return -1;
 
     for (i = 0; i < n; i++) {
         int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name);
         if (val < 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unexpected feature '%s'"), nodes[i]->name);
-            goto error;
+            return -1;
         }
 
         switch ((virDomainFeature) val) {
@@ -19339,7 +19339,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("unknown value for attribute eoi: '%s'"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->apic_eoi = eoi;
                 VIR_FREE(tmp);
@@ -19362,7 +19362,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("unknown policy attribute '%s' of feature '%s'"),
                                    tmp, virDomainFeatureTypeToString(val));
-                    goto error;
+                    return -1;
                 }
                 VIR_FREE(tmp);
             } else {
@@ -19381,7 +19381,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("unknown state attribute '%s' of feature '%s'"),
                                    tmp, virDomainFeatureTypeToString(val));
-                    goto error;
+                    return -1;
                 }
                 VIR_FREE(tmp);
             } else {
@@ -19395,7 +19395,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) {
                     virReportError(VIR_ERR_XML_ERROR,
                                    _("malformed gic version: %s"), tmp);
-                    goto error;
+                    return -1;
                 }
                 def->gic_version = gic_version;
                 VIR_FREE(tmp);
@@ -19411,7 +19411,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("Unknown driver mode: %s"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->features[val] = value;
                 VIR_FREE(tmp);
@@ -19426,7 +19426,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("Unknown HPT resizing setting: %s"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->hpt_resizing = (virDomainHPTResizing) value;
                 VIR_FREE(tmp);
@@ -19442,7 +19442,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                "%s",
                                _("Unable to parse HPT maxpagesize setting"));
-                goto error;
+                return -1;
             }
             def->hpt_maxpagesize = VIR_DIV_UP(def->hpt_maxpagesize, 1024);
 
@@ -19460,7 +19460,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("Unknown value: %s"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->features[val] = value;
                 VIR_FREE(tmp);
@@ -19475,7 +19475,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("Unknown value: %s"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->features[val] = value;
                 VIR_FREE(tmp);
@@ -19490,7 +19490,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("Unknown value: %s"),
                                    tmp);
-                    goto error;
+                    return -1;
                 }
                 def->features[val] = value;
                 VIR_FREE(tmp);
@@ -19504,13 +19504,13 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("missing state attribute '%s' of feature '%s'"),
                                tmp, virDomainFeatureTypeToString(val));
-                goto error;
+                return -1;
             }
             if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) < 0) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unknown state attribute '%s' of feature '%s'"),
                                tmp, virDomainFeatureTypeToString(val));
-                goto error;
+                return -1;
             }
             VIR_FREE(tmp);
             break;
@@ -19527,7 +19527,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
         int value;
         node = ctxt->node;
         if ((n = virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) < 0)
-            goto error;
+            return -1;
 
         for (i = 0; i < n; i++) {
             feature = virDomainHypervTypeFromString((const char *)nodes[i]->name);
@@ -19535,7 +19535,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unsupported HyperV Enlightenment feature: %s"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             ctxt->node = nodes[i];
@@ -19545,7 +19545,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                _("missing 'state' attribute for "
                                  "HyperV Enlightenment feature '%s'"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             if ((value = virTristateSwitchTypeFromString(tmp)) < 0) {
@@ -19553,7 +19553,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                _("invalid value of state argument "
                                  "for HyperV Enlightenment feature '%s'"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             VIR_FREE(tmp);
@@ -19582,14 +19582,14 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                              &def->hyperv_spinlocks) < 0) {
                     virReportError(VIR_ERR_XML_ERROR, "%s",
                                    _("invalid HyperV spinlock retry count"));
-                    goto error;
+                    return -1;
                 }
 
                 if (def->hyperv_spinlocks < 0xFFF) {
                     virReportError(VIR_ERR_XML_ERROR, "%s",
                                    _("HyperV spinlock retry count must be "
                                      "at least 4095"));
-                    goto error;
+                    return -1;
                 }
                 break;
 
@@ -19602,7 +19602,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                     virReportError(VIR_ERR_XML_ERROR, "%s",
                                    _("missing 'value' attribute for "
                                      "HyperV feature 'vendor_id'"));
-                    goto error;
+                    return -1;
                 }
 
                 if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) {
@@ -19610,14 +19610,14 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                    _("HyperV vendor_id value must not be more "
                                      "than %d characters."),
                                    VIR_DOMAIN_HYPERV_VENDOR_ID_MAX);
-                    goto error;
+                    return -1;
                 }
 
                 /* ensure that the string can be passed to qemu */
                 if (strchr(def->hyperv_vendor_id, ',')) {
                     virReportError(VIR_ERR_XML_ERROR, "%s",
                                    _("HyperV vendor_id value is invalid"));
-                    goto error;
+                    return -1;
                 }
 
             /* coverity[dead_error_begin] */
@@ -19632,28 +19632,28 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
     if (def->features[VIR_DOMAIN_HYPERV_STIMER] == VIR_TRISTATE_SWITCH_ON) {
         int value;
         if ((n = virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &nodes)) < 0)
-            goto error;
+            return -1;
 
         for (i = 0; i < n; i++) {
             if (STRNEQ((const char *)nodes[i]->name, "direct")) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unsupported Hyper-V stimer feature: %s"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             if (!(tmp = virXMLPropString(nodes[i], "state"))) {
                 virReportError(VIR_ERR_XML_ERROR,
                                _("missing 'state' attribute for "
                                  "Hyper-V stimer '%s' feature"), "direct");
-                        goto error;
+                        return -1;
             }
 
             if ((value = virTristateSwitchTypeFromString(tmp)) < 0) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("invalid value of state argument "
                                  "for Hyper-V stimer '%s' feature"), "direct");
-                goto error;
+                return -1;
             }
 
             VIR_FREE(tmp);
@@ -19666,7 +19666,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
         int feature;
         int value;
         if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0)
-            goto error;
+            return -1;
 
         for (i = 0; i < n; i++) {
             feature = virDomainKVMTypeFromString((const char *)nodes[i]->name);
@@ -19674,7 +19674,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unsupported KVM feature: %s"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             switch ((virDomainKVM) feature) {
@@ -19685,7 +19685,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                        _("missing 'state' attribute for "
                                          "KVM feature '%s'"),
                                        nodes[i]->name);
-                        goto error;
+                        return -1;
                     }
 
                     if ((value = virTristateSwitchTypeFromString(tmp)) < 0) {
@@ -19693,7 +19693,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                        _("invalid value of state argument "
                                          "for KVM feature '%s'"),
                                        nodes[i]->name);
-                        goto error;
+                        return -1;
                     }
 
                     VIR_FREE(tmp);
@@ -19714,7 +19714,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
         g_autofree char *ptval = NULL;
 
         if ((n = virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0)
-            goto error;
+            return -1;
 
         for (i = 0; i < n; i++) {
             feature = virDomainXenTypeFromString((const char *)nodes[i]->name);
@@ -19722,7 +19722,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unsupported Xen feature: %s"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             if (!(tmp = virXMLPropString(nodes[i], "state"))) {
@@ -19730,7 +19730,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                _("missing 'state' attribute for "
                                  "Xen feature '%s'"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             if ((value = virTristateSwitchTypeFromString(tmp)) < 0) {
@@ -19738,7 +19738,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                _("invalid value of state argument "
                                  "for Xen feature '%s'"),
                                nodes[i]->name);
-                goto error;
+                return -1;
             }
 
             VIR_FREE(tmp);
@@ -19759,7 +19759,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                        _("unsupported mode '%s' for Xen passthrough feature"),
                                        ptval);
-                        goto error;
+                        return -1;
                     }
 
                     if (mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT &&
@@ -19767,7 +19767,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                         virReportError(VIR_ERR_XML_ERROR, "%s",
                                        _("'mode' attribute for Xen feature "
                                          "'passthrough' must be 'sync_pt' or 'share_pt'"));
-                        goto error;
+                        return -1;
                     }
                     def->xen_passthrough_mode = mode;
                 }
@@ -19790,39 +19790,39 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                                            ULLONG_MAX,
                                            false);
         if (rv < 0)
-            goto error;
+            return -1;
         def->tseg_specified = rv;
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) {
         if ((node = virXPathNode("./features/msrs", ctxt)) == NULL)
-            goto error;
+            return -1;
 
         if (!(tmp = virXMLPropString(node, "unknown"))) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("missing 'unknown' attribute for feature '%s'"),
                            virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE_MSRS));
-            goto error;
+            return -1;
         }
 
         if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = virDomainMsrsUnknownTypeFromString(tmp)) < 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unknown 'unknown' value '%s'"),
                            tmp);
-            goto error;
+            return -1;
         }
         VIR_FREE(tmp);
     }
 
     if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
-        goto error;
+        return -1;
 
     for (i = 0; i < n; i++) {
         int val = virDomainProcessCapsFeatureTypeFromString((const char *)nodes[i]->name);
         if (val < 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("unexpected capability feature '%s'"), nodes[i]->name);
-            goto error;
+            return -1;
         }
 
         if ((tmp = virXMLPropString(nodes[i], "state"))) {
@@ -19830,7 +19830,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("unknown state attribute '%s' of feature capability '%s'"),
                                tmp, virDomainProcessCapsFeatureTypeToString(val));
-                goto error;
+                return -1;
             }
             VIR_FREE(tmp);
         } else {
@@ -19839,9 +19839,6 @@ virDomainFeaturesDefParse(virDomainDefPtr def,
     }
     VIR_FREE(nodes);
     return 0;
-
- error:
-    return -1;
 }