From nobody Mon Feb 9 08:31:37 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 1533651858763726.4494871479651; Tue, 7 Aug 2018 07:24:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9F649FDFD; Tue, 7 Aug 2018 14:24:16 +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 7240C5C20D; Tue, 7 Aug 2018 14:24:16 +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 1C906245FF; Tue, 7 Aug 2018 14:24:16 +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 w77ENQ7q010594 for ; Tue, 7 Aug 2018 10:23:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6DEEE2166BA2; Tue, 7 Aug 2018 14:23:26 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C8B52166BA0 for ; Tue, 7 Aug 2018 14:23:25 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 7 Aug 2018 16:22:43 +0200 Message-Id: <9671b72c44c45b02ae710ad0f70934df0489bf83.1533651618.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] [PATCH 52/55] 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 07 Aug 2018 14:24:17 +0000 (UTC) X-ZohoMail: RDMRC_0 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 | 9 ++++++++- src/qemu/qemu_process.c | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 63c1a85d5a..6ee826029b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18738,6 +18738,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; @@ -18748,6 +18749,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; @@ -18773,8 +18775,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 2183127133..fceaf95fab 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7561,6 +7561,7 @@ 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; @@ -7578,8 +7579,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