From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 11 Apr 2016 13:26:06 +0000 (+0200)
Subject: conf: reduce indentation in virDomainDefAddImplicitVideo
X-Git-Tag: v1.3.3.2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24cf4c6476e7d8c7e35d580f9e810df85b60ae1c;p=thirdparty%2Flibvirt.git

conf: reduce indentation in virDomainDefAddImplicitVideo

Return early if there is nothing to do.

(cherry picked from commit 1485be178461b6e9504d21216b7ef480f4980ffa)
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7fcaafeb42..364615a915 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18572,22 +18572,23 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
 
     /* For backwards compatibility, if no <video> tag is set but there
      * is a <graphics> tag, then we add a single video tag */
-    if (def->ngraphics && !def->nvideos) {
-        if (VIR_ALLOC(video) < 0)
-            goto cleanup;
-        video->type = virDomainVideoDefaultType(def);
-        if (video->type < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("cannot determine default video type"));
-            goto cleanup;
-        }
-        video->vram = virDomainVideoDefaultRAM(def, video->type);
-        video->heads = 1;
-        if (VIR_ALLOC_N(def->videos, 1) < 0)
-            goto cleanup;
-        def->videos[def->nvideos++] = video;
-        video = NULL;
+    if (def->ngraphics == 0 || def->nvideos > 0)
+        return 0;
+
+    if (VIR_ALLOC(video) < 0)
+        goto cleanup;
+    video->type = virDomainVideoDefaultType(def);
+    if (video->type < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("cannot determine default video type"));
+        goto cleanup;
     }
+    video->vram = virDomainVideoDefaultRAM(def, video->type);
+    video->heads = 1;
+    if (VIR_ALLOC_N(def->videos, 1) < 0)
+        goto cleanup;
+    def->videos[def->nvideos++] = video;
+    video = NULL;
 
     ret = 0;
  cleanup: