External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-24 12:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: driver: Reuse qemuDomainBlocksStatsGather in qemuDomainGetBlockInfo

Browse Source 
Allow updating capacity for the block devices returned by
qemuDomainBlocksStatsGather and replace the open-coded call to
qemuMonitorGetAllBlockStatsInfo by the helper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-06-18 13:06:53 +02:00
parent 4a0835364e
commit 055c918b37
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/qemu/qemu_driver.c
View File

@ -11063,6 +11063,7 @@ qemuDomainBlockStatsGatherTotals(void *payload,
* @driver: driver object * @driver: driver object
* @vm: domain object * @vm: domain object
* @path: to gather the statistics for * @path: to gather the statistics for
* @capacity: refresh capacity of the backing image
* @retstats: returns pointer to structure holding the stats * @retstats: returns pointer to structure holding the stats
* *
* Gathers the block statistics for use in qemuDomainBlockStats* APIs. * Gathers the block statistics for use in qemuDomainBlockStats* APIs.
@ -11073,6 +11074,7 @@ static int
qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, qemuDomainBlocksStatsGather(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *path, const char *path,
bool capacity,
qemuBlockStatsPtr *retstats) qemuBlockStatsPtr *retstats)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -11101,6 +11103,11 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
nstats = qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats, false); nstats = qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats, false);
if (capacity && nstats >= 0 &&
qemuMonitorBlockStatsUpdateCapacity(priv->mon, blockstats, false) < 0)
nstats = -1;
if (qemuDomainObjExitMonitor(driver, vm) < 0 || nstats < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0 || nstats < 0)
goto cleanup; goto cleanup;
@ -11154,7 +11161,7 @@ qemuDomainBlockStats(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
if (qemuDomainBlocksStatsGather(driver, vm, path, &blockstats) < 0) if (qemuDomainBlocksStatsGather(driver, vm, path, false, &blockstats) < 0)
goto endjob; goto endjob;
stats->rd_req = blockstats->rd_req; stats->rd_req = blockstats->rd_req;
@ -11208,7 +11215,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
if ((nstats = qemuDomainBlocksStatsGather(driver, vm, path, if ((nstats = qemuDomainBlocksStatsGather(driver, vm, path, false,
&blockstats)) < 0) &blockstats)) < 0)
goto endjob; goto endjob;
@ -12021,10 +12028,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
int ret = -1; int ret = -1;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
int rc; qemuBlockStatsPtr entry = NULL;
virHashTablePtr stats = NULL;
qemuBlockStats *entry;
char *alias = NULL;
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -12065,28 +12069,8 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (!disk->info.alias || if (qemuDomainBlocksStatsGather(driver, vm, path, true, &entry) < 0)
!(alias = qemuDomainStorageAlias(disk->info.alias, 0))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("missing disk device alias name for %s"), disk->dst);
goto endjob; goto endjob;
}
qemuDomainObjEnterMonitor(driver, vm);
rc = qemuMonitorGetAllBlockStatsInfo(qemuDomainGetMonitor(vm),
&stats, false);
if (rc >= 0)
rc = qemuMonitorBlockStatsUpdateCapacity(qemuDomainGetMonitor(vm),
stats, false);
if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
goto endjob;
if (!(entry = virHashLookup(stats, alias))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to gather stats for disk '%s'"), disk->dst);
goto endjob;
}
if (!entry->wr_highest_offset_valid) { if (!entry->wr_highest_offset_valid) {
info->allocation = entry->physical; info->allocation = entry->physical;
@ -12131,8 +12115,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
endjob: endjob:
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
VIR_FREE(alias); VIR_FREE(entry);
virHashFree(stats);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;