External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Create helper qemuMonitorJSONGetBlockDevDevice

Browse Source 
This will fetch "this device" from the recently returned 'dev' and perform
common error checking for the paths that call it.
This commit is contained in:
John Ferlan 2016-10-03 15:04:32 -04:00
parent c6c5fc0b2b
commit 59539ebff3
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/qemu/qemu_monitor_json.c
View File

@ -1822,6 +1822,21 @@ qemuMonitorJSONGetBlockDev(virJSONValuePtr devices,
} }
static const char *
qemuMonitorJSONGetBlockDevDevice(virJSONValuePtr dev)
{
const char *thisdev;
if (!(thisdev = virJSONValueObjectGetString(dev, "device"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-block device entry was not in expected format"));
return NULL;
}
return thisdev;
}
int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
virHashTablePtr table) virHashTablePtr table)
{ {
@ -1842,11 +1857,8 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
if (!(dev = qemuMonitorJSONGetBlockDev(devices, i))) if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
goto cleanup; goto cleanup;
if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { if (!(thisdev = qemuMonitorJSONGetBlockDevDevice(dev)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("block info device entry was not in expected format"));
goto cleanup; goto cleanup;
}
thisdev = qemuAliasDiskDriveSkipPrefix(thisdev); thisdev = qemuAliasDiskDriveSkipPrefix(thisdev);
@ -2102,12 +2114,8 @@ qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
if (!(dev = qemuMonitorJSONGetBlockDev(devices, i))) if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
goto cleanup; goto cleanup;
if (!(dev_name = virJSONValueObjectGetString(dev, "device"))) { if (!(dev_name = qemuMonitorJSONGetBlockDevDevice(dev)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-block device entry was not "
"in expected format"));
goto cleanup; goto cleanup;
}
/* drive may be empty */ /* drive may be empty */
if (!(inserted = virJSONValueObjectGetObject(dev, "inserted")) || if (!(inserted = virJSONValueObjectGetObject(dev, "inserted")) ||
@ -4013,11 +4021,8 @@ qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon,
if (!(dev = qemuMonitorJSONGetBlockDev(devices, i))) if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
goto cleanup; goto cleanup;
if (!(thisdev = virJSONValueObjectGetString(dev, "device"))) { if (!(thisdev = qemuMonitorJSONGetBlockDevDevice(dev)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("block info device entry was not in expected format"));
goto cleanup; goto cleanup;
}
if (STREQ(thisdev, device)) { if (STREQ(thisdev, device)) {
if ((inserted = virJSONValueObjectGetObject(dev, "inserted")) && if ((inserted = virJSONValueObjectGetObject(dev, "inserted")) &&