From nobody Mon Feb 9 10:50:03 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=1770303644; cv=none; d=zohomail.com; s=zohoarc; b=QNu8MnYNwAb+T07em15q7Aq2PEcexLUN2y8q5JQ2c5jgqIOQ7QAby4ajfq76m+UTf8GbETITBxbGmOIChv+QTExMbY3scZMbjl9nFJpwSyW9Z9cd6oEHdrUtFqAPdudeLvnEhzFEieFrDkYSqTeQHHk1Ef1F8cCRC4vG47MsqoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770303644; 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=86cj0frv57dK2swg21JbK/5lIZapXlBroKc8GjkNKd8=; b=VMJwL5ysN7bSgMIl6Fx8t22BMaNxgDa4lxbdGMoOt4A9PKuBHEeiTjT630YzqiDVzcMoD0eKLde7yOjuxOBS7d0SCxCX0HGH8D4d8UenrJBkt4vyXcTWn3pYMon7uIIe2DNZJiZPDMYa4rRkvRGtVSVXrRYhebWy+JztwgXSqJE= 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 1770303644419570.7318071666168; Thu, 5 Feb 2026 07:00:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8943841A0D; Thu, 5 Feb 2026 10:00:43 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 599A043E80; Thu, 5 Feb 2026 09:56:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1894341B5B; Thu, 5 Feb 2026 09:55:56 -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 28C1B41A55 for ; Thu, 5 Feb 2026 09:55:40 -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-536-gG40lbIsPKCdepqYFZ6ZCg-1; Thu, 05 Feb 2026 09:55:36 -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 3C8741955D48 for ; Thu, 5 Feb 2026 14:55:35 +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 867E918004AD for ; Thu, 5 Feb 2026 14:55:34 +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=1770303339; 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=86cj0frv57dK2swg21JbK/5lIZapXlBroKc8GjkNKd8=; b=VPo7xwZwjsRMQov7bnHLuBusJLuG7GZ2v7SrdXiVNmiGomK1r5yGVdvQ1SJWC6/SFK/La2 QKjOiN/gApX2QVCjcK426JWx07oZMXznp4RgI06sBTYxUm0sTuIYwIPZijlAROICZ/J4he C6bmaL36itpaCbIAzd9eKCOEmgM3jdA= X-MC-Unique: gG40lbIsPKCdepqYFZ6ZCg-1 X-Mimecast-MFC-AGG-ID: gG40lbIsPKCdepqYFZ6ZCg_1770303335 To: devel@lists.libvirt.org Subject: [PATCH 04/20] qemu: Drop 'empty' filed from 'qemuDomainDiskInfo' Date: Thu, 5 Feb 2026 15:55:12 +0100 Message-ID: <01a403570efb506553ef5e698221b21dabec1b04.1770303113.git.pkrempa@redhat.com> 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: WfSDby4XU4K5P0wmzPRvibf3CoJcZdqX-9XE5DigJ48_1770303335 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OSWOTESJAJXSPCT6RQGOEZELSZ5FH54F X-Message-ID-Hash: OSWOTESJAJXSPCT6RQGOEZELSZ5FH54F 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: 1770303646745158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The value is no longer used so drop the field and also the code which fetches it from the QMP command reply. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_monitor_json.c | 6 ------ tests/qemumonitorjsontest.c | 7 ++----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 20d6bd316c..0f975a22fc 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -360,7 +360,6 @@ struct qemuDomainDiskInfo { bool removable; bool tray; bool tray_open; - bool empty; int io_status; }; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a7e095a648..bf9e59c0b6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2323,7 +2323,6 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, for (i =3D 0; i < virJSONValueArraySize(devices); i++) { virJSONValue *dev; - virJSONValue *image; struct qemuDomainDiskInfo info =3D { false }; const char *thisdev; const char *status; @@ -2358,11 +2357,6 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, if (virJSONValueObjectGetBoolean(dev, "tray_open", &info.tray_open= ) =3D=3D 0) info.tray =3D true; - /* presence of 'inserted' notifies that a medium is in the device = */ - if (!(image =3D virJSONValueObjectGetObject(dev, "inserted"))) { - info.empty =3D true; - } - /* Missing io-status indicates no error */ if ((status =3D virJSONValueObjectGetString(dev, "io-status"))) { info.io_status =3D qemuMonitorBlockIOStatusToError(status); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index efa2400750..699b75ce2d 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1353,10 +1353,8 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(con= st void *opaque) static void testQemuMonitorJSONGetBlockInfoPrint(const struct qemuDomainDiskInfo *d) { - VIR_TEST_VERBOSE("removable: %d, tray: %d, tray_open: %d, empty: %d, " - "io_status: %d", - d->removable, d->tray, d->tray_open, d->empty, - d->io_status); + VIR_TEST_VERBOSE("removable: %d, tray: %d, tray_open: %d, io_status: %= d", + d->removable, d->tray, d->tray_open, d->io_status); } @@ -1418,7 +1416,6 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) info->removable =3D true; info->tray =3D true; - info->empty =3D true; if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", --=20 2.53.0