From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 11 Apr 2016 13:20:41 +0000 (+0200)
Subject: conf: delete useless primaryVideo variable
X-Git-Tag: v1.3.4-rc1~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35e3c4a68411017faaf61390628d59fab481defe;p=thirdparty%2Flibvirt.git

conf: delete useless primaryVideo variable

If we encounter a video device with primary=yes, we insert it
at def->videos[0].

There is no need to record this in a separate variable,
just check if there already is a primary video at def->videos[0].
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d6d4334247..d7dcc4cb6d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15088,7 +15088,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     bool usb_none = false;
     bool usb_other = false;
     bool usb_master = false;
-    bool primaryVideo = false;
     char *netprefix = NULL;
 
     if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE) {
@@ -16427,7 +16426,7 @@ virDomainDefParseXML(xmlDocPtr xml,
             goto error;
 
         if (video->primary) {
-            if (primaryVideo) {
+            if (def->nvideos != 0 && def->videos[0]->primary) {
                 virDomainVideoDefFree(video);
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                _("Only one primary video device is supported"));
@@ -16435,7 +16434,6 @@ virDomainDefParseXML(xmlDocPtr xml,
             }
 
             insertAt = 0;
-            primaryVideo = true;
         }
         if (VIR_INSERT_ELEMENT_INPLACE(def->videos,
                                        insertAt,