From nobody Mon Feb 9 01:31:17 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 1532534359965955.0331051051095; Wed, 25 Jul 2018 08:59:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3D8812C02; Wed, 25 Jul 2018 15:59:18 +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 6DBC23001A72; Wed, 25 Jul 2018 15:59:18 +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 0A48A14B13; Wed, 25 Jul 2018 15:59:18 +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 w6PFwjjh025865 for ; Wed, 25 Jul 2018 11:58:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDBC71684A; Wed, 25 Jul 2018 15:58:44 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 602051687E; Wed, 25 Jul 2018 15:58:44 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 25 Jul 2018 17:58:03 +0200 Message-Id: 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 32/39] qemu: Use QOM path with query-block when using -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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 25 Jul 2018 15:59:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Switch to using the QOM/qdev handles in all calls to qemuMonitorGetBlockInfo when using -blockdev. The callers also need to make sure to use the correct handle afterwards to extract the data. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 11 +++++++++-- src/qemu/qemu_process.c | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9114800821..9a3c4289ba 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18723,6 +18723,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, virDomainObjPtr vm =3D NULL; qemuDomainObjPrivatePtr priv; virHashTablePtr table =3D NULL; + bool blockdev =3D false; int ret =3D -1; size_t i; int n =3D 0; @@ -18733,6 +18734,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, goto cleanup; priv =3D vm->privateData; + blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -18749,7 +18751,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); - table =3D qemuMonitorGetBlockInfo(priv->mon, false); + table =3D qemuMonitorGetBlockInfo(priv->mon, blockdev); if (qemuDomainObjExitMonitor(driver, vm) < 0) goto endjob; if (!table) @@ -18758,8 +18760,13 @@ qemuDomainGetDiskErrors(virDomainPtr dom, for (i =3D n =3D 0; i < vm->def->ndisks; i++) { struct qemuDomainDiskInfo *info; virDomainDiskDefPtr disk =3D vm->def->disks[i]; + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); + const char *entryname =3D disk->info.alias; + + if (blockdev) + entryname =3D diskPriv->backendQomName; - if ((info =3D virHashLookup(table, disk->info.alias)) && + if ((info =3D virHashLookup(table, entryname)) && info->io_status !=3D VIR_DOMAIN_DISK_ERROR_NONE) { if (n =3D=3D nerrors) break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2c3133d678..b8724b68ae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7559,12 +7559,13 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); virHashTablePtr table =3D NULL; int ret =3D -1; size_t i; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D=3D 0) { - table =3D qemuMonitorGetBlockInfo(priv->mon, false); + table =3D qemuMonitorGetBlockInfo(priv->mon, blockdev); if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; } @@ -7576,8 +7577,12 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver, virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskpriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); struct qemuDomainDiskInfo *info; + const char *entryname =3D disk->info.alias; + + if (blockdev) + entryname =3D diskpriv->backendQomName; - if (!(info =3D virHashLookup(table, disk->info.alias))) + if (!(info =3D virHashLookup(table, entryname))) continue; if (info->removable) { --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list