From nobody Mon Feb 9 04:03:20 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=1770303716; cv=none; d=zohomail.com; s=zohoarc; b=ja/8juPe6+jwGAmgt1dF0VR2ZTk85uxQCguVHdhdEIzsg1nWV3gbULop1gsboIXWHpNVhvKiXUdYIXTkRq3O8pLDA5fZ0WIZ3F5P4ufr6uwBXouUnvvsAbKU40bPSNAm6zuHfwTZGi11n+bOFPCQV7ZBra8UCJSCH/J1f3eYzBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770303716; 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=FjZfR6Sr73J91RtYONyzPHI4YE6QCaVegs+kni9pOW8=; b=ZHtZIMTEkSntpsKHxSEdXun9fH0uym9dxj8Vzk0s0BuC12U8apcSWQ6IEM9jIF8spC9/gp/wGJesgrSiMsb8GfRmCPJvM0vzy1LsIXGXR/VxTxXdvkIr4T9UJQDsSVurhjS8KUSYL98Tss2TueipMP0+g7cQ+/aC+R6SJIVceXU= 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 1770303716039385.00965430597955; Thu, 5 Feb 2026 07:01:56 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 4CF4B43E7B; Thu, 5 Feb 2026 10:01:55 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 378D03F36B; Thu, 5 Feb 2026 09:57:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 7113141A7C; Thu, 5 Feb 2026 09:56:53 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 CC98041B52 for ; Thu, 5 Feb 2026 09:55:40 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-PwelujHxO_ywd9iJtCK8rQ-1; Thu, 05 Feb 2026 09:55:39 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A072D1800365 for ; Thu, 5 Feb 2026 14:55:38 +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 EB732180066F for ; Thu, 5 Feb 2026 14:55:37 +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=1770303340; 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=FjZfR6Sr73J91RtYONyzPHI4YE6QCaVegs+kni9pOW8=; b=IHsn5Gxthi8A2NdcuvKvQvfcIanyYSLBL1vB1XB7Mz8etVih6ONgHaf3hWPQ3CvuebSp1T t8L08e54ai9a0ybf1AT0Si9niWQ/zlxFf49p8Ep5OQMB+Te2qV9t5ftUqdLEjcvLYsO4/5 DhYPvr2s0cGWlDXR0mwUZH9BVXZLUvY= X-MC-Unique: PwelujHxO_ywd9iJtCK8rQ-1 X-Mimecast-MFC-AGG-ID: PwelujHxO_ywd9iJtCK8rQ_1770303338 To: devel@lists.libvirt.org Subject: [PATCH 07/20] qemu: Drop 'removable' field from 'qemuDomainDiskInfo' Date: Thu, 5 Feb 2026 15:55:15 +0100 Message-ID: <663cc9b0a2f0bf547422dbe9edd5980662933c50.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: UUlPEmmYQwLZ7Htl95jveT63CpAWWj0eQ_UE8zMOpCg_1770303338 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NUEETHSAOTIB7Q5ZCBAZ2D4GYK4JYJJB X-Message-ID-Hash: NUEETHSAOTIB7Q5ZCBAZ2D4GYK4JYJJB 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: 1770303718748154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The only real use was in 'qemuProcessRefreshDiskProps' where it guarded assignment of 'tray' status. Since qemu doesn't actually report any tray status for devices which don't have a tray there's no need for the extra guard. Remove the field completely. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_monitor_json.c | 7 ------- src/qemu/qemu_process.c | 12 +++++------- tests/qemumonitorjsontest.c | 6 ++---- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 0f975a22fc..06e2f92ac3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -357,7 +357,6 @@ struct _qemuDomainVcpuPrivate { struct qemuDomainDiskInfo { - bool removable; bool tray; bool tray_open; int io_status; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index bf9e59c0b6..1b05c713ea 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2346,13 +2346,6 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, return -1; } - if (virJSONValueObjectGetBoolean(dev, "removable", &info.removable= ) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot read %1$s value"), - "removable"); - return -1; - } - /* 'tray_open' is present only if the device has a tray */ if (virJSONValueObjectGetBoolean(dev, "tray_open", &info.tray_open= ) =3D=3D 0) info.tray =3D true; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba8bda0f99..d6ff9c96fc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9592,13 +9592,11 @@ qemuProcessRefreshDiskProps(virDomainDiskDef *disk, { qemuDomainDiskPrivate *diskpriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - if (info->removable) { - if (info->tray) { - if (info->tray_open) - disk->tray_status =3D VIR_DOMAIN_DISK_TRAY_OPEN; - else - disk->tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; - } + if (info->tray) { + if (info->tray_open) + disk->tray_status =3D VIR_DOMAIN_DISK_TRAY_OPEN; + else + disk->tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; } diskpriv->tray =3D info->tray; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 699b75ce2d..b3aca6a6c3 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1353,8 +1353,8 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(cons= t void *opaque) static void testQemuMonitorJSONGetBlockInfoPrint(const struct qemuDomainDiskInfo *d) { - VIR_TEST_VERBOSE("removable: %d, tray: %d, tray_open: %d, io_status: %= d", - d->removable, d->tray, d->tray_open, d->io_status); + VIR_TEST_VERBOSE("tray: %d, tray_open: %d, io_status: %d", + d->tray, d->tray_open, d->io_status); } @@ -1403,7 +1403,6 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) info =3D g_new0(struct qemuDomainDiskInfo, 1); - info->removable =3D true; info->tray =3D true; if (virHashAddEntry(expectedBlockDevices, "ide0-1-0", info) < 0) { @@ -1414,7 +1413,6 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) info =3D g_new0(struct qemuDomainDiskInfo, 1); - info->removable =3D true; info->tray =3D true; if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) { --=20 2.53.0