From nobody Thu Dec 18 03:58:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846470; cv=none; d=zohomail.com; s=zohoarc; b=KfXMbO88CVzbtNmqdgNHLVttLYVsdsJihlVjFwrr01dlgYWJL/CrCsYyAlxYRvKyWRsK10YXBmVp46gxFCPOYlMm8k8hFc8YX8dzh4UPjp0czV6woc9dyx6xtpHhTgPDAhQrP5IVsKH5SYLia2grETvZSW2yS4osyYK4FgoEAc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846470; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NeE14dTQimpABkECLSUQzk0dPmkx4/lkrD0Cdg7yvMo=; b=DfVvgFBAqDEZtdwoggwaBKK1H7YBLjmfzxivlK9/SKVOesCp96Q5OZOIoMKraviOa0Rnkk6zy3+QFxFNwZzwafDzFRnTrkhrXTaYI9Eq6RzprMz5nJAa3FIXcIc/4SiYZI/PB27KJxc+wFSXl36OdzDMyPvAu4bForOPOjQf4SY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846470789417.7342485558735; Tue, 26 Jul 2022 07:41:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-140-Kh4nVI5JNpeKgEjFHP8QWw-1; Tue, 26 Jul 2022 10:39:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 829641824610; Tue, 26 Jul 2022 14:39:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6811DC2811A; Tue, 26 Jul 2022 14:39:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E79D41947063; Tue, 26 Jul 2022 14:38:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9430A1947B96 for ; Tue, 26 Jul 2022 14:38:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 86B23400DFD7; Tue, 26 Jul 2022 14:38:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12F8C40CF8EE for ; Tue, 26 Jul 2022 14:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846469; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NeE14dTQimpABkECLSUQzk0dPmkx4/lkrD0Cdg7yvMo=; b=aP34UWTP+SMvVdbaQqTMWlDa20ALP8OO3YYExpbZgzDBpy7Q1FH/C2NHeFg0A9PJABffig 2RYrPJoulAsNGS9w2ZlbsRkdyqNEroPsJmaxr7/JDI5zy2ui9YLTGs7/0SJshPojDAzp8j 8PiYG4U7DKWHabnlVS9JYCyJ4ReW4T0= X-MC-Unique: Kh4nVI5JNpeKgEjFHP8QWw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 53/80] qemuDomainBlocksStatsGather: Remove pre-blockdev code paths Date: Tue, 26 Jul 2022 16:37:31 +0200 Message-Id: <56a074723d7cdff63e61ca820cc9c65209c07c73.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846472019100015 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c2722c39da..59d1caa053 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10054,7 +10054,6 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, qemuBlockStats **retstats) { qemuDomainObjPrivate *priv =3D vm->privateData; - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); virDomainDiskDef *disk =3D NULL; g_autoptr(GHashTable) blockstats =3D NULL; qemuBlockStats *stats; @@ -10090,12 +10089,8 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); nstats =3D qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats); - if (capacity && nstats >=3D 0) { - if (blockdev) - rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, = blockstats); - else - rc =3D qemuMonitorBlockStatsUpdateCapacity(priv->mon, blocksta= ts); - } + if (capacity && nstats >=3D 0) + rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, bloc= kstats); qemuDomainObjExitMonitor(vm); @@ -10105,6 +10100,8 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, *retstats =3D g_new0(qemuBlockStats, 1); if (entryname) { + qemuBlockStats *capstats; + if (!(stats =3D virHashLookup(blockstats, entryname))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find statistics for device '%s'"), en= tryname); @@ -10113,18 +10110,14 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, **retstats =3D *stats; - if (blockdev) { - /* capacity are reported only per node-name so we need to tran= sfer them */ - qemuBlockStats *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; - } + /* capacity are reported only per node-name so we need to transfer= them */ + if (disk && disk->src && + (capstats =3D virHashLookup(blockstats, disk->src->nodeformat)= )) { + (*retstats)->capacity =3D capstats->capacity; + (*retstats)->physical =3D capstats->physical; + (*retstats)->wr_highest_offset =3D capstats->wr_highest_offset; + (*retstats)->wr_highest_offset_valid =3D capstats->wr_highest_= offset_valid; + (*retstats)->write_threshold =3D capstats->write_threshold; } } else { for (i =3D 0; i < vm->def->ndisks; i++) { --=20 2.36.1