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 80efab2c49d820ad7ca609c3767496fab9d5c0d9..4c607eaf518e24306c3d32b40083b69a21f543be 100644 (file)
--- 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 44ee27a659f14c4acd1d7c65f2c6604f9335c51c..a8c6404f4acc77534f4a1d674f4717ef40ea1ea0 100644 (file)
--- 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 b498d1761b7893fe73ec04cf116892d46bb1ff79..0c4b2b69542f2828d7f12a154699f1a378aa5a32 100644 (file)
--- 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>