From: Eric Blake <eblake@redhat.com>
Date: Thu, 25 Apr 2013 17:22:39 +0000 (-0600)
Subject: qemu: fix build error with older platforms
X-Git-Tag: v1.0.5-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b121584f58c2753a157f46fba8f948b7d005dd83;p=thirdparty%2Flibvirt.git

qemu: fix build error with older platforms

Jim Fehlig reported on IRC that older gcc/glibc triggers this warning:

cc1: warnings being treated as errors
qemu/qemu_domain.c: In function 'qemuDomainDefFormatBuf':
qemu/qemu_domain.c:1297: error: declaration of 'remove' shadows a global declaration [-Wshadow]
/usr/include/stdio.h:157: error: shadowed declaration is here [-Wshadow]
make[3]: *** [libvirt_driver_qemu_impl_la-qemu_domain.lo] Error 1

Fix it like we have done in the past (such as commit 2e6322a).

* src/qemu/qemu_domain.c (qemuDomainDefFormatBuf): Avoid shadowing
a function name.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4e88eaf9ee..d927716a0a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1294,7 +1294,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
 
     if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) {
         int i;
-        int remove = 0;
+        int toremove = 0;
         virDomainControllerDefPtr usb = NULL, pci = NULL;
 
         /* If only the default USB controller is present, we can remove it
@@ -1314,7 +1314,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
         if (usb && usb->idx == 0 && usb->model == -1) {
             VIR_DEBUG("Removing default USB controller from domain '%s'"
                       " for migration compatibility", def->name);
-            remove++;
+            toremove++;
         } else {
             usb = NULL;
         }
@@ -1335,15 +1335,15 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
             pci->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) {
             VIR_DEBUG("Removing default 'pci-root' from domain '%s'"
                       " for migration compatibility", def->name);
-            remove++;
+            toremove++;
         } else {
             pci = NULL;
         }
 
-        if (remove) {
+        if (toremove) {
             controllers = def->controllers;
             ncontrollers = def->ncontrollers;
-            if (VIR_ALLOC_N(def->controllers, ncontrollers - remove) < 0) {
+            if (VIR_ALLOC_N(def->controllers, ncontrollers - toremove) < 0) {
                 controllers = NULL;
                 virReportOOMError();
                 goto cleanup;