From nobody Sun Feb 8 19:59:41 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 1534176166510467.2133457633888; Mon, 13 Aug 2018 09:02:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFDDE85542; Mon, 13 Aug 2018 16:02:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B38A527095; Mon, 13 Aug 2018 16:02:43 +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 572043F67F; Mon, 13 Aug 2018 16:02:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7DG1NuE002151 for ; Mon, 13 Aug 2018 12:01:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7EAB82166BA5; Mon, 13 Aug 2018 16:01:23 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C7FE2166BA0 for ; Mon, 13 Aug 2018 16:01:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 13 Aug 2018 18:00:34 +0200 Message-Id: <63b0083983c1c4e7df2d24401a8a669b9fbaab32.1534173735.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 60/62] qemu: driver: Allow using blockdev with qemuDomainBlocksStatsGather 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 13 Aug 2018 16:02:45 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the 'qdev' instead of the disk alias to lookup the stats and transfer the capacity from the appropriate node name so that the function works with -blockdev. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 48 +++++++++++++++++++++++++++++++++++++---------= -- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a97235614b..dfb06bed80 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11063,11 +11063,13 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driv= er, qemuBlockStatsPtr *retstats) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virDomainDiskDefPtr disk; + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); + virDomainDiskDefPtr disk =3D NULL; virHashTablePtr blockstats =3D NULL; qemuBlockStatsPtr stats; size_t i; int nstats; + int rc =3D 0; const char *entryname =3D NULL; int ret =3D -1; @@ -11077,23 +11079,30 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driv= er, goto cleanup; } - if (!disk->info.alias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing disk device alias name for %s"), dis= k->dst); - goto cleanup; - } + if (blockdev) { + entryname =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->backendQomName; + } else { + if (!disk->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing disk device alias name for %s"),= disk->dst); + goto cleanup; + } - entryname =3D disk->info.alias; + entryname =3D disk->info.alias; + } } qemuDomainObjEnterMonitor(driver, vm); nstats =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats, fal= se); - if (capacity && nstats >=3D 0 && - qemuMonitorBlockStatsUpdateCapacity(priv->mon, blockstats, false) = < 0) - nstats =3D -1; + if (capacity && nstats >=3D 0) { + if (blockdev) + rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, = blockstats); + else + rc =3D qemuMonitorBlockStatsUpdateCapacity(priv->mon, blocksta= ts, false); + } - if (qemuDomainObjExitMonitor(driver, vm) < 0 || nstats < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0 || nstats < 0 || rc < 0) goto cleanup; if (VIR_ALLOC(*retstats) < 0) @@ -11106,12 +11115,29 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driv= er, goto cleanup; } + if (blockdev) { + /* capacity are reported only per node-name so we need to tran= sfer them */ + qemuBlockStatsPtr capstats; + + if (disk && disk->src && + (capstats =3D virHashLookup(blockstats, disk->src->nodefor= mat))) { + (*retstats)->capacity =3D capstats->capacity; + (*retstats)->physical =3D capstats->physical; + (*retstats)->wr_highest_offset =3D capstats->wr_highest_of= fset; + (*retstats)->wr_highest_offset_valid =3D capstats->wr_high= est_offset_valid; + (*retstats)->write_threshold =3D capstats->write_threshold; + } + } + **retstats =3D *stats; } else { for (i =3D 0; i < vm->def->ndisks; i++) { disk =3D vm->def->disks[i]; entryname =3D disk->info.alias; + if (blockdev) + entryname =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->backendQomNa= me; + if (!entryname) continue; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list