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@xxxxxxxxxx>
---
tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err | 2 +-
tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml | 2 +-
.../aarch64-nousb-minimal.aarch64-latest.abi-update.args | 3 ++-
.../aarch64-nousb-minimal.aarch64-latest.abi-update.xml | 2 +-
.../qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args | 3 ++-
tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml | 2 +-
tests/qemuxmlconfdata/aarch64-nousb-minimal.xml | 2 +-
.../usb-controller-default-fallback-nousb.aarch64-latest.args | 3 ++-
.../usb-controller-default-fallback-nousb.aarch64-latest.xml | 2 +-
.../usb-controller-default-nousb.aarch64-latest.args | 3 ++-
.../usb-controller-default-nousb.aarch64-latest.xml | 2 +-
tests/qemuxmlconfdata/usb-controller-default-nousb.xml | 2 +-
...sb-controller-default-unavailable-nousb.aarch64-latest.args | 3 ++-
...usb-controller-default-unavailable-nousb.aarch64-latest.xml | 2 +-
tests/qemuxmlconftest.c | 2 +-
15 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
index 5f379d56ce..d10bbb1b3e 100644
--- 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 10dbeabd6d..7b5528d612 100644
--- 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 a3d0f7a4fc..9a1c6fd276 100644
--- 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 9bf4af4f74..e3f04fbbff 100644
--- 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 a3d0f7a4fc..9a1c6fd276 100644
--- 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 9bf4af4f74..e3f04fbbff 100644
--- 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 64cd74e365..6505122cb8 100644
--- 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 6cfa04a0f4..0fb2909dd2 100644
--- 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 2f71d294a7..a01dd15168 100644
--- 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 6cfa04a0f4..0fb2909dd2 100644
--- 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 2f71d294a7..a01dd15168 100644
--- 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 c8bd07ad5d..83a405800f 100644
--- 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 6cfa04a0f4..0fb2909dd2 100644
--- 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 2f71d294a7..a01dd15168 100644
--- 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 8632434760..c18a7fa911 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1765,7 +1765,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
--
2.48.1
