From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 24 May 2017 12:31:26 +0000 (+0200)
Subject: conf: fix build issue caused by shadowing global declaration
X-Git-Tag: v3.4.0-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065e89cf8bacd4a86bc1a1f0ee91ce086ed1202e;p=thirdparty%2Flibvirt.git

conf: fix build issue caused by shadowing global declaration

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 32234e8a54..d3c6e9c0ab 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3525,12 +3525,12 @@ void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info)
 
 static bool
 virDomainSkipBackcompatConsole(virDomainDefPtr def,
-                               size_t index,
+                               size_t idx,
                                bool all)
 {
-    virDomainChrDefPtr console = def->consoles[index];
+    virDomainChrDefPtr console = def->consoles[idx];
 
-    if (!all && index == 0 &&
+    if (!all && idx == 0 &&
         (console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ||
          console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) &&
         def->os.type == VIR_DOMAIN_OSTYPE_HVM) {