From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 18 May 2017 12:43:05 +0000 (+0200)
Subject: nodedev: mdev: Fix build caused by symbol shadowing
X-Git-Tag: v3.4.0-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de4b46e1e12641b3bbf9bb5b4c2bbc0eee44bdb7;p=thirdparty%2Flibvirt.git

nodedev: mdev: Fix build caused by symbol shadowing

GCC 4.6 complains about a local declaration shadowing a global symbol.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 8288be1cba..4ecb0b18fe 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1076,16 +1076,16 @@ udevProcessMediatedDevice(struct udev_device *dev,
     const char *uuidstr = NULL;
     int iommugrp = -1;
     char *linkpath = NULL;
-    char *realpath = NULL;
+    char *canonicalpath = NULL;
     virNodeDevCapMdevPtr data = &def->caps->data.mdev;
 
     if (virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)) < 0)
         goto cleanup;
 
-    if (virFileResolveLink(linkpath, &realpath) < 0)
+    if (virFileResolveLink(linkpath, &canonicalpath) < 0)
         goto cleanup;
 
-    if (VIR_STRDUP(data->type, last_component(realpath)) < 0)
+    if (VIR_STRDUP(data->type, last_component(canonicalpath)) < 0)
         goto cleanup;
 
     uuidstr = udev_device_get_sysname(dev);
@@ -1100,7 +1100,7 @@ udevProcessMediatedDevice(struct udev_device *dev,
     ret = 0;
  cleanup:
     VIR_FREE(linkpath);
-    VIR_FREE(realpath);
+    VIR_FREE(canonicalpath);
     return ret;
 }