1. Patchew
  2. Libvirt
  3. [PATCH 00/18] Grab bag of fixes and improvements
  4. View patch

[PATCH 16/18] tests: Add *-default-devices

Andrea Bolognani posted 18 patches 12 months ago
[PATCH 16/18] tests: Add *-default-devices
Posted by Andrea Bolognani 12 months ago 
This provides coverage for the set of devices that libvirt will
automatically add to any new guest. They can vary quite a lot
depending on the architecture.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 ...arch64-default-devices.aarch64-latest.args | 31 +++++++++++++++++
 .../aarch64-default-devices.xml               | 12 +++++++
 .../ppc64-default-devices.ppc64-latest.args   | 33 +++++++++++++++++++
 .../ppc64-default-devices.xml                 | 12 +++++++
 ...iscv64-default-devices.riscv64-latest.args | 33 +++++++++++++++++++
 .../riscv64-default-devices.xml               | 12 +++++++
 .../s390x-default-devices.s390x-latest.args   | 32 ++++++++++++++++++
 .../s390x-default-devices.xml                 | 12 +++++++
 .../x86_64-default-devices.x86_64-latest.args | 33 +++++++++++++++++++
 .../x86_64-default-devices.xml                | 12 +++++++
 tests/qemuxml2argvtest.c                      |  6 ++++
 ...aarch64-default-devices.aarch64-latest.xml | 26 +++++++++++++++
 .../ppc64-default-devices.ppc64-latest.xml    | 33 +++++++++++++++++++
 ...riscv64-default-devices.riscv64-latest.xml | 33 +++++++++++++++++++
 .../s390x-default-devices.s390x-latest.xml    | 27 +++++++++++++++
 .../x86_64-default-devices.x86_64-latest.xml  | 31 +++++++++++++++++
 tests/qemuxml2xmltest.c                       |  6 ++++
 17 files changed, 384 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args
 create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.xml
 create mode 100644 tests/qemuxml2argvdata/ppc64-default-devices.ppc64-latest.args
 create mode 100644 tests/qemuxml2argvdata/ppc64-default-devices.xml
 create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args
 create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.xml
 create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args
 create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.xml
 create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-devices.ppc64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml

diff --git a/tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args
new file mode 100644
index 0000000000..51a196e03e
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
+-accel tcg \
+-cpu cortex-a15 \
+-m size=4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-default-devices.xml b/tests/qemuxml2argvdata/aarch64-default-devices.xml
new file mode 100644
index 0000000000..5b44c14131
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-default-devices.xml
@@ -0,0 +1,12 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/ppc64-default-devices.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-devices.ppc64-latest.args
new file mode 100644
index 0000000000..69462a5b70
--- /dev/null
+++ b/tests/qemuxml2argvdata/ppc64-default-devices.ppc64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-ppc64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
+-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
+-accel tcg \
+-cpu POWER9 \
+-m size=4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-default-devices.xml b/tests/qemuxml2argvdata/ppc64-default-devices.xml
new file mode 100644
index 0000000000..125e651519
--- /dev/null
+++ b/tests/qemuxml2argvdata/ppc64-default-devices.xml
@@ -0,0 +1,12 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch='ppc64' machine='pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args
new file mode 100644
index 0000000000..fcb80b009e
--- /dev/null
+++ b/tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-riscv64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
+-machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \
+-accel tcg \
+-m size=4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-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"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","addr":"0x0"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-default-devices.xml b/tests/qemuxml2argvdata/riscv64-default-devices.xml
new file mode 100644
index 0000000000..fb67b333c1
--- /dev/null
+++ b/tests/qemuxml2argvdata/riscv64-default-devices.xml
@@ -0,0 +1,12 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch='riscv64' machine='virt'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-riscv64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args b/tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args
new file mode 100644
index 0000000000..84098e580e
--- /dev/null
+++ b/tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=guest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
+-accel tcg \
+-cpu qemu \
+-m size=4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390x-default-devices.xml b/tests/qemuxml2argvdata/s390x-default-devices.xml
new file mode 100644
index 0000000000..3f5202bfdd
--- /dev/null
+++ b/tests/qemuxml2argvdata/s390x-default-devices.xml
@@ -0,0 +1,12 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args
new file mode 100644
index 0000000000..606fd70519
--- /dev/null
+++ b/tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=4194304k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/x86_64-default-devices.xml b/tests/qemuxml2argvdata/x86_64-default-devices.xml
new file mode 100644
index 0000000000..33cebaebd8
--- /dev/null
+++ b/tests/qemuxml2argvdata/x86_64-default-devices.xml
@@ -0,0 +1,12 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory>4194304</memory>
+  <vcpu>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 9bd228e4fa..c5fa5e5fe6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1064,6 +1064,12 @@ mymain(void)
     g_unsetenv("PIPEWIRE_REMOTE");
     g_unsetenv("PIPEWIRE_RUNTIME_DIR");
 
+    DO_TEST_CAPS_LATEST("x86_64-default-devices");
+    DO_TEST_CAPS_ARCH_LATEST("aarch64-default-devices", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("riscv64-default-devices", "riscv64");
+    DO_TEST_CAPS_ARCH_LATEST("ppc64-default-devices", "ppc64");
+    DO_TEST_CAPS_ARCH_LATEST("s390x-default-devices", "s390x");
+
     DO_TEST_CAPS_LATEST("minimal");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("minimal-no-memory");
 
diff --git a/tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml
new file mode 100644
index 0000000000..25b415d390
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml
@@ -0,0 +1,26 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <gic version='2'/>
+  </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>cortex-a15</model>
+  </cpu>
+  <clock offset='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='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-devices.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-devices.ppc64-latest.xml
new file mode 100644
index 0000000000..909f293766
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppc64-default-devices.ppc64-latest.xml
@@ -0,0 +1,33 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='ppc64' machine='pseries'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>POWER9</model>
+  </cpu>
+  <clock offset='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='usb' index='0' model='pci-ohci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
+    </controller>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </memballoon>
+    <panic model='pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml
new file mode 100644
index 0000000000..54363bb426
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml
@@ -0,0 +1,33 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='riscv64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='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='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x9'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml
new file mode 100644
index 0000000000..df8e578212
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml
@@ -0,0 +1,27 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu</model>
+  </cpu>
+  <clock offset='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='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
+    </memballoon>
+    <panic model='s390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml
new file mode 100644
index 0000000000..3fde74460c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='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='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5a635444f8..72ddc66d24 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -197,6 +197,12 @@ mymain(void)
     g_unsetenv("QEMU_AUDIO_DRV");
     g_unsetenv("SDL_AUDIODRIVER");
 
+    DO_TEST_CAPS_LATEST("x86_64-default-devices");
+    DO_TEST_CAPS_ARCH_LATEST("aarch64-default-devices", "aarch64");
+    DO_TEST_CAPS_ARCH_LATEST("riscv64-default-devices", "riscv64");
+    DO_TEST_CAPS_ARCH_LATEST("ppc64-default-devices", "ppc64");
+    DO_TEST_CAPS_ARCH_LATEST("s390x-default-devices", "s390x");
+
     DO_TEST_CAPS_LATEST("minimal");
     DO_TEST_CAPS_LATEST("genid");
     DO_TEST_CAPS_LATEST("genid-auto");
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH 16/18] tests: Add *-default-devices
Posted by Peter Krempa 12 months ago 
On Wed, Jan 17, 2024 at 10:54:49 +0100, Andrea Bolognani wrote:
> This provides coverage for the set of devices that libvirt will
> automatically add to any new guest. They can vary quite a lot
> depending on the architecture.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  ...arch64-default-devices.aarch64-latest.args | 31 +++++++++++++++++
>  .../aarch64-default-devices.xml               | 12 +++++++
>  .../ppc64-default-devices.ppc64-latest.args   | 33 +++++++++++++++++++
>  .../ppc64-default-devices.xml                 | 12 +++++++
>  ...iscv64-default-devices.riscv64-latest.args | 33 +++++++++++++++++++
>  .../riscv64-default-devices.xml               | 12 +++++++
>  .../s390x-default-devices.s390x-latest.args   | 32 ++++++++++++++++++
>  .../s390x-default-devices.xml                 | 12 +++++++
>  .../x86_64-default-devices.x86_64-latest.args | 33 +++++++++++++++++++
>  .../x86_64-default-devices.xml                | 12 +++++++
>  tests/qemuxml2argvtest.c                      |  6 ++++
>  ...aarch64-default-devices.aarch64-latest.xml | 26 +++++++++++++++
>  .../ppc64-default-devices.ppc64-latest.xml    | 33 +++++++++++++++++++
>  ...riscv64-default-devices.riscv64-latest.xml | 33 +++++++++++++++++++
>  .../s390x-default-devices.s390x-latest.xml    | 27 +++++++++++++++
>  .../x86_64-default-devices.x86_64-latest.xml  | 31 +++++++++++++++++
>  tests/qemuxml2xmltest.c                       |  6 ++++
>  17 files changed, 384 insertions(+)
>  create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.xml
>  create mode 100644 tests/qemuxml2argvdata/ppc64-default-devices.ppc64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/ppc64-default-devices.xml
>  create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.xml
>  create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args
>  create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.xml
>  create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.xml
>  create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-devices.ppc64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml

[...]

> diff --git a/tests/qemuxml2argvdata/x86_64-default-devices.xml b/tests/qemuxml2argvdata/x86_64-default-devices.xml
> new file mode 100644
> index 0000000000..33cebaebd8
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/x86_64-default-devices.xml
> @@ -0,0 +1,12 @@
> +<domain type='qemu'>
> +  <name>guest</name>
> +  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
> +  <memory>4194304</memory>
> +  <vcpu>4</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='pc'>hvm</type>

IMO it would make sense to have one for q35 too.

> +  </os>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-x86_64</emulator>
> +  </devices>
> +</domain>

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.