External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-10 05:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Create helper qemuMonitorJSONGetBlockDev

Browse Source 
This will grab the 'dev' from devices and do the common validation checks.
This commit is contained in:
John Ferlan 2016-10-03 14:58:59 -04:00
parent b0ab72bd43
commit c6c5fc0b2b
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu/qemu_monitor_json.c
View File

@ -1807,6 +1807,21 @@ qemuMonitorJSONQueryBlock(qemuMonitorPtr mon)
} }
static virJSONValuePtr
qemuMonitorJSONGetBlockDev(virJSONValuePtr devices,
size_t idx)
{
virJSONValuePtr dev = virJSONValueArrayGet(devices, idx);
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-block device entry was not in expected format"));
return NULL;
}
return dev;
}
int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
virHashTablePtr table) virHashTablePtr table)
{ {
@ -1819,16 +1834,13 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
return -1; return -1;
for (i = 0; i < virJSONValueArraySize(devices); i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev;
struct qemuDomainDiskInfo *info; struct qemuDomainDiskInfo *info;
const char *thisdev; const char *thisdev;
const char *status; const char *status;
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("block info device entry was not in expected format"));
goto cleanup; goto cleanup;
}
if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -2082,17 +2094,13 @@ qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
return -1; return -1;
for (i = 0; i < virJSONValueArraySize(devices); i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev;
virJSONValuePtr inserted; virJSONValuePtr inserted;
virJSONValuePtr image; virJSONValuePtr image;
const char *dev_name; const char *dev_name;
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-block device entry was not "
"in expected format"));
goto cleanup; goto cleanup;
}
if (!(dev_name = virJSONValueObjectGetString(dev, "device"))) { if (!(dev_name = virJSONValueObjectGetString(dev, "device"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -3997,16 +4005,13 @@ qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon,
return NULL; return NULL;
for (i = 0; i < virJSONValueArraySize(devices); i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev;
virJSONValuePtr inserted; virJSONValuePtr inserted;
virJSONValuePtr image; virJSONValuePtr image;
const char *thisdev; const char *thisdev;
if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("block info device entry was not in expected format"));
goto cleanup; goto cleanup;
}
if (!(thisdev = virJSONValueObjectGetString(dev, "device"))) { if (!(thisdev = virJSONValueObjectGetString(dev, "device"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",