From: Peter Krempa <pkrempa@redhat.com> Replace use of 'qemuStorageLimitsRefresh' by 'qemuDomainStorageSourceProbeSize'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_driver.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b14c6d42e..c6e35c58a4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17773,25 +17773,28 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriverConfig *cfg, virStorageSource *src, size_t block_idx) { + unsigned long long allocation = 0; + unsigned long long capacity = 0; + unsigned long long physical = 0; + if (virStorageSourceIsEmpty(src) || virStorageSourceIsFD(src)) return; - if (qemuStorageLimitsRefresh(cfg, dom, src, true) <= 0) { - virResetLastError(); + if (qemuDomainStorageSourceProbeSize(cfg, dom, src, &allocation, + &capacity, &physical) < 0) return; - } - if (src->allocation) - virTypedParamListAddULLong(params, src->allocation, + if (allocation) + virTypedParamListAddULLong(params, allocation, VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu" VIR_DOMAIN_STATS_BLOCK_SUFFIX_ALLOCATION, block_idx); - if (src->capacity) - virTypedParamListAddULLong(params, src->capacity, + if (capacity) + virTypedParamListAddULLong(params, capacity, VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu" VIR_DOMAIN_STATS_BLOCK_SUFFIX_CAPACITY, block_idx); - if (src->physical) - virTypedParamListAddULLong(params, src->physical, + if (physical) + virTypedParamListAddULLong(params, physical, VIR_DOMAIN_STATS_BLOCK_PREFIX "%zu" VIR_DOMAIN_STATS_BLOCK_SUFFIX_PHYSICAL, block_idx); } -- 2.54.0