tests: Use collie instead of borzoi for aarch64 tests

The borzoi machine type was dropped in QEMU 9.2.0, so let's
use a different machine type with no ACPI support and no
implicit USB controller instead.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
index 5f379d56ce41bd9a3c193c23550ddeeb9ea60a2f..d10bbb1b3e0555dca983b6c2728bcb7d2b970bf9 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
+++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
@@ -1 +1 @@
-unsupported configuration: machine type 'borzoi' does not support ACPI
+unsupported configuration: machine type 'collie' does not support ACPI

diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
index 10dbeabd6d529bea64930af58fa1dbad64407fad..7b5528d612b6aec736ae9cb497f0fbe4d9a0aab0 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
+++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
@@ -5,7 +5,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <!-- machine type doesn't matter as long as it has no ACPI -->
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
   </os>
   <features>
     <acpi/>

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
index a3d0f7a4fcf59690485103c45cb286f38041abbe..9a1c6fd27671784932bd648e1d536fc39f795c13 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
@@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine borzoi,usb=off,dump-guest-core=off \
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
index 9bf4af4f74331130292182b4b5fed076603edda2..e3f04fbbff4a0beacee83fd6a34093f148b95e17 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
index a3d0f7a4fcf59690485103c45cb286f38041abbe..9a1c6fd27671784932bd648e1d536fc39f795c13 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
@@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine borzoi,usb=off,dump-guest-core=off \
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
index 9bf4af4f74331130292182b4b5fed076603edda2..e3f04fbbff4a0beacee83fd6a34093f148b95e17 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
index 64cd74e3657425dc1daeb6f2fb8b51c377d3ca01..6505122cb8d5195b696209f3518254eb4fd5a2de 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
@@ -5,7 +5,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <!-- machine type doesn't matter as long as it has no implicit USB -->
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
   </os>
   <cpu mode='host-passthrough'/>
   <devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
index 6cfa04a0f49eb15aa2df513dbeeb46582ea222d1..0fb2909dd248946d1de78c17da71429a3651b2e3 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.args
@@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine borzoi,usb=off,dump-guest-core=off \
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
index 2f71d294a7a63816f704742a73f52fc442d3461a..a01dd15168c2c8650d10b2b80ba9410cc42f4f34 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
index 6cfa04a0f49eb15aa2df513dbeeb46582ea222d1..0fb2909dd248946d1de78c17da71429a3651b2e3 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args
@@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine borzoi,usb=off,dump-guest-core=off \
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \

diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
index 2f71d294a7a63816f704742a73f52fc442d3461a..a01dd15168c2c8650d10b2b80ba9410cc42f4f34 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
index c8bd07ad5d0c4e39b777bcdaef47a1890f4eaa6e..83a405800fbe23af318320d23edaa791fea1b971 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
@@ -5,7 +5,7 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <!-- machine type doesn't matter as long as it has no implicit USB -->
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
   </os>
   <cpu mode='host-passthrough'/>
   <devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
index 6cfa04a0f49eb15aa2df513dbeeb46582ea222d1..0fb2909dd248946d1de78c17da71429a3651b2e3 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.args
@@ -10,10 +10,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine borzoi,usb=off,dump-guest-core=off \
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
index 2f71d294a7a63816f704742a73f52fc442d3461a..a01dd15168c2c8650d10b2b80ba9410cc42f4f34 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='borzoi'>hvm</type>
+    <type arch='aarch64' machine='collie'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index be2fba9e4dd24ffbe9e27d52f2c4bb032632bddb..1f31ec810c7a34a375ede121d56828b3c1f42804 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1764,7 +1764,7 @@ mymain(void)
      *     - firmware-manual-efi-acpi-aarch64
      *     - firmware-auto-efi-loongarch64
      *
-     *  - negative case for aarch64 with 'borzoi' machine not supporting ACPI
+     *  - negative case for aarch64 with 'collie' machine not supporting ACPI
      *
      *  - s390x has hack to strip ACPI to preserve migration of old configs,
      *    but should produce error when ABI_UPDATE is requested