From nobody Sun Feb 8 21:12:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532534364525517.3192402893606; Wed, 25 Jul 2018 08:59:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31C6181117; Wed, 25 Jul 2018 15:59:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2FC4CD652; Wed, 25 Jul 2018 15:59:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9F1EF1800B80; Wed, 25 Jul 2018 15:59:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6PFwpCM025934 for ; Wed, 25 Jul 2018 11:58:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 24EE67C4B; Wed, 25 Jul 2018 15:58:51 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A7261018F; Wed, 25 Jul 2018 15:58:50 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 25 Jul 2018 17:58:09 +0200 Message-Id: <2fdf201fba0d8694eb9e944a927b9cd47c95865c.1532533587.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH RFC 38/39] qemu: driver: Prepare qemuDomainGetStatsBlock (bulk disk stats) for -blockdev X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 25 Jul 2018 15:59:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add code paths which call into the new functions to gather the data on a per-node-name basis and tweak the aliases used for extracting the data. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4f25471c4a..8755bd1652 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20206,6 +20206,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virJSONValuePtr nodedata =3D NULL; qemuDomainObjPrivatePtr priv =3D dom->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool fetchnodedata =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES); int count_index =3D -1; @@ -20215,14 +20216,24 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { qemuDomainObjEnterMonitor(driver, dom); - rc =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &stats, - visitBacking); - if (rc >=3D 0) - ignore_value(qemuMonitorBlockStatsUpdateCapacity(priv->mon, st= ats, - visitBacking)= ); - if (fetchnodedata) - nodedata =3D qemuMonitorQueryNamedBlockNodes(priv->mon); + if (blockdev) { + fetchnodedata =3D false; + + rc =3D qemuMonitorGetBlockStatsInfo(priv->mon, &stats, NULL); + + if (rc >=3D 0) + rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->m= on, stats); + } else { + rc =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &stats, + visitBacking); + if (rc >=3D 0) + ignore_value(qemuMonitorBlockStatsUpdateCapacity(priv->mon= , stats, + visitBack= ing)); + + if (fetchnodedata) + nodedata =3D qemuMonitorQueryNamedBlockNodes(priv->mon); + } if (qemuDomainObjExitMonitor(driver, dom) < 0) goto cleanup; @@ -20249,12 +20260,17 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, while (virStorageSourceIsBacking(src) && (src =3D=3D disk->src || visitBacking)) { - /* alias may be NULL if the VM is not running */ - if (disk->info.alias && - !(alias =3D qemuDomainStorageAlias(disk->info.alias, src->= id))) - goto cleanup; + if (blockdev) { + if (VIR_STRDUP(alias, src->nodeformat) < 0) + goto cleanup; + } else { + /* alias may be NULL if the VM is not running */ + if (disk->info.alias && + !(alias =3D qemuDomainStorageAlias(disk->info.alias, s= rc->id))) + goto cleanup; - qemuDomainGetStatsOneBlockRefreshNamed(src, alias, stats, node= stats); + qemuDomainGetStatsOneBlockRefreshNamed(src, alias, stats, = nodestats); + } if (qemuDomainGetStatsOneBlock(driver, cfg, dom, record, maxpa= rams, disk->dst, alias, src, visited, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list