From nobody Mon Feb 9 03:14:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1641462305; cv=none; d=zohomail.com; s=zohoarc; b=JCDv+ZFjCUaDcfmzI5cw5E92d1n5qTUCnFj58p2/IAgh4UZ6tqfHaF4u9wU/LEsXKsUe3Z5RUgwVkM0U9Ue4J2R7xNKO1gDc+LjVk067vSHnihUqUKhGSaa1FRilyliZ3oHQpx0XkKDMtka3VmK6Q7Dk+/OqG7iwFPOcdZ4M0cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462305; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r+8Zwqw+jcXwuYJB2Pi9/vhc/Unf7CpHybpuLFtZ8Tw=; b=oE9YNrMX3i9tlwJS9N1bE+r+bf6RuyO6meNc//YwYC4GwOevg/ubZvXggTjN8gf7GkvB+HH1viX1KhbtDF3ZTfWvsq7a4EsEwgvadTs7yM6iABfdbIopyGZJqvMQpWt6FzNxgTBGzgcvGoX7yRTmJnCJePnEldZsJ3yRnZub7cs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16414623059704.929686413048671; Thu, 6 Jan 2022 01:45:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-YPKPnOY4NZm6FfIzdG0Pbg-1; Thu, 06 Jan 2022 04:44:59 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF2AA81CCB5; Thu, 6 Jan 2022 09:44:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2A4B749BB; Thu, 6 Jan 2022 09:44:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A18714BB7C; Thu, 6 Jan 2022 09:44:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069in16005395 for ; Thu, 6 Jan 2022 04:44:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 023637CAD2; Thu, 6 Jan 2022 09:44:49 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64DC57D48F for ; Thu, 6 Jan 2022 09:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462303; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=r+8Zwqw+jcXwuYJB2Pi9/vhc/Unf7CpHybpuLFtZ8Tw=; b=Cm9gjOHT0GP/Yfp0vK8MgNEobA4odlZT/vVmmo9xuZbl1Jz3X0zp5jVIG4SlCz2/kZcqQC ee72EMNZ1r0RgR/F8P8Dwa2dKq6FJB1uKgEEOm6pyI3n1iHhsr6rKs8vhMq0wRJ9GupCd/ uIGNnFCjJXZ0JLsuFcLQiNgsERLjugw= X-MC-Unique: YPKPnOY4NZm6FfIzdG0Pbg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/21] qemuxml2argvtest: Remove redundant floppy controller tests Date: Thu, 6 Jan 2022 10:44:02 +0100 Message-Id: <94b598380c047eff2b1972a161539430d4eb65c0.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1641463208837100001 Content-Type: text/plain; charset="utf-8" The two test cases were added to avoid regressions such as fixed in 17dff3584855e9. Nowadays the code is much simpler and any Q35 machine will trigger the explicit FDC. Remove the '2.11' machine type version and turn the '2.9' version into a generic q35 machine. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemusecuritytest.c | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 42 ------------------- .../qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ----------------- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 36 ---------------- ...rgs =3D> disk-floppy-q35.x86_64-2.12.0.args} | 2 +- ...rgs =3D> disk-floppy-q35.x86_64-latest.args} | 2 +- ...floppy-q35-2_9.xml =3D> disk-floppy-q35.xml} | 2 +- tests/qemuxml2argvtest.c | 6 +-- 8 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-late= st.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.= 0.args rename tests/qemuxml2argvdata/{disk-floppy-q35-2_11.x86_64-2.12.0.args =3D= > disk-floppy-q35.x86_64-2.12.0.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.x86_64-latest.args =3D>= disk-floppy-q35.x86_64-latest.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.xml =3D> disk-floppy-q3= 5.xml} (95%) diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index a7e87fdf8f..924c625a4c 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -213,8 +213,7 @@ mymain(void) DO_TEST_DOMAIN("disk-detect-zeroes"); DO_TEST_DOMAIN("disk-error-policy"); DO_TEST_DOMAIN("disk-floppy"); - DO_TEST_DOMAIN("disk-floppy-q35-2_11"); - DO_TEST_DOMAIN("disk-floppy-q35-2_9"); + DO_TEST_DOMAIN("disk-floppy-q35"); DO_TEST_DOMAIN("disk-network-gluster"); DO_TEST_DOMAIN("disk-network-iscsi"); DO_TEST_DOMAIN("disk-network-nbd"); diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args deleted file mode 100644 index 88144f5f98..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ /dev/null @@ -1,42 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-2.11,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am \ --accel tcg \ --cpu qemu64 \ --m 214 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"isa-fdc","bootindexA":1}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml b/tests/qemuxm= l2argvdata/disk-floppy-q35-2_11.xml deleted file mode 100644 index 6f51691a5c..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml +++ /dev/null @@ -1,38 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - - -
- - -
- - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args = b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args deleted file mode 100644 index 528214e73f..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.9,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --drive file=3D/tmp/data.img,format=3Dqcow2,if=3Dnone,id=3Ddrive-fdc0-0-1 \ --device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1,driveB=3Ddrive-fdc0= -0-1 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args index 055661b75b..efd76d6436 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.11,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-2.12,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args similarity index 96% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args index c04f0e2a2f..810cc0796d 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc-q35-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml b/tests/qemuxml= 2argvdata/disk-floppy-q35.xml similarity index 95% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml rename to tests/qemuxml2argvdata/disk-floppy-q35.xml index 5301759279..6fef3bf8f9 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml +++ b/tests/qemuxml2argvdata/disk-floppy-q35.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c67b36d5c..658084ad0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1380,10 +1380,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35-2_9", "2.12.0"); - DO_TEST_CAPS_LATEST("disk-floppy-q35-2_9"); - DO_TEST_CAPS_VER("disk-floppy-q35-2_11", "2.12.0"); - DO_TEST_CAPS_LATEST("disk-floppy-q35-2_11"); + DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); DO_TEST_CAPS_LATEST("disk-virtio"); --=20 2.31.1