From nobody Mon Feb 9 13:58:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1770303470; cv=none; d=zohomail.com; s=zohoarc; b=M+Ghmy3wp0tugd9wQuRP27Io8DmM80ZGJQ/X0fz9O7ZYTFAp7n/VQLuMlIV9rp7nTpdxkFHTJRJZfl19wFPWSlmPLIVyWkIi2k5KoFF81DxTiASG19PRemMp52P4WylYD1+IezymfIzibhBYPYYMGqxbqkMqtcM59vxe7vSaj2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770303470; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=GXeIuIpIN+jSfjMlY0YvgS6op22vYpbrVI92VKGf++I=; b=mkhVw671h7SAKqPCku9//yda8uOI+lEBeJ5AdCRajWsg/HYmPzjy2Iwz86PICg/+dg9cjsln2v41LgGmxoNQGoioInxVQmvpbTNE2LHLYulKSygJ5CymuCA2VSdzb10V0XnITmDAqXG2QjMMv4RECVhrrvNqAL31cSJvbEP38Hw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1770303470054168.2581228699172; Thu, 5 Feb 2026 06:57:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6504D41A2A; Thu, 5 Feb 2026 09:57:49 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7AE2141C4D; Thu, 5 Feb 2026 09:55:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 916E8418A5; Thu, 5 Feb 2026 09:55:38 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2BCE93F316 for ; Thu, 5 Feb 2026 09:55:34 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-150-p45QfahAO0mcHjWeEqr9nA-1; Thu, 05 Feb 2026 09:55:32 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A8F8D1955E7A for ; Thu, 5 Feb 2026 14:55:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.3]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F2E5F1800464 for ; Thu, 5 Feb 2026 14:55:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770303333; h=from:from: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; bh=GXeIuIpIN+jSfjMlY0YvgS6op22vYpbrVI92VKGf++I=; b=JT42bt7m5AcfRTp1Pkkx7M4AjSLzGuZMh1MDbNo1ddJrX3EVQ2odrChwsfokuwK8UMaTHe O/hVHfcgMHTIQeCC3jYq+AE/gDB4DGikmSR7MLvpjjXOCXJsx/MzOY6fUhDVzDvFfEvbSf j7wlMfV3DHUD7VSAn5w7A/0sllBzw6A= X-MC-Unique: p45QfahAO0mcHjWeEqr9nA-1 X-Mimecast-MFC-AGG-ID: p45QfahAO0mcHjWeEqr9nA_1770303331 To: devel@lists.libvirt.org Subject: [PATCH 01/20] qemuDomainDiskInfo: Drop 'nodename' field Date: Thu, 5 Feb 2026 15:55:09 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _A2SoYhEhXYRB3SUqaF0DZsz9HA_jDaBuAXsKeVosio_1770303331 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DASMRNXHSRZCX4PITUOWCCQ3QKKGQVFM X-Message-ID-Hash: DASMRNXHSRZCX4PITUOWCCQ3QKKGQVFM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1770303473012154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The field is only read in tests. Other code using it no longer exists. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 5 +---- tests/qemumonitorjsontest.c | 4 ++-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 3361e97315..095c36b8ac 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -364,7 +364,6 @@ struct qemuDomainDiskInfo { bool tray_open; bool empty; int io_status; - char *nodename; }; #define QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev) \ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 504500c864..6acc80832c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1947,7 +1947,6 @@ qemuDomainDiskInfoFree(void *value) { struct qemuDomainDiskInfo *info =3D value; - g_free(info->nodename); g_free(info); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f345741207..a7e095a648 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2304,7 +2304,6 @@ qemuMonitorJSONBlockInfoAdd(GHashTable *table, tmp =3D g_new0(struct qemuDomainDiskInfo, 1); *tmp =3D *info; - tmp->nodename =3D g_strdup(info->nodename); g_hash_table_insert(table, g_strdup(entryname), tmp); @@ -2360,9 +2359,7 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, info.tray =3D true; /* presence of 'inserted' notifies that a medium is in the device = */ - if ((image =3D virJSONValueObjectGetObject(dev, "inserted"))) { - info.nodename =3D (char *) virJSONValueObjectGetString(image, = "node-name"); - } else { + if (!(image =3D virJSONValueObjectGetObject(dev, "inserted"))) { info.empty =3D true; } diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index bfe81739a7..efa2400750 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1354,9 +1354,9 @@ static void testQemuMonitorJSONGetBlockInfoPrint(const struct qemuDomainDiskInfo *d) { VIR_TEST_VERBOSE("removable: %d, tray: %d, tray_open: %d, empty: %d, " - "io_status: %d, nodename: '%s'", + "io_status: %d", d->removable, d->tray, d->tray_open, d->empty, - d->io_status, NULLSTR(d->nodename)); + d->io_status); } --=20 2.53.0