From nobody Sun Feb 8 18:57:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1487878130129836.3493771350105; Thu, 23 Feb 2017 11:28:50 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1NJPAP4008496; Thu, 23 Feb 2017 14:25:10 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1NJLOVR001383 for ; Thu, 23 Feb 2017 14:21:24 -0500 Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1NJL8uf028635; Thu, 23 Feb 2017 14:21:23 -0500 From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 23 Feb 2017 20:22:05 +0100 Message-Id: <940b017b7bed1fdf7709931846f9ed7ecce8adee.1487877253.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [RFC PATCH 12/12] qemu: WIP: lookup nodenames 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor.c | 11 ++++++++++- src/qemu/qemu_monitor_json.c | 8 +++++++- src/qemu/qemu_process.c | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 705a3ad59..db6e9a75f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -356,6 +356,7 @@ struct qemuDomainDiskInfo { bool tray_open; bool empty; int io_status; + char *nodename; }; typedef struct _qemuDomainHostdevPrivate qemuDomainHostdevPrivate; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7caced7fe..42c32bc64 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2147,6 +2147,15 @@ qemuMonitorBlockIOStatusToError(const char *status) return -1; } +static void +qemuDomainDiskInfoFree(void *value, const void *name ATTRIBUTE_UNUSED) +{ + struct qemuDomainDiskInfo *info =3D value; + + VIR_FREE(info->nodename); + VIR_FREE(info); +} + virHashTablePtr qemuMonitorGetBlockInfo(qemuMonitorPtr mon) @@ -2156,7 +2165,7 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon) QEMU_CHECK_MONITOR_NULL(mon); - if (!(table =3D virHashCreate(32, virHashValueFree))) + if (!(table =3D virHashCreate(32, qemuDomainDiskInfoFree))) return NULL; if (mon->json) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 4b8103195..6e65b26d3 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1868,9 +1868,11 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, for (i =3D 0; i < virJSONValueArraySize(devices); i++) { virJSONValuePtr dev; + virJSONValuePtr image; struct qemuDomainDiskInfo *info; const char *thisdev; const char *status; + const char *nodename; if (!(dev =3D qemuMonitorJSONGetBlockDev(devices, i))) goto cleanup; @@ -1907,8 +1909,12 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, info->tray =3D true; /* presence of 'inserted' notifies that a medium is in the device = */ - if (!virJSONValueObjectGetObject(dev, "inserted")) + if ((image =3D virJSONValueObjectGetObject(dev, "inserted"))) { + if ((nodename =3D virJSONValueObjectGetString(image, "node-nam= e"))) + ignore_value(VIR_STRDUP(info->nodename, nodename)); + } else { info->empty =3D true; + } /* Missing io-status indicates no error */ if ((status =3D virJSONValueObjectGetString(dev, "io-status"))) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cfe4073de..74409f88a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6735,6 +6735,7 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver, /* fill in additional data */ diskpriv->removable =3D info->removable; diskpriv->tray =3D info->tray; + VIR_STEAL_PTR(disk->src->nodeName, info->nodename); } ret =3D 0; --=20 2.11.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list