From nobody Sun Feb 8 18:14:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1607094570; cv=none; d=zohomail.com; s=zohoarc; b=k1b9Vxv3L1rsH32syEzaylwibSxzdvKHVzu476neClIUVBvM2GQcCaiW0nbBUhu0Mivh4UknTzSsaKQyk8uBPYyMEVxip0xTVMISEbPDaHxZzxDmbPWML4WzYsmbpvQJRp4BQBLFCNccprLCDAeH6zPsDthIf3h3Vp5hfXQq2Js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607094570; 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=9z4l3GwRF1Xjj2I4i5LbNVJPja+kqpJC3SgmJ5zrMz8=; b=mEja+nLlc14Xo6xyv9GzV/mxroYX2hAusbkNSydhTn4g7s6V9RSLmVhbGxRir/7UpWUAbK/XypIWW9+AaE6Eppkr7u5KOdcUFLqtTHNZKRKplalS8kh5tU1LxIlm8Hf9SYxrqOLzr4i92AqGh2YADi/zKyy06rXtFeXLhqWDW88= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1607094570749500.54241525451835; Fri, 4 Dec 2020 07:09:30 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-QYgOJ17sNhWaC47h2q09SA-1; Fri, 04 Dec 2020 10:09:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76E71100F340; Fri, 4 Dec 2020 15:09:20 +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 54A3A5D9D7; Fri, 4 Dec 2020 15:09:20 +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 185EE1809CA2; Fri, 4 Dec 2020 15:09:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B4F8G26031292 for ; Fri, 4 Dec 2020 10:08:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id AAA925D9DB; Fri, 4 Dec 2020 15:08:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0013A5D9D7 for ; Fri, 4 Dec 2020 15:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607094568; 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=9z4l3GwRF1Xjj2I4i5LbNVJPja+kqpJC3SgmJ5zrMz8=; b=THccSjyQz+oj5jV5IQEU9+upleS6R+e0yc/vm+48fHhTELFXc+sSKuQoBWfkzCDc2+lsQZ YZHb9Fydba7rUoM2N3RdEZqEgt1n7OPzXFQRtd9xc0P/Orr0EBa4aqS9hzq4EEsRY75dAX wlelGhXTp1gYwfp2ONGFmzuGGdDPPvM= X-MC-Unique: QYgOJ17sNhWaC47h2q09SA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/7] qemuDomainGetBlockJobInfo: Use qemuMonitorGetAllBlockJobInfo Date: Fri, 4 Dec 2020 16:08:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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) Content-Type: text/plain; charset="utf-8" Replace qemuMonitorGetBlockJobInfo by qemuMonitorGetAllBlockJobInfo and hash table lookup. This basically open-codes qemuMonitorGetBlockJobInfo, but it will be removed in next patch. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b82f7e249a..e2fde6c76f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14695,8 +14695,9 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virDomainObjPtr vm; virDomainDiskDefPtr disk; int ret =3D -1; - qemuMonitorBlockJobInfo rawInfo; + qemuMonitorBlockJobInfoPtr rawInfo; g_autoptr(qemuBlockJobData) job =3D NULL; + g_autoptr(GHashTable) blockjobstats =3D NULL; virCheckFlags(VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES, -1); @@ -14722,18 +14723,21 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); - ret =3D qemuMonitorGetBlockJobInfo(qemuDomainGetMonitor(vm), job->name= , &rawInfo); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; - if (ret <=3D 0) + blockjobstats =3D qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(v= m), true); + if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockjobstats) goto endjob; - if (qemuBlockJobInfoTranslate(&rawInfo, info, disk, - flags & VIR_DOMAIN_BLOCK_JOB_INFO_BANDWI= DTH_BYTES) < 0) { - ret =3D -1; + if (!(rawInfo =3D g_hash_table_lookup(blockjobstats, job->name))) { + ret =3D 0; goto endjob; } + if (qemuBlockJobInfoTranslate(rawInfo, info, disk, + flags & VIR_DOMAIN_BLOCK_JOB_INFO_BANDWI= DTH_BYTES) < 0) + goto endjob; + + ret =3D 1; + endjob: qemuDomainObjEndJob(driver, vm); --=20 2.28.0