From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 8 Jan 2024 16:00:05 +0000 (+0100)
Subject: tests: Don't use features with vexpress machine
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2be35bc4b781e3debbd6c9a411e571e9cf89fc4c;p=people%2Faperard%2Flibvirt.git

tests: Don't use features with vexpress machine

The vexpress machine has never supported ACPI. This fact has
been silently ignored by QEMU so far, but recent versions have
started reporting attempts to use the combination as an error.

The other features (APIC, PAE) are also not relevant to the
vexpress machine, or the QEMU driver.

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

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
index 80efab2c49..4c607eaf51 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml
@@ -11,11 +11,6 @@
     <dtb>/arm.dtb</dtb>
     <cmdline>console=ttyAMA0,115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0</cmdline>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
index 44ee27a659..a8c6404f4a 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml
@@ -11,11 +11,6 @@
     <dtb>/arm.dtb</dtb>
     <cmdline>console=ttyAMA0,115200n8</cmdline>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
index b498d1761b..0c4b2b6954 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml
@@ -11,11 +11,6 @@
     <dtb>/arm.dtb</dtb>
     <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0</cmdline>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <clock offset="utc"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>