From 2f6ff0da5bc1b1f863901228f7110a6ae54df4f2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 30 Aug 2018 10:30:09 +0200 Subject: [PATCH] qemu: Don't overwrite stats in qemuDomainBlocksStatsGather MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The size/capacity stats gathered in qemuDomainBlocksStatsGather when using -blockdev would be overwritten by assigning/copying the transfered data statistics at the end. Fix it by moving the assignment prior to fetching the capacity data. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..07ea5473b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11114,6 +11114,8 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, goto cleanup; } + **retstats = *stats; + if (blockdev) { /* capacity are reported only per node-name so we need to transfer them */ qemuBlockStatsPtr capstats; @@ -11127,8 +11129,6 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, (*retstats)->write_threshold = capstats->write_threshold; } } - - **retstats = *stats; } else { for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i];