From nobody Wed Jan 15 13:33:43 2025 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 1705488152991512.5677722264347; Wed, 17 Jan 2024 02:42:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9583F1E51; Wed, 17 Jan 2024 05:42:31 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0E62C1ECA; Wed, 17 Jan 2024 04:57:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 601591E49; Wed, 17 Jan 2024 04:55:24 -0500 (EST) 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 E484F1C5B for ; Wed, 17 Jan 2024 04:55:04 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-eNmX0eWcMkO-FP8Bjca3oQ-1; Wed, 17 Jan 2024 04:54:58 -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 B8DA1380606D for ; Wed, 17 Jan 2024 09:54:57 +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 2F31040C6EB9 for ; Wed, 17 Jan 2024 09:54:57 +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_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: eNmX0eWcMkO-FP8Bjca3oQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 06/18] tests: Drop various redundant tests Date: Wed, 17 Jan 2024 10:54:39 +0100 Message-ID: <20240117095451.788816-7-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: Z5BZTK723JHGP5EYO5AYPT2SL6HT5Y4G X-Message-ID-Hash: Z5BZTK723JHGP5EYO5AYPT2SL6HT5Y4G 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: 1705488153369100001 All of these are either a subset of other tests, or provide coverage for scenarios that are not really possible: for all versions of QEMU that we support, the virt machine type has a hard dependency on the generic PCIe controller, which means that we will never need to fall back to virtio-mmio. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 46 --------------- .../aarch64-aavmf-virtio-mmio.xml | 49 ---------------- ...rch64-virt-virtio-MMIO.aarch64.latest.args | 48 ---------------- .../arm-virt-virtio.aarch64-latest.args | 54 ------------------ tests/qemuxml2argvdata/arm-virt-virtio.xml | 45 --------------- .../riscv64-virt-pci.riscv64-latest.args | 35 ------------ tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 -------- .../riscv64-virt.riscv64-latest.args | 38 ------------- tests/qemuxml2argvdata/riscv64-virt.xml | 19 ------- tests/qemuxml2argvtest.c | 18 ------ ...rch64-aavmf-virtio-mmio.aarch64-latest.xml | 56 ------------------- tests/qemuxml2xmltest.c | 4 -- 12 files changed, 436 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch6= 4-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64= .latest.args delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.a= rgs delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.= args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarc= h64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-lates= t.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.ar= gs deleted file mode 100644 index 5569ff3b57..0000000000 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args +++ /dev/null @@ -1,46 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Daarch64test,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,acpi=3Doff \ --accel tcg \ --cpu cortex-a53 \ --m size=3D1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ --dtb /aarch64.dtb \ --device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","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=3Dcharconsole0 \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --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-aavmf-virtio-mmio.xml b/tests/q= emuxml2argvdata/aarch64-aavmf-virtio-mmio.xml deleted file mode 100644 index 5d7217307b..0000000000 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml +++ /dev/null @@ -1,49 +0,0 @@ - - aarch64test - 496d7ea8-9739-544b-4ebd-ef08be936e8b - 1048576 - 1048576 - 1 - - hvm - /aarch64.kernel - /aarch64.initrd - earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - /aarch64.dtb - - - - - - - - - cortex-a53 - - - destroy - restart - restart - - /usr/bin/qemu-system-aarch64 - - - -
- - - - - - - - - - -
- - - /dev/random - - - diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest= .args b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args deleted file mode 100644 index 68eccb441d..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args +++ /dev/null @@ -1,48 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Daarch64test,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,acpi=3Doff \ --accel tcg \ --cpu cortex-a53 \ --m size=3D1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ --dtb /aarch64.dtb \ --device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","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 pty,id=3Dcharconsole1 \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --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/arm-virt-virtio.aarch64-latest.args b/t= ests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args deleted file mode 100644 index b2266bc9bc..0000000000 --- a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args +++ /dev/null @@ -1,54 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-armtest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Darmtest,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,acpi=3Don \ --accel tcg \ --cpu cortex-a15 \ --m size=3D1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ --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 \ --kernel /arm.kernel \ --initrd /arm.initrd \ --append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ --dtb /arm.dtb \ --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":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2"= ,"addr":"0x0"}' \ --blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ --chardev pty,id=3Dcharserial0 \ --serial chardev:charserial0 \ --chardev pty,id=3Dcharconsole1 \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .5","addr":"0x0"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.xml b/tests/qemuxml2arg= vdata/arm-virt-virtio.xml deleted file mode 100644 index 39620070bd..0000000000 --- a/tests/qemuxml2argvdata/arm-virt-virtio.xml +++ /dev/null @@ -1,45 +0,0 @@ - - armtest - 496d7ea8-9739-544b-4ebd-ef08be936e6a - 1048576 - 1048576 - 1 - - hvm - /arm.kernel - /arm.initrd - /arm.dtb - console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physma= p.enabled=3D0 - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-aarch64 - - - - - - - - - - - - - - - - /dev/random - - - diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args b/= tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args deleted file mode 100644 index ff52cba889..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.config \ -/usr/bin/qemu-system-riscv64 \ --name guest=3Driscv64,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ --machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ --accel tcg \ --m size=3D2097152k \ --object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ --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 \ --kernel /var/lib/libvirt/images/riscv64.bbl \ --append root=3D/dev/vda \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.qc= ow2","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-pci","bus":"pcie.0","addr":"0x1","drive":"l= ibvirt-1-format","id":"virtio-disk0","bootindex":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/riscv64-virt-pci.xml b/tests/qemuxml2ar= gvdata/riscv64-virt-pci.xml deleted file mode 100644 index c72cd58086..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.xml +++ /dev/null @@ -1,24 +0,0 @@ - - riscv64 - fd65fc03-8838-4c4d-9d8d-395802488790 - 2097152 - 1 - - hvm - /var/lib/libvirt/images/riscv64.bbl - root=3D/dev/vda - - - /usr/bin/qemu-system-riscv64 - - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args b/test= s/qemuxml2argvdata/riscv64-virt.riscv64-latest.args deleted file mode 100644 index b3a34272fe..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64/.config \ -/usr/bin/qemu-system-riscv64 \ --name guest=3Driscv64,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ --machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ --accel tcg \ --m size=3D2097152k \ --object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ --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 \ --kernel /var/lib/libvirt/images/bbl \ --append 'console=3DttyS0 ro root=3D/dev/vda' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-dis= k.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0","bootindex":1}' \ --chardev pty,id=3Dcharserial0 \ --serial chardev:charserial0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt.xml b/tests/qemuxml2argvda= ta/riscv64-virt.xml deleted file mode 100644 index 3a672bdea5..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt.xml +++ /dev/null @@ -1,19 +0,0 @@ - - riscv64 - fd65fc03-8838-4c4d-9d8d-395802488790 - 2097152 - 1 - - hvm - /var/lib/libvirt/images/bbl - console=3DttyS0 ro root=3D/dev/vda - - - /usr/bin/qemu-system-riscv64 - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1bc3985aca..fd89dbe649 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2254,16 +2254,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("arm-virt-virtio", "aarch64"); - - /* test default config if pcie bus is not available */ - DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest", - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3= 420, - QEMU_CAPS_LAST, ARG_END); =20 DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64"); @@ -2273,7 +2263,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch= 64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE); @@ -2526,13 +2515,6 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly"); =20 - /* The generic pcie bridge emulation device can be compiled out of qem= u. */ - DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64", - ARG_QEMU_CAPS_DEL, - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_LAST); - DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64"); - DO_TEST_CAPS_LATEST("virtio-transitional"); DO_TEST_CAPS_LATEST("virtio-non-transitional"); DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported"); diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-lat= est.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest= .xml deleted file mode 100644 index 634d8ee683..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml +++ /dev/null @@ -1,56 +0,0 @@ - - aarch64test - 496d7ea8-9739-544b-4ebd-ef08be936e8b - 1048576 - 1048576 - 1 - - hvm - /aarch64.kernel - /aarch64.initrd - earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - /aarch64.dtb - - - - - - - - - cortex-a53 - - - destroy - restart - restart - - /usr/bin/qemu-system-aarch64 - - - - -
- - -
- - - - - -
- - - - -