From nobody Mon Feb 9 04:46: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=1770304191; cv=none; d=zohomail.com; s=zohoarc; b=TXW8+Y2FQFiOE/y5Vbgp6PlhMXesnG4Q4S9wNO6dfzbDjkdXcP3C8iW7sfNbxvwjSte1YP3Gki6XMZBRv6Y+n1SkyMh8voaBBoeZyyxcXAeo8JkmYELuqrVlpdk11hrEriwuAN5EjTATrAZEYz2EBUbi1GXZKH8YoyyFkx1c1qM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770304191; 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=MvJCDjXwfmivvfq/N64U25ySfGESquVOZsaOfSHzJCc=; b=VCpA756p6RN7bAAXPNWk0z8HryfIkOY+9cpIeRRoCHk1+oDo9CFumQ1S4Sxp2r+p95wXRyBM1sLoQDY2/09vVLE6dT62+5pRuIn4KhDd7MnQfVWL2zoz0ppfS9fu0/8LvN0pBoAWNLS7ge2TnpHDwNV5YHgN/lvnepBzQAgmz6c= 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 1770304191791983.3460912622918; Thu, 5 Feb 2026 07:09:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 00DB241B28; Thu, 5 Feb 2026 10:09:51 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0F6E74412C; Thu, 5 Feb 2026 09:59:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6293843DC5; Thu, 5 Feb 2026 09:59:41 -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 3D90043E0F for ; Thu, 5 Feb 2026 09:55:51 -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-442-WW2EDoR6M7Og6BvjUJ5NlA-1; Thu, 05 Feb 2026 09:55:49 -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 10AE61955F12 for ; Thu, 5 Feb 2026 14:55:49 +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 5B38418004AD for ; Thu, 5 Feb 2026 14:55:48 +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=1770303350; 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=MvJCDjXwfmivvfq/N64U25ySfGESquVOZsaOfSHzJCc=; b=GPhqg8C9bmjXvBuxdeMx6yme+Ys7sCW85ZM1tFyQAGFDlqpn1O5Rk+l839ruWW7hR/OHT2 T5l0K8sy+ev8/lY/OT0idRfOFI1fzRb9uGQQR5Zn1bmbK6fVqtYEpG2ZB1PbAspdeMWC0S VA5i2psc2/KhVT96+z9g8aMkEtOqi6E= X-MC-Unique: WW2EDoR6M7Og6BvjUJ5NlA-1 X-Mimecast-MFC-AGG-ID: WW2EDoR6M7Og6BvjUJ5NlA_1770303349 To: devel@lists.libvirt.org Subject: [PATCH 16/20] qemu: Refactor tray_status handling Date: Thu, 5 Feb 2026 15:55:24 +0100 Message-ID: <03e1290e40d596209b7f56d33e488b78eaec1630.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: skBMSTdn6xcoA3PgaJLdn3_jmKmIuO9B05vsNM4Ckyk_1770303349 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EXMXZ3XZD4QVMCF4GUXYVCNM5XQD47VM X-Message-ID-Hash: EXMXZ3XZD4QVMCF4GUXYVCNM5XQD47VM 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: 1770304192542158501 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Modify the monitor code to directly return values from 'virDomainDiskTray' enum instead of two bools. This allows simplification of the other code: - qemuProcessRefreshDiskProps just assigns the value, thus can be deleted - old_tray_status is no longer needed as we can directly access the disk status instead and assign later Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_monitor_json.c | 14 +++++++++++--- src/qemu/qemu_process.c | 26 ++++++-------------------- src/qemu/qemu_process.h | 3 --- tests/qemumonitorjsontest.c | 8 ++++---- 5 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 2a881a8285..d4f6c256cd 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -355,8 +355,7 @@ struct _qemuDomainVcpuPrivate { struct qemuDomainDiskInfo { - bool tray; - bool tray_open; + virDomainDiskTray tray_status; virDomainDiskErrorCode io_status; }; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 50e0497385..971e8dd63f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2347,10 +2347,14 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, for (i =3D 0; i < virJSONValueArraySize(devices); i++) { virJSONValue *dev; - struct qemuDomainDiskInfo info =3D { .io_status =3D VIR_DOMAIN_DIS= K_ERROR_NONE }; + struct qemuDomainDiskInfo info =3D { + .tray_status =3D VIR_DOMAIN_DISK_TRAY_NONE, + .io_status =3D VIR_DOMAIN_DISK_ERROR_NONE + }; const char *thisdev; const char *status; const char *qdev; + bool tray_open; if (!(dev =3D qemuMonitorJSONGetBlockDev(devices, i))) return -1; @@ -2371,8 +2375,12 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, } /* '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; + if (virJSONValueObjectGetBoolean(dev, "tray_open", &tray_open) =3D= =3D 0) { + if (tray_open) + info.tray_status =3D VIR_DOMAIN_DISK_TRAY_OPEN; + else + info.tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; + } /* 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 2142198589..0b78d45ef6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8661,7 +8661,6 @@ qemuProcessRefreshDisks(virDomainObj *vm, qemuDomainDiskPrivate *diskpriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); struct qemuDomainDiskInfo *info; const char *entryname =3D disk->info.alias; - virDomainDiskTray old_tray_status =3D disk->tray_status; if (diskpriv->qomName) entryname =3D diskpriv->qomName; @@ -8669,20 +8668,20 @@ qemuProcessRefreshDisks(virDomainObj *vm, if (!(info =3D virHashLookup(table, entryname))) continue; - qemuProcessRefreshDiskProps(disk, info); - - if (old_tray_status !=3D VIR_DOMAIN_DISK_TRAY_NONE && - disk->tray_status !=3D VIR_DOMAIN_DISK_TRAY_NONE && - old_tray_status !=3D disk->tray_status) { + if (disk->tray_status !=3D VIR_DOMAIN_DISK_TRAY_NONE && + info->tray_status !=3D VIR_DOMAIN_DISK_TRAY_NONE && + disk->tray_status !=3D info->tray_status) { virDomainEventTrayChangeReason reason =3D VIR_DOMAIN_EVENT_TRA= Y_CHANGE_OPEN; virObjectEvent *event; - if (disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_CLOSED) + if (info->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_CLOSED) reason =3D VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE; event =3D virDomainEventTrayChangeNewFromObj(vm, disk->info.al= ias, reason); virObjectEventStateQueue(driver->domainEventState, event); } + + disk->tray_status =3D info->tray_status; } return 0; @@ -9587,19 +9586,6 @@ qemuProcessAutoDestroy(virDomainObj *dom, } -void -qemuProcessRefreshDiskProps(virDomainDiskDef *disk, - struct qemuDomainDiskInfo *info) -{ - 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; - } -} - - static int qemuProcessRefreshCPUMigratability(virDomainObj *vm, virDomainAsyncJob asyncJob) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 201b3ebb63..df63cac9b8 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -257,9 +257,6 @@ bool qemuProcessRebootAllowed(const virDomainDef *def); void qemuProcessCleanupMigrationJob(virQEMUDriver *driver, virDomainObj *vm); -void qemuProcessRefreshDiskProps(virDomainDiskDef *disk, - struct qemuDomainDiskInfo *info); - int qemuProcessSetupEmulator(virDomainObj *vm); void qemuProcessHandleNbdkitExit(qemuNbdkitProcess *nbdkit, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 9c9b3397ad..c10faa6a6f 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("tray: %d, tray_open: %d, io_status: %d", - d->tray, d->tray_open, d->io_status); + VIR_TEST_VERBOSE("tray_status: %d, io_status: %d", + d->tray_status, d->io_status); } @@ -1403,7 +1403,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) info =3D g_new0(struct qemuDomainDiskInfo, 1); - info->tray =3D true; + info->tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; if (virHashAddEntry(expectedBlockDevices, "ide0-1-0", info) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1413,7 +1413,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) info =3D g_new0(struct qemuDomainDiskInfo, 1); - info->tray =3D true; + info->tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; if (virHashAddEntry(expectedBlockDevices, "ide0-1-1", info) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", --=20 2.53.0