From f29d7c3e698dac6ce193fc065c02adc1df7a8958 Mon Sep 17 00:00:00 2001 From: Hiroki Narukawa Date: Fri, 15 Oct 2021 18:49:18 +0900 Subject: [PATCH] qemu_driver: add required capabilities to qemuDomainGetStatsWorkers One of qemuDomainGetStatsWorkers requires capabilities to run. This commit adds capability information to qemuDomainGetStatsWorkers. Signed-off-by: Hiroki Narukawa Signed-off-by: Michal Privoznik Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b759f5719..1faab31745 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18685,20 +18685,26 @@ struct qemuDomainGetStatsWorker { qemuDomainGetStatsFunc func; unsigned int stats; bool monitor; + virQEMUCapsFlags *requiredCaps; +}; + +static virQEMUCapsFlags queryDirtyRateRequired[] = { + QEMU_CAPS_QUERY_DIRTY_RATE, + QEMU_CAPS_LAST, }; static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { - { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, - { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, - { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, - { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, - { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, - { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, - { qemuDomainGetStatsIOThread, VIR_DOMAIN_STATS_IOTHREAD, true }, - { qemuDomainGetStatsMemory, VIR_DOMAIN_STATS_MEMORY, false }, - { qemuDomainGetStatsDirtyRate, VIR_DOMAIN_STATS_DIRTYRATE, true }, - { NULL, 0, false } + { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, NULL }, + { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, NULL }, + { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, NULL }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, NULL }, + { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, NULL }, + { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true, NULL }, + { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false, NULL }, + { qemuDomainGetStatsIOThread, VIR_DOMAIN_STATS_IOTHREAD, true, NULL }, + { qemuDomainGetStatsMemory, VIR_DOMAIN_STATS_MEMORY, false, NULL }, + { qemuDomainGetStatsDirtyRate, VIR_DOMAIN_STATS_DIRTYRATE, true, queryDirtyRateRequired }, + { NULL, 0, false, NULL } };