[libvirt] [PATCHv2 53/62] qemu: Extract exporting of the header for block stats
Split out the header so that the loop can be refactored later.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_driver.c | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ac9c7faf2e..6ea86c8cbf 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -20071,7 +20071,6 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver,
virDomainObjPtr dom,
virDomainStatsRecordPtr record,
int *maxparams,
- const char *diskdst,
const char *entryname,
virStorageSourcePtr src,
size_t block_idx,
@@ -20080,14 +20079,6 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver,
qemuBlockStats *entry;
int ret = -1;
- QEMU_ADD_NAME_PARAM(record, maxparams, "block", "name",
block_idx, diskdst);
-
- if (virStorageSourceIsLocalStorage(src) && src->path)
- QEMU_ADD_NAME_PARAM(record, maxparams, "block", "path",
- block_idx, src->path);
- if (src->id)
- QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex",
- src->id);
/* the VM is offline so we have to go and load the stast from the disk by
* ourselves */
@@ -20150,6 +20141,29 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver,
}
+static int
+qemuDomainGetStatsBlockExportHeader(virDomainDiskDefPtr disk,
+ virStorageSourcePtr src,
+ size_t recordnr,
+ virDomainStatsRecordPtr records,
+ int *nrecords)
+{
+ int ret = -1;
+
+ QEMU_ADD_NAME_PARAM(records, nrecords, "block", "name", recordnr,
disk->dst);
+
+ if (virStorageSourceIsLocalStorage(src) && src->path)
+ QEMU_ADD_NAME_PARAM(records, nrecords, "block", "path",
recordnr, src->path);
+ if (src->id)
+ QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex",
+ src->id);
+
+ ret = 0;
+ cleanup:
+ return ret;
+}
+
+
static int
qemuDomainGetStatsBlockExportDisk(virDomainDiskDefPtr disk,
virHashTablePtr stats,
@@ -20177,8 +20191,12 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefPtr disk,
qemuDomainGetStatsOneBlockRefreshNamed(src, alias, stats, nodestats);
+ if (qemuDomainGetStatsBlockExportHeader(disk, src, *recordnr,
+ records, nrecords) < 0)
+ goto cleanup;
+
if (qemuDomainGetStatsOneBlock(driver, cfg, dom, records, nrecords,
- disk->dst, alias, src, *recordnr,
+ alias, src, *recordnr,
stats) < 0)
goto cleanup;
--
2.16.2