From nobody Mon Feb 9 00:44:35 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=1748246423; cv=none; d=zohomail.com; s=zohoarc; b=MpzX/6kd0gFPfkMyV/FxAPRbLdWa7zA1bS7QPsYAivF6/Y+EWaegp8LSHiEDK+ESknC/o6bKCvZ7zicpksnzpeE5Hj/7w7AQDw6fEF42BPA4AxYwqu7cYtCow64clVbOFo2mx4mXMCfkDTC6QFVMfT+aQ1HrFADY+61ZM2KjOrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748246423; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=NmpxpUQ9G0HxZk5jWroJ1qJOruDpSD5IxR6zM8mPSWQ=; b=BGTr25hnYNGF1cMBFnTBAXCG4RHJbMuvdSqfyqeccC+3fuL2sLgZjahxS8t8jmry+igMd9p+cjvPl5L9+KP5/cbNRAWW02EogFYKnnR/F2FEv8DDDStVDIQj6MbixLEYBT6DtGkoUgo+64mTllRIXv9sCptA1U+pEcYmd6AukKM= 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 1748246423653790.4742269191572; Mon, 26 May 2025 01:00:23 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A0B01169C; Mon, 26 May 2025 04:00:22 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7740C16B2; Mon, 26 May 2025 03:57:52 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 18CAB1635; Mon, 26 May 2025 03:57:45 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 43CBF1635 for ; Mon, 26 May 2025 03:57:37 -0400 (EDT) Received: from mx-prod-mc-08.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-454-vzObC8zSOW-m0BNAaUpAgA-1; Mon, 26 May 2025 03:57:34 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B5C81801A0D for ; Mon, 26 May 2025 07:57:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B726195608D for ; Mon, 26 May 2025 07:57:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748246257; 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=cFvCry0N0BgtD4rzNBZiFi+Iay8uySxc6hnd1bnbyu4=; b=TZ5hEkWH4Dhrc7Srj/mvgQ5BB1SfjkPEFgF9/Sx/1vdf6Wax4FFIJ5x6lwtiHbLChxhhfy e0DbU84MPNF3baJBmvNeFzaBgyvorr8UCOKVVbzF0ozvJIKdbBEZew34ulFT8QPf0aEdYf VieIYvG/dDysbP0HfZc+iYOBFz9RHFE= X-MC-Unique: vzObC8zSOW-m0BNAaUpAgA-1 X-Mimecast-MFC-AGG-ID: vzObC8zSOW-m0BNAaUpAgA_1748246254 To: devel@lists.libvirt.org Subject: [PATCH 4/4] qemuDomainMachineSupportsFloppy: Check for QEMU_CAPS_BUS_FLOPPY Date: Mon, 26 May 2025 09:57:26 +0200 Message-ID: <2dcdd3b6ad08356114d5e4c964c27c27d66bda2d.1748246185.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fA0AjG-n0i5YzEdsAk_8hDYMzSJ2D1MBSUtrsTMhLKs_1748246254 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: N7I23JE77Z3DRGRSXWMGU5JEYCOMJSTP X-Message-ID-Hash: N7I23JE77Z3DRGRSXWMGU5JEYCOMJSTP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1748246424402116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Refuse to use floppy devices if qemu doesn't support them. Reflect that also in capabilities. Both of the above is achieved by checking for the QEMU_CAPS_BUS_FLOPPY in qemuDomainMachineSupportsFloppy. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 3 +++ tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml | 2 -- tests/domaincapsdata/qemu_10.0.0.aarch64.xml | 2 -- tests/domaincapsdata/qemu_10.0.0.s390x.xml | 2 -- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 2 -- tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 2 -- tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml | 2 -- tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml | 2 -- tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 2 -- tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 2 -- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 2 -- tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml | 2 -- tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml | 2 -- tests/domaincapsdata/qemu_9.1.0.s390x.xml | 2 -- tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml | 2 -- tests/domaincapsdata/qemu_9.2.0.s390x.xml | 2 -- 16 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7a308d488b..cc3ab0a298 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11531,6 +11531,9 @@ bool qemuDomainMachineSupportsFloppy(const char *machine, virQEMUCaps *qemuCaps) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BUS_FLOPPY)) + return false; + /* PowerPC pseries based VMs do not support floppy device */ if (qemuDomainMachineIsPSeries(machine, virQEMUCapsGetArch(qemuCaps))) return false; diff --git a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml b/tests/doma= incapsdata/qemu_10.0.0-virt.aarch64.xml index 17777d2531..8125821c00 100644 --- a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml @@ -100,11 +100,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml b/tests/domaincap= sdata/qemu_10.0.0.aarch64.xml index 17777d2531..8125821c00 100644 --- a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml @@ -100,11 +100,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsd= ata/qemu_10.0.0.s390x.xml index d66240307e..cf154c098b 100644 --- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml @@ -234,11 +234,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsda= ta/qemu_8.1.0.s390x.xml index be8bb70245..0c1fd5ab6e 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -323,11 +323,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tes= ts/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml index 18979cf280..8aeab0bbdb 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml @@ -52,11 +52,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_8.2.0-virt.aarch64.xml index ce17865e24..e5c49e9095 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml @@ -100,11 +100,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/d= omaincapsdata/qemu_8.2.0-virt.loongarch64.xml index 8f4ebbc107..5637efb412 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml @@ -56,11 +56,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincaps= data/qemu_8.2.0.aarch64.xml index ce17865e24..e5c49e9095 100644 --- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml @@ -100,11 +100,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsd= ata/qemu_8.2.0.armv7l.xml index ee653c0c49..2e3514471f 100644 --- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml +++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml @@ -49,11 +49,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_8.2.0.s390x.xml index 78f91736d6..e7834e1982 100644 --- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml @@ -323,11 +323,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml index b236ecbac4..1abc098bc3 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml @@ -62,11 +62,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_9.1.0-virt.riscv64.xml index 1399b980fd..5ff79a9244 100644 --- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml @@ -51,11 +51,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.1.0.s390x.xml index b73e0d0688..c335cb8339 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -186,11 +186,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml b/tests/do= maincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml index b8615a0986..84f9ca786b 100644 --- a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml @@ -99,11 +99,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.2.0.s390x.xml index 605a3af5c7..e12aa5627b 100644 --- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -186,11 +186,9 @@ disk cdrom - floppy lun - fdc scsi virtio usb --=20 2.49.0