]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: monitor: Avoid shadowing variable "devname" on FreeBSD
authorPeter Krempa <pkrempa@redhat.com>
Tue, 30 Sep 2014 09:41:43 +0000 (11:41 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 30 Sep 2014 09:41:43 +0000 (11:41 +0200)
FreeBSD's compiler complains that we shadow the symbol. Sigh.

s/devname/dev_name/

src/qemu/qemu_monitor_json.c

index 150ff7639ed31c0c4aa755c9d0c10c0351a2dba7..b3b64510124001aad5ecdefd0f5777928f8bac93 100644 (file)
@@ -1816,7 +1816,7 @@ int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
     for (i = 0; i < virJSONValueArraySize(devices); i++) {
         virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
         virJSONValuePtr stats;
-        const char *devname;
+        const char *dev_name;
 
         if (VIR_ALLOC(bstats) < 0)
             goto cleanup;
@@ -1828,15 +1828,15 @@ int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
             goto cleanup;
         }
 
-        if (!(devname = virJSONValueObjectGetString(dev, "device"))) {
+        if (!(dev_name = virJSONValueObjectGetString(dev, "device"))) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("blockstats device entry was not "
                              "in expected format"));
             goto cleanup;
         }
 
-        if (STRPREFIX(devname, QEMU_DRIVE_HOST_PREFIX))
-            devname += strlen(QEMU_DRIVE_HOST_PREFIX);
+        if (STRPREFIX(dev_name, QEMU_DRIVE_HOST_PREFIX))
+            dev_name += strlen(QEMU_DRIVE_HOST_PREFIX);
 
         if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL ||
             stats->type != VIR_JSON_TYPE_OBJECT) {
@@ -1907,7 +1907,7 @@ int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
             goto cleanup;
         }
 
-        if (virHashAddEntry(hash, devname, bstats) < 0)
+        if (virHashAddEntry(hash, dev_name, bstats) < 0)
             goto cleanup;
         bstats = NULL;
     }