From nobody Tue Feb 10 16:27:12 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705486494199854.9354699660515; Wed, 17 Jan 2024 02:14:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1E1531DAD; Wed, 17 Jan 2024 05:14:53 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A08A81E62; Wed, 17 Jan 2024 04:56:08 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BC0251D5B; Wed, 17 Jan 2024 04:55:04 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 BC0461C5A for ; Wed, 17 Jan 2024 04:54:59 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-zilhVI5_Ni-wOgzdIck6ZQ-1; Wed, 17 Jan 2024 04:54:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id E205610259AC for ; Wed, 17 Jan 2024 09:54:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 790D840C6EB9 for ; Wed, 17 Jan 2024 09:54:56 +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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: zilhVI5_Ni-wOgzdIck6ZQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 05/18] tests: Add {aarch64,riscv64}-virt-headless-mmio Date: Wed, 17 Jan 2024 10:54:38 +0100 Message-ID: <20240117095451.788816-6-abologna@redhat.com> In-Reply-To: <20240117095451.788816-1-abologna@redhat.com> References: <20240117095451.788816-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: QAABEJH7355SOFGWF7ZBLXK4MCAQXF6H X-Message-ID-Hash: QAABEJH7355SOFGWF7ZBLXK4MCAQXF6H X-MailFrom: abologna@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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705486496194100001 Even though virtio-mmio is no longer the default on either architecture, and likely nobody is using it at this point, we still provide a way to opt into virtio-mmio usage and want to keep existing guests working. Add explicit test suite coverage for this scenario. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- ...h64-virt-headless-mmio.aarch64-latest.args | 48 +++++++++++++ .../aarch64-virt-headless-mmio.xml | 48 +++++++++++++ ...v64-virt-headless-mmio.riscv64-latest.args | 43 +++++++++++ .../riscv64-virt-headless-mmio.xml | 43 +++++++++++ tests/qemuxml2argvtest.c | 2 + ...ch64-virt-headless-mmio.aarch64-latest.xml | 71 +++++++++++++++++++ ...cv64-virt-headless-mmio.riscv64-latest.xml | 58 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 8 files changed, 315 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch= 64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv= 64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aar= ch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.ris= cv64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-late= st.args b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.= args new file mode 100644 index 0000000000..f546cf33c7 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -0,0 +1,48 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-s= ilent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":tr= ue,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-nam= e":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format,acpi=3Don \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-boot strict=3Don \ +-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-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":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml b/tests/= qemuxml2argvdata/aarch64-virt-headless-mmio.xml new file mode 100644 index 0000000000..4f2519bb1f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml @@ -0,0 +1,48 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + + + + + + 4194304 + 4194304 + 4 + + hvm + /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw + /path/to/guest_VARS.raw + + + + + + + + /usr/bin/qemu-system-aarch64 + + + + +
+ + + + +
+ + + + + + + +
+ + + /dev/urandom +
+ + + diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-late= st.args b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.= args new file mode 100644 index 0000000000..bf7ce2cf9e --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args @@ -0,0 +1,43 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ +-accel tcg \ +-m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":4294967296}' \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-boot strict=3Don \ +-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-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":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml b/tests/= qemuxml2argvdata/riscv64-virt-headless-mmio.xml new file mode 100644 index 0000000000..bcba73e9f1 --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml @@ -0,0 +1,43 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + + + + + + 4194304 + 4194304 + 4 + + hvm + + + + + /usr/bin/qemu-system-riscv64 + + + + +
+ + + + +
+ + + + + + + +
+ + + /dev/urandom +
+ + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0987f4c78f..1bc3985aca 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2539,8 +2539,10 @@ mymain(void) =20 /* Simple headless guests for various architectures */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-headless", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless-mmio", "riscv64"); DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-headless", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-headless", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-headless", "x86_64"); diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-la= test.xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-late= st.xml new file mode 100644 index 0000000000..1b2d6e70bd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml @@ -0,0 +1,71 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + + + + + + 4194304 + 4194304 + 4 + + hvm + + + + + /usr/share/edk2/aarch64/QEMU_= EFI-silent-pflash.raw + /= path/to/guest_VARS.raw + + + + + + + + cortex-a15 + + + destroy + restart + destroy + + /usr/bin/qemu-system-aarch64 + + + + +
+ + + +
+ + + + +
+ + + + + + + + + + + +
+ +