From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 4 Jan 2022 15:36:46 +0000 (+0100)
Subject: qemuxml2argvdata: Use proper arch and emulator for aarch64 real capability tests
X-Git-Tag: v8.0.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4e33ffde38f4e8061eec2098e4fdf046b9a25e;p=thirdparty%2Flibvirt.git

qemuxml2argvdata: Use proper arch and emulator for aarch64 real capability tests

Upcoming patches will modify how we populate the capability cache in
tests to be more sane. This also means that the emulator binary and
architecture used in the test files using real capabilities must match
what the real capabilities have.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
index afce523c1b..8049306445 100644
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
+-no-acpi \
 -boot strict=on \
 -kernel /arm.kernel \
 -initrd /arm.initrd \
diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
index 3acd6491e4..c51be77654 100644
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-/usr/bin/qemu-system-arm \
+/usr/bin/qemu-system-aarch64 \
 -name guest=armtest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-armtest/master-key.aes"}' \
@@ -25,6 +25,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
+-no-acpi \
 -boot strict=on \
 -kernel /arm.kernel \
 -initrd /arm.initrd \
diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml b/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml
index 0a6482fd4a..45a2192d48 100644
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml
@@ -5,14 +5,13 @@
   <currentMemory>1048576</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="armv7l" machine="vexpress-a9">hvm</type>
+    <type arch="aarch64" machine="vexpress-a9">hvm</type>
     <kernel>/arm.kernel</kernel>
     <initrd>/arm.initrd</initrd>
     <dtb>/arm.dtb</dtb>
     <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline>
   </os>
   <features>
-    <acpi/>
     <apic/>
     <pae/>
   </features>
@@ -21,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/arm-sd.qcow2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
index 7b07c8d3d7..962dc8f367 100644
--- a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='armv7l' machine='vexpress-a9'>hvm</type>
+    <type arch='aarch64' machine='vexpress-a9'>hvm</type>
     <kernel>/arm.kernel</kernel>
     <initrd>/arm.initrd</initrd>
     <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline>
@@ -13,7 +13,6 @@
     <boot dev='hd'/>
   </os>
   <features>
-    <acpi/>
     <apic/>
     <pae/>
   </features>
@@ -25,7 +24,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-arm</emulator>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/arm-sd.qcow2'/>