tests: Simplify balloon-mmio-deflate

Drop everything that's not directly related to the scenario
being tested.

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

diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args
index 376182a85677358b45dc39afdd635988c75fbbc8..89089c9d6b949c74d69adc0d1ae896d6ed5328ed 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args
@@ -26,10 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--kernel /aarch64.kernel \
--initrd /aarch64.initrd \
--append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
--dtb /aarch64.dtb \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-device","id":"balloon0","deflate-on-oom":true}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \

diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
index 49b7d2c60560a63722dfd39ef12f5379b4ef895b..a749bf31a231d22a22d1e09cc8a511c04bb1cb56 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
@@ -2,26 +2,13 @@
   <name>aarch64test</name>
   <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
   <memory>1048576</memory>
-  <currentMemory>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch="aarch64" machine="virt">hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <dtb>/aarch64.dtb</dtb>
-    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
   </os>
-  <features>
-    <apic/>
-    <pae/>
-  </features>
   <cpu match='exact'>
     <model>cortex-a53</model>
   </cpu>
-  <clock offset="utc"/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <memballoon model='virtio' autodeflate='on'/>

diff --git a/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
index 90ca28ae88e4feb00a8361b7b68fab2313347b4d..8aeb19197917eb17dbe0858b69259cdfdc64dc31 100644 (file)
--- a/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
@@ -6,15 +6,9 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='aarch64' machine='virt'>hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-    <dtb>/aarch64.dtb</dtb>
     <boot dev='hd'/>
   </os>
   <features>
-    <apic/>
-    <pae/>
     <gic version='2'/>
   </features>
   <cpu mode='custom' match='exact' check='none'>
@@ -23,7 +17,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <audio id='1' type='none'/>