From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 4 Nov 2016 12:16:44 +0000 (+0100)
Subject: qemu: Fix build on RHEL-6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2d649f800f690bf9e5ed4625e8f63bcd0c32d639;p=libvirt.git

qemu: Fix build on RHEL-6

Commit c29e6d4805 cause build failure on RHEL-6:

../../src/qemu/qemu_capabilities.c: In function 'virQEMUCapsIsValid':
../../src/qemu/qemu_capabilities.c:4085: error: declaration of 'ctime'
shadows a global declaration [-Wshadow]
/usr/include/time.h:258: error: shadowed declaration is here [-Wshadow]

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ffe7bcdf43..747226cffc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4082,12 +4082,12 @@ virQEMUCapsNewForBinary(virCapsPtr caps,
 
 bool
 virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps,
-                   time_t ctime)
+                   time_t qemuctime)
 {
     if (!qemuCaps->binary)
         return true;
 
-    if (!ctime) {
+    if (!qemuctime) {
         struct stat sb;
 
         if (stat(qemuCaps->binary, &sb) < 0) {
@@ -4097,14 +4097,14 @@ virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps,
                       virStrerror(errno, ebuf, sizeof(ebuf)));
             return false;
         }
-        ctime = sb.st_ctime;
+        qemuctime = sb.st_ctime;
     }
 
-    if (ctime != qemuCaps->ctime) {
+    if (qemuctime != qemuCaps->ctime) {
         VIR_DEBUG("Outdated capabilities for '%s': QEMU binary changed "
                   "(%lld vs %lld)",
                   qemuCaps->binary,
-                  (long long) ctime, (long long) qemuCaps->ctime);
+                  (long long) qemuctime, (long long) qemuCaps->ctime);
         return false;
     }