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

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

s/devname/dev_name/
This commit is contained in:
Peter Krempa 2014-09-30 11:41:43 +02:00
parent 96c0f57a82
commit bd2b0968c1
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

@ -1816,7 +1816,7 @@ int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
for (i = 0; i < virJSONValueArraySize(devices); i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
virJSONValuePtr stats; virJSONValuePtr stats;
const char *devname; const char *dev_name;
if (VIR_ALLOC(bstats) < 0) if (VIR_ALLOC(bstats) < 0)
goto cleanup; goto cleanup;
@ -1828,15 +1828,15 @@ int qemuMonitorJSONGetAllBlockStatsInfo(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",
_("blockstats device entry was not " _("blockstats 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);
if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL || if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL ||
stats->type != VIR_JSON_TYPE_OBJECT) { stats->type != VIR_JSON_TYPE_OBJECT) {
@ -1907,7 +1907,7 @@ int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
if (virHashAddEntry(hash, devname, bstats) < 0) if (virHashAddEntry(hash, dev_name, bstats) < 0)
goto cleanup; goto cleanup;
bstats = NULL; bstats = NULL;
} }