[PATCH v2 1/7] virsh: domain: use early return in virshDomainDefine()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Kristina Hanicova <khanicov@xxxxxxxxxx>
---
 tools/virsh-domain.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index bee3346eb0..edee548d8a 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -245,18 +245,18 @@ static virDomainPtr
 virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags)
 {
     virDomainPtr dom;
-    if (flags) {
-        dom = virDomainDefineXMLFlags(conn, xml, flags);
-        /* If validate is the only flag, just drop it and
-         * try again.
-         */
-        if (!dom) {
-            if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) &&
-                (flags == VIR_DOMAIN_DEFINE_VALIDATE))
-                dom = virDomainDefineXML(conn, xml);
-        }
-    } else {
-        dom = virDomainDefineXML(conn, xml);
+
+    if (!flags)
+        return virDomainDefineXML(conn, xml);
+
+    dom = virDomainDefineXMLFlags(conn, xml, flags);
+    /* If validate is the only flag, just drop it and
+     * try again.
+     */
+    if (!dom) {
+        if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) &&
+            (flags == VIR_DOMAIN_DEFINE_VALIDATE))
+            dom = virDomainDefineXML(conn, xml);
     }
     return dom;
 }
-- 
2.31.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux