From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 5 Jul 2021 10:46:53 +0000 (+0200)
Subject: virDomainSEVDefParseXML: Remove superfluous `goto`s
X-Git-Tag: v7.6.0-rc1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3994a36ec764c38b9de05fd8d11260fae661498f;p=thirdparty%2Flibvirt.git

virDomainSEVDefParseXML: Remove superfluous `goto`s

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dd803e6df5..db8ec23d70 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14730,12 +14730,12 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
     if (virXMLPropEnum(sevNode, "type", virDomainLaunchSecurityTypeFromString,
                        VIR_XML_PROP_NONZERO | VIR_XML_PROP_REQUIRED,
                        &def->sectype) < 0)
-        goto error;
+        return NULL;
 
     if (virXPathULongHex("string(./policy)", ctxt, &policy) < 0) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("failed to get launch security policy"));
-        goto error;
+        return NULL;
     }
 
     /* the following attributes are platform dependent and if missing, we can
@@ -14747,7 +14747,7 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
     } else if (rc == -2) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Invalid format for launch security cbitpos"));
-        goto error;
+        return NULL;
     }
 
     rc = virXPathUInt("string(./reducedPhysBits)", ctxt,
@@ -14758,7 +14758,7 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Invalid format for launch security "
                          "reduced-phys-bits"));
-        goto error;
+        return NULL;
     }
 
     def->policy = policy;
@@ -14766,9 +14766,6 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
     def->session = virXPathString("string(./session)", ctxt);
 
     return g_steal_pointer(&def);
-
- error:
-    return NULL;
 }