tests: Don't use memballoon=none for minimal tests

It's redundant (these machine types don't get a memballoon added
automatically anyway), plus the test is supposed to show what
happens when a minimal configuration is fed to libvirt and
including additional elements goes against that.

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

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 e3f04fbbff4a0beacee83fd6a34093f148b95e17..b12ef03d4b471d21a701ecad50c21e165c615816 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.xml
@@ -16,6 +16,5 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
index e3f04fbbff4a0beacee83fd6a34093f148b95e17..b12ef03d4b471d21a701ecad50c21e165c615816 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml
@@ -16,6 +16,5 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
index 6505122cb8d5195b696209f3518254eb4fd5a2de..7076f5ac7891899f778f398786be0312f8bc4d79 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml
@@ -10,6 +10,5 @@
   <cpu mode='host-passthrough'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
index 372d5bda6a66ad13e50243b9b37410985bd79e1d..de44852e4ef12428d549007a3179de53b5f71bde 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
@@ -17,6 +17,5 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='pci-ohci'/>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
index 372d5bda6a66ad13e50243b9b37410985bd79e1d..de44852e4ef12428d549007a3179de53b5f71bde 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
@@ -17,6 +17,5 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='pci-ohci'/>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
index b58b2072991511bd11326e8cbd914d0caa564818..2502e5d795375eeb1ed07ea257f7c3631b204d9d 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
@@ -9,6 +9,5 @@
   <cpu mode='host-passthrough'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
index 482029e3b09aec8397b8ca8984208bb6aaec2375..7b21b249273c8d0ac0cc6beb89673aac198e6eb9 100644 (file)
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
@@ -22,6 +22,5 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
index 482029e3b09aec8397b8ca8984208bb6aaec2375..7b21b249273c8d0ac0cc6beb89673aac198e6eb9 100644 (file)
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
@@ -22,6 +22,5 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml
index 77cd254048ce3c54ab01e34fdeb9f6109a16b7de..50340763827b3adcca7257648c044ca042ed32b6 100644 (file)
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.xml
@@ -8,6 +8,5 @@
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
-    <memballoon model='none'/>
   </devices>
 </domain>