External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-08 14:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Avoid shadowing variable "devname" on FreeBSD. Again.

Browse Source 
FreeBSD's compiler complains that we shadow the symbol. Sigh.

s/devname/dev_name/
This commit is contained in:
Peter Krempa 2014-10-01 14:39:23 +02:00
parent 58699b77ee
commit 72945c0629
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_monitor_json.c
View File

@ -1993,7 +1993,7 @@ int qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
virJSONValuePtr inserted; virJSONValuePtr inserted;
virJSONValuePtr image; virJSONValuePtr image;
qemuBlockStatsPtr bstats; qemuBlockStatsPtr bstats;
const char *devname; const char *dev_name;
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -2002,18 +2002,18 @@ int qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
if (!(devname = virJSONValueObjectGetString(dev, "device"))) { if (!(dev_name = virJSONValueObjectGetString(dev, "device"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-block device entry was not " _("query-block device entry was not "
"in expected format")); "in expected format"));
goto cleanup; goto cleanup;
} }
if (STRPREFIX(devname, QEMU_DRIVE_HOST_PREFIX)) if (STRPREFIX(dev_name, QEMU_DRIVE_HOST_PREFIX))
devname += strlen(QEMU_DRIVE_HOST_PREFIX); dev_name += strlen(QEMU_DRIVE_HOST_PREFIX);
/* ignore missing info */ /* ignore missing info */
if (!(bstats = virHashLookup(stats, devname))) if (!(bstats = virHashLookup(stats, dev_name)))
continue; continue;
/* drive may be empty */ /* drive may be empty */