From nobody Fri Mar 14 06:09:50 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: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1706128101682237.76555211144637;
 Wed, 24 Jan 2024 12:28:21 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 279181AF4; Wed, 24 Jan 2024 15:28:20 -0500 (EST)
Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id DAEFF19DB;
	Wed, 24 Jan 2024 14:41:41 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 8B6FD19F6; Wed, 24 Jan 2024 14:38:26 -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 9D45818E2
	for <devel@lists.libvirt.org>; Wed, 24 Jan 2024 14:38: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-642-JQWNMguPOqm-lIoEZiO8iw-1; Wed,
 24 Jan 2024 14:38:02 -0500
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
	(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 4B4833C02B69
	for <devel@lists.libvirt.org>; Wed, 24 Jan 2024 19:38:02 +0000 (UTC)
Received: from harajuku.usersys.redhat.com (unknown [10.45.226.130])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A8129492BC6
	for <devel@lists.libvirt.org>; Wed, 24 Jan 2024 19:38:01 +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: JQWNMguPOqm-lIoEZiO8iw-1
From: Andrea Bolognani <abologna@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 08/33] tests: Add default-models cases for many architectures
Date: Wed, 24 Jan 2024 20:37:28 +0100
Message-ID: <20240124193753.1265454-9-abologna@redhat.com>
In-Reply-To: <20240124193753.1265454-1-abologna@redhat.com>
References: <20240124193753.1265454-1-abologna@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: GK5N2ZE256XPA27QKDMUHBICSIVWQ7IW
X-Message-ID-Hash: GK5N2ZE256XPA27QKDMUHBICSIVWQ7IW
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
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/GK5N2ZE256XPA27QKDMUHBICSIVWQ7IW/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1706128102280100001

These are similar to the minimal cases that we just introduced,
but are intended to demonstrate what device or controller model
libvirt will choose when one is not provided by the user.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 ...64-virt-default-models.aarch64-latest.args | 44 +++++++++++
 ...h64-virt-default-models.aarch64-latest.xml | 79 +++++++++++++++++++
 .../aarch64-virt-default-models.xml           | 21 +++++
 ...4-pseries-default-models.ppc64-latest.args | 38 +++++++++
 ...64-pseries-default-models.ppc64-latest.xml | 53 +++++++++++++
 .../ppc64-pseries-default-models.xml          | 21 +++++
 ...64-virt-default-models.riscv64-latest.args | 42 ++++++++++
 ...v64-virt-default-models.riscv64-latest.xml | 68 ++++++++++++++++
 .../riscv64-virt-default-models.xml           | 21 +++++
 ...s390x-ccw-default-models.s390x-latest.args | 37 +++++++++
 .../s390x-ccw-default-models.s390x-latest.xml | 46 +++++++++++
 .../s390x-ccw-default-models.xml              | 21 +++++
 ...86_64-pc-default-models.x86_64-latest.args | 39 +++++++++
 ...x86_64-pc-default-models.x86_64-latest.xml | 50 ++++++++++++
 .../x86_64-pc-default-models.xml              | 21 +++++
 ...6_64-q35-default-models.x86_64-latest.args | 44 +++++++++++
 ...86_64-q35-default-models.x86_64-latest.xml | 68 ++++++++++++++++
 .../x86_64-q35-default-models.xml             | 21 +++++
 tests/qemuxmlconftest.c                       |  7 ++
 19 files changed, 741 insertions(+)
 create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.aarch=
64-latest.args
 create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.aarch=
64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.xml
 create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc6=
4-latest.args
 create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc6=
4-latest.xml
 create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.xml
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.riscv=
64-latest.args
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.riscv=
64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.xml
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-la=
test.args
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-la=
test.xml
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-l=
atest.args
 create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-=
latest.args
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-=
latest.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.xml

diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-late=
st.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.=
args
new file mode 100644
index 0000000000..0c4acf800f
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args
@@ -0,0 +1,44 @@
+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"}' \
+-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe=
nd=3Dmach-virt.ram,acpi=3Doff \
+-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":"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-pci-bridge","id":"pci.4","bus":"pci.1","addr":"0x=
0"}' \
+-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu=
s":"pcie.0","addr":"0x1.0x3"}' \
+-device '{"driver":"pcie-root-port","port":12,"chassis":6,"id":"pci.6","bu=
s":"pcie.0","addr":"0x1.0x4"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \
+-device '{"driver":"lsi","id":"scsi0","bus":"pci.4","addr":"0x1"}' \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":=
"52:54:00:09:a4:37","bus":"pci.2","addr":"0x0"}' \
+-chardev pty,id=3Dcharserial0 \
+-serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p=
ci.5","addr":"0x0"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-late=
st.xml b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.x=
ml
new file mode 100644
index 0000000000..87be062c89
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml
@@ -0,0 +1,79 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>cortex-a15</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-to-pci-bridge'>
+      <model name=3D'pcie-pci-bridge'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.xml b/tests/=
qemuxmlconfdata/aarch64-virt-default-models.xml
new file mode 100644
index 0000000000..cf7f330c0b
--- /dev/null
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <!-- No default model for <panic/> on aarch64 -->
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-lates=
t.args b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.ar=
gs
new file mode 100644
index 0000000000..1395f19bfe
--- /dev/null
+++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args
@@ -0,0 +1,38 @@
+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-ppc64 \
+-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 pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap=
r.ram \
+-accel tcg \
+-cpu POWER9 \
+-m size=3D4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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":"qemu-xhci","id":"usb","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"spapr-vscsi","id":"scsi0","reg":8192}' \
+-netdev user,id=3Dhostnet0 \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:=
00:09:a4:37","bus":"pci.0","addr":"0x1"}' \
+-chardev pty,id=3Dcharserial0 \
+-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"=
:"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-lates=
t.xml b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.xml
new file mode 100644
index 0000000000..2304c6f786
--- /dev/null
+++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.xml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00002000'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'vga' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.xml b/tests=
/qemuxmlconfdata/ppc64-pseries-default-models.xml
new file mode 100644
index 0000000000..4c2d16f01a
--- /dev/null
+++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <panic/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late=
st.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.=
args
new file mode 100644
index 0000000000..28b56d876c
--- /dev/null
+++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args
@@ -0,0 +1,42 @@
+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":"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-pci-bridge","id":"pci.3","bus":"pci.1","addr":"0x=
0"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu=
s":"pcie.0","addr":"0x1.0x3"}' \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.3","addr":"0x1"}=
' \
+-device '{"driver":"lsi","id":"scsi0","bus":"pci.3","addr":"0x2"}' \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":=
"52:54:00:09:a4:37","bus":"pci.2","addr":"0x0"}' \
+-chardev pty,id=3Dcharserial0 \
+-serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.4=
","addr":"0x0"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late=
st.xml b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.x=
ml
new file mode 100644
index 0000000000..942bd21f9e
--- /dev/null
+++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.xml
@@ -0,0 +1,68 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'riscv64' machine=3D'virt'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-riscv64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-to-pci-bridge'>
+      <model name=3D'pcie-pci-bridge'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'16550a'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.xml b/tests/=
qemuxmlconfdata/riscv64-virt-default-models.xml
new file mode 100644
index 0000000000..d421b080a8
--- /dev/null
+++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D'riscv64' machine=3D'virt'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-riscv64</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <!-- No default model for <panic/> on riscv64 -->
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.ar=
gs b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args
new file mode 100644
index 0000000000..4c27502208
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args
@@ -0,0 +1,37 @@
+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-s390x \
+-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 s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D=
s390.ram \
+-accel tcg \
+-cpu qemu \
+-m size=3D4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":429496729=
6}' \
+-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-scsi-ccw","id":"scsi0","devno":"fe.0.0002"}' \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":=
"52:54:00:09:a4:37","devno":"fe.0.0000"}' \
+-chardev pty,id=3Dcharserial0 \
+-device '{"driver":"sclpconsole","chardev":"charserial0","id":"serial0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":=
"fe.0.0001"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.xm=
l b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.xml
new file mode 100644
index 0000000000..9e0af389a9
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'sclp-serial' port=3D'0'>
+        <model name=3D'sclpconsole'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </video>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.xml b/tests/qem=
uxmlconfdata/s390x-ccw-default-models.xml
new file mode 100644
index 0000000000..a196129628
--- /dev/null
+++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <panic/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.a=
rgs b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args
new file mode 100644
index 0000000000..3220a40959
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args
@@ -0,0 +1,39 @@
+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-x86_64 \
+-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 pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m size=3D4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":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":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x4"}' \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:=
00:09:a4:37","bus":"pci.0","addr":"0x3"}' \
+-chardev pty,id=3Dcharserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in=
dex":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'=
 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-device '{"driver":"pvpanic"}' \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.x=
ml b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.xml
new file mode 100644
index 0000000000..dc563fdaf9
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+    <panic model=3D'isa'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.xml b/tests/qem=
uxmlconfdata/x86_64-pc-default-models.xml
new file mode 100644
index 0000000000..6727d2f6a0
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <panic/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.=
args b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args
new file mode 100644
index 0000000000..b9905c6446
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args
@@ -0,0 +1,44 @@
+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-x86_64 \
+-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 q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m size=3D4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":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":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu=
s":"pcie.0","multifunction":true,"addr":"0x2"}' \
+-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x=
0"}' \
+-device '{"driver":"pcie-root-port","port":17,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x2.0x1"}' \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.2","addr":"0x2"}=
' \
+-device '{"driver":"lsi","id":"scsi0","bus":"pci.2","addr":"0x3"}' \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:=
00:09:a4:37","bus":"pci.2","addr":"0x1"}' \
+-chardev pty,id=3Dcharserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in=
dex":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pcie.0","addr":"0x1"}=
' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-device '{"driver":"pvpanic"}' \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.=
xml b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.xml
new file mode 100644
index 0000000000..782fe39491
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.xml
@@ -0,0 +1,68 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-to-pci-bridge'>
+      <model name=3D'pcie-pci-bridge'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'isa'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.xml b/tests/qe=
muxmlconfdata/x86_64-q35-default-models.xml
new file mode 100644
index 0000000000..5cdf07f9d3
--- /dev/null
+++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.xml
@@ -0,0 +1,21 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb'/>
+    <controller type=3D'scsi'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+    </interface>
+    <serial type=3D'pty'/>
+    <video/>
+    <memballoon model=3D'none'/>
+    <panic/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 445e6ff5e1..ce8f0d1964 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1233,6 +1233,13 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-pseries-minimal", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("s390x-ccw-minimal", "s390x");
=20
+    DO_TEST_CAPS_LATEST_ABI_UPDATE("x86_64-pc-default-models");
+    DO_TEST_CAPS_LATEST_ABI_UPDATE("x86_64-q35-default-models");
+    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("aarch64-virt-default-models", "aa=
rch64");
+    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("riscv64-virt-default-models", "ri=
scv64");
+    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-pseries-default-models", "p=
pc64");
+    DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("s390x-ccw-default-models", "s390x=
");
+
     DO_TEST_CAPS_LATEST_PARSE_ERROR("no-memory");
     DO_TEST_CAPS_LATEST("title-and-description");
=20
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org