tests: Minimize usb-controller tests

These tests are all about USB controllers and anything else
is a distraction that we can happily live without.

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/usb-controller-automatic-unavailable-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.xml
index 11ca806c637a4f1ec88b8c22ee51b420898783e2..d6e40f437e425b21d4ef048bfcba91aeb973e4b4 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.xml
@@ -17,10 +17,10 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
     </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.xml b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.xml
index d89dc4afe8206d19a08439f30ebc62e5d4b1b99b..d3ceefe2f1f33c5c9c4ee4ccffe8485c4baa9220 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.xml
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.xml
@@ -2,19 +2,12 @@
   <name>q35-test</name>
   <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
   <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='q35'>hvm</type>
-    <boot dev='hd'/>
   </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
index 11c3b54f0810caf3f6e99356d17753fd14aa8003..7b0fd85a77e2d33e7270052463441e4dd5ac359a 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.xml
index 93672e3d6b5dcd2e0fc94cbc696246d860cf0735..655687b27a910d6c1f808b675a6c4ac2c823aaf6 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='g3beige'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>g3</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
index 79964a4d107a15e319b55708d50225a9d5414f7f..ba81f4e2ada908b6dd0f89da7427934ef1f8075a 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.xml
index f510b2c71381fa5c3ef55e9202158b27893141a0..1237fe12814bc45cd385218522483171d1ee3412 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>ppc64</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
index c89656699a5e2426a574c9d7e711f3931eb7d806..da5437bc2436b1e987d88dc9bd65916f4886a1ab 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
@@ -27,6 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.xml
index 7e74642ba5b50a03edb5939fed02f6a4c651574e..2fbca012c95a5a00a9778fc0475b8dceb36bf4ad 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.xml
@@ -8,15 +8,10 @@
     <type arch='ppc' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <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-ppc</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -24,8 +19,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
index a01dd15168c2c8650d10b2b80ba9410cc42f4f34..fa258c56714082aab1e4f0a7138d58e61cccbd03 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
index c4b62383475d76f9c332b42d3edaf7f84c4e31e6..71528dee2484b00cfad47c7c58cb7c87d25c090e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.xml
index b8e2c77dca1b62ecfccf68ee330aebcdcf2b6b9a..4bbf78199f1e94a579e9aae2fdf3b1a1562f116e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='powernv9'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER9</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
index d875deea19d9fe23b57c0892dd368248681c85ba..f37501b76919d46fab7799a96cdda0de3c7b3dea 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.xml
index d934c3e842717035bc7bae30a442570d4b5f0c75..482029e3b09aec8397b8ca8984208bb6aaec2375 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.xml
@@ -17,10 +17,10 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='pci-ohci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
index 11c3b54f0810caf3f6e99356d17753fd14aa8003..7b0fd85a77e2d33e7270052463441e4dd5ac359a 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.xml
index 93672e3d6b5dcd2e0fc94cbc696246d860cf0735..655687b27a910d6c1f808b675a6c4ac2c823aaf6 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='g3beige'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>g3</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-g3beige.xml b/tests/qemuxmlconfdata/usb-controller-default-g3beige.xml
index 6ff8b78312d7b60e1c19f05287c5ea4452e6246d..83bd3f38de2dc8bcf2b96e213fe6835fd9fded91 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-g3beige.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-g3beige.xml
@@ -2,22 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc64' machine='g3beige'>hvm</type>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <controller type='usb' index='0'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
index b2d71ccb60dd492569130021c219578da2ea4c84..e4be4266bbc4b8c9740088371d7f2616e305c5d1 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml
index c74353b0563c83e1384a5e4c64545fe21ed25709..89631180ac72a1e7ca5300a581c0abb37652cb95 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.xml
@@ -24,8 +24,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-default-i440fx.xml
index 3987b78ebc371fb08f477eb8cdbbd313787aaf6d..2db9c16c487f08199ae766d4e7e31e9c3caa9e2e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.xml
@@ -2,15 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='usb' index='0'/>
-    <memballoon model='virtio'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-isapc.xml b/tests/qemuxmlconfdata/usb-controller-default-isapc.xml
index fa87acbdff30f6b36d4f36a633d60ef49e13aaab..195a59001e00fe2acf8701f0a4aeca32465d5f8e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-isapc.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-isapc.xml
@@ -2,11 +2,9 @@
   <name>q35-test</name>
   <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
   <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='isapc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
index 79964a4d107a15e319b55708d50225a9d5414f7f..ba81f4e2ada908b6dd0f89da7427934ef1f8075a 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.xml
index f510b2c71381fa5c3ef55e9202158b27893141a0..1237fe12814bc45cd385218522483171d1ee3412 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>ppc64</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99.xml b/tests/qemuxmlconfdata/usb-controller-default-mac99.xml
index ad1b4a8588b7c4deff34ddb6ec313ce6dca51991..f41aa2e2199f8ffb61d5aae6efe36c0713f519af 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99.xml
@@ -2,22 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc64' machine='mac99'>hvm</type>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <controller type='usb' index='0'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
index 1adccc8af852c5f6030d0c6c93c36a13da7a85a2..dcb2b49a53e22c6780eab5d42a90aad74f56934c 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
@@ -27,6 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.xml
index 07efea9255dce9b89626cf774b9739b7eb258093..02cd54d7f71a5b1c1cc3fd92917c7432952d59cc 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.xml
@@ -8,15 +8,10 @@
     <type arch='ppc' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <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-ppc</emulator>
     <controller type='usb' index='0' model='piix3-uhci'>
@@ -24,8 +19,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.xml b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.xml
index 5f6fcebded93feae461bca6605f9a72b9459a55c..6f1c1a89ce0772c758834c35ef072400be78c9bc 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.xml
@@ -2,22 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc' machine='mac99'>hvm</type>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc</emulator>
     <controller type='usb' index='0'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
index a01dd15168c2c8650d10b2b80ba9410cc42f4f34..fa258c56714082aab1e4f0a7138d58e61cccbd03 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
index 83a405800fbe23af318320d23edaa791fea1b971..5647f93e4ae0932ceb5040ea6fb20ae0ba07f1a0 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml
@@ -10,7 +10,6 @@
   <cpu mode='host-passthrough'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
index c4b62383475d76f9c332b42d3edaf7f84c4e31e6..71528dee2484b00cfad47c7c58cb7c87d25c090e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.xml
index b8e2c77dca1b62ecfccf68ee330aebcdcf2b6b9a..4bbf78199f1e94a579e9aae2fdf3b1a1562f116e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='powernv9'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER9</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-powernv9.xml b/tests/qemuxmlconfdata/usb-controller-default-powernv9.xml
index 62dc30c3885690ef48e2dab26e488f15abfbdc11..5ddf5892afdc7eda36d481423ae6ef57d981ecee 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-powernv9.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-powernv9.xml
@@ -2,22 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc64' machine='powernv9'>hvm</type>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <controller type='usb' index='0'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
index 8ee4723b5aed3c0ca6ff1e1db5dee592311202f8..3d8df5ff6f4f04da34b9e4226f2ade517d1ff615 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml
index a1509b73e3a55a3e92fa1ea2a98897d3238c5e73..1c11a18b28d79803406698dbb4c3a9cd4ace4abe 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER10</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='qemu-xhci'>
@@ -30,9 +25,7 @@
       <target index='0'/>
     </controller>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
index e996fc73b8da9332a9a3df8115233b7e451e2de6..1859e1f5f987d40b5ba27ec96937bf5148a05c84 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml
index 316a030af8d8f6d0bce224c7625fd7dd5841c9ba..e92535a1f97cfdea7bffbf9fb73d4ef563ed49e9 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER10</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0' model='pci-ohci'>
@@ -30,9 +25,7 @@
       <target index='0'/>
     </controller>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.xml
index 676a578eb0f99e3724240c8e541a28358c829688..7c57e37adf224622baea0f30cba763bbf8ea7f8e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.xml
@@ -2,25 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219100</memory>
-  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='ppc64' machine='pseries'>hvm</type>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <controller type='usb' index='0'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml
index 4295586490b820d577d60f3d1d6311f1fd898533..9418107fe499b817c4ba38533732920cbde2a44e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.xml
@@ -17,6 +17,12 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1' model='pcie-root-port'>
       <model name='pcie-root-port'/>
@@ -32,12 +38,6 @@
       <target chassis='3' port='0x9'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-q35.xml b/tests/qemuxmlconfdata/usb-controller-default-q35.xml
index b3a57365bcc4f235ca82b232dae6dddb29cb9b1b..ad6d7cbe4736b55782cf694007d2fde381ebb8a4 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-q35.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-q35.xml
@@ -2,19 +2,12 @@
   <name>q35-test</name>
   <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
   <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='q35'>hvm</type>
-    <boot dev='hd'/>
   </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <controller type='usb' index='0'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
index d875deea19d9fe23b57c0892dd368248681c85ba..f37501b76919d46fab7799a96cdda0de3c7b3dea 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.xml b/tests/qemuxmlconfdata/usb-controller-default-realview.xml
index 2ff9d61308586ec07136827b6afdfdb452aa4e84..8068d29515d26d6de7e11d056cbd73e799361f37 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.xml
@@ -9,7 +9,6 @@
   <cpu mode='host-passthrough'/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.xml
index e977af05ee581d95d39ae6d79fbbfa21b7c8b5a5..409aeffe878fc47248d98c4ce0ccba62e8274b07 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='g3beige'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>g3</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
index 183cfe3b9a77e63f699af713654558f9b398c8be..b2847caee77e7250ce09e159149779342bec3d1b 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml
@@ -24,8 +24,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.xml
index 45e5ef9890dc9d4ca1da00a0682410f65597b18f..4ee8c596074aacdc7c79ea79831221f76aacbb88 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>ppc64</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.xml
index 3899a4ecb17d916cfc8bf283b5d768e75d683e4d..22ec793ffa42ca59f7b9d3639b4d31f1eec84dc2 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.xml
@@ -8,15 +8,10 @@
     <type arch='ppc' machine='mac99'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <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-ppc</emulator>
     <controller type='usb' index='0'>
@@ -24,8 +19,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
index a01dd15168c2c8650d10b2b80ba9410cc42f4f34..fa258c56714082aab1e4f0a7138d58e61cccbd03 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.xml
index d25eb9b376f7e09e645c9be2476fc380d51b9b58..c27af33c06f2f818cde7854405447d1039a8ca74 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='powernv9'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER9</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0'>
@@ -27,8 +22,6 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.xml
index 0813a9fba13c3d18bcd1ff10c59fd8772f518ddc..2b71e447e8fcc312c7838dafa319a5716e16e176 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.xml
@@ -8,18 +8,13 @@
     <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>POWER10</model>
   </cpu>
   <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-ppc64</emulator>
     <controller type='usb' index='0'>
@@ -30,9 +25,7 @@
       <target index='0'/>
     </controller>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
index f5561ebc1a0407e34fb3a8374c1b6b36f212609d..e46489882a2f005111bf9e9add9aea44f3cd64d6 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.xml
@@ -17,6 +17,12 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1' model='pcie-root-port'>
       <model name='pcie-root-port'/>
@@ -32,12 +38,6 @@
       <target chassis='3' port='0x9'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <controller type='usb' index='0'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
index d875deea19d9fe23b57c0892dd368248681c85ba..f37501b76919d46fab7799a96cdda0de3c7b3dea 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
@@ -15,7 +15,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='qemu-xhci'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb.armv7l-latest.xml
index ebea79c6d04b01f609c09aabd1af604ceaa90aa3..93bf8dcd0ad7766cc19bf4884d682d35595b0b7e 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb.armv7l-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb.armv7l-latest.xml
@@ -17,10 +17,10 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.xml
index dc1b37d626e24835fa6062ac1a97375455c22009..e1a607c25663a769f00fcb65fd1ba199c932806c 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.xml
@@ -17,10 +17,10 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.xml b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.xml
index b496f2f9f0303ec8cc60f6afa1ad7522c93b3d18..e74d62c46ba450ce6981df4bd47ea445f257d49b 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.xml
@@ -8,7 +8,6 @@
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
-    <controller type='pci' index='0' model='pci-root'/>
     <controller type='usb' index='0'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
index 59d8430a40a559b92274984fcf66782d040fea6c..4a8ed73ef31711183f76c1278f160fa3d6978ca1 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
@@ -36,6 +36,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}' \
 -device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml
index 27038cfab87378e367fcfc26c4fea2df22cdc4fa..48023e5c37f7ea842ec9a6a6bc3baf3e8744dcc1 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.xml
@@ -41,8 +41,6 @@
     <audio id='1' type='none'/>
     <hub type='usb'/>
     <hub type='usb'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml
index eb670dce8b5d5f3d01c03741d8b6c8e33e44932b..d0aa93d744a5d4d55044df46c836326148d9a765 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
@@ -26,14 +24,10 @@
       <address type='pci' domain='0' bus='0' slot='4' function='2'/>
     </controller>
     <hub type='usb'/>
-    <input type='mouse' bus='usb'>
-    </input>
-    <hub type='usb'>
-    </hub>
-    <input type='mouse' bus='usb'>
-    </input>
-    <input type='mouse' bus='usb'>
-    </input>
-    <memballoon model='virtio'/>
+    <input type='mouse' bus='usb'/>
+    <hub type='usb'/>
+    <input type='mouse' bus='usb'/>
+    <input type='mouse' bus='usb'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
index b935a43647a945290c0abc0418a961632e98a5ba..4225a3489cdefaa94d80821e5d98126bb4e704f5 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
@@ -31,6 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \
 -device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml
index a43c29e341e2f0af41acff12276af3b623204a12..8af1e43a1159d656285d88a20fbd583a0f1b6150 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.xml
@@ -36,8 +36,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-companion.xml b/tests/qemuxmlconfdata/usb-controller-ich9-companion.xml
index aa5fb12727e7d8fbc15ad5f9f6ad2ecea1e079a2..9bc81f91265e481220d84bee67abf1ad68b5a4b0 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
@@ -25,6 +23,6 @@
       <master startport='4'/>
       <address type='pci' domain='0' bus='0' slot='4' function='2'/>
     </controller>
-    <memballoon model='virtio'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
index 68b512e94bd2a01abd67d72d41ba6c922278b405..2ac2bbe4aa268a3c4effdfa2ceb2708090b8aa3a 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
@@ -39,6 +39,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \
 -device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
index 058880b2c4c9f386ca0c098f6f467366f91dbbe6..50ebdb25e7d214c44baa943117105841b41e1db2 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.xml
@@ -66,8 +66,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml
index e5b0cf9eb63fe9e03cfd400ecb53e1e0357cb3d0..314146019ec36de3d01ed3c178c6bca0d519f034 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
@@ -36,6 +34,6 @@
     <controller type='usb' index='2' model='ich9-uhci2'/>
     <controller type='usb' index='1' model='ich9-uhci2'/>
     <controller type='usb' index='0' model='ich9-uhci2'/>
-    <memballoon model='virtio'/>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml b/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml
index fbd1bbeb240324d58eb1752cfe3bad8fd0bc2ebf..01dab2e1c74b4a173d4d197863ce31bc8a846e3c 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
@@ -14,8 +12,6 @@
       <master startport='2'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0'/>
     </controller>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml
index fc48ea3cdeb421c6270e572026e8b63b02c80411..801912352d0b5757ae76526cbeb890ec087330a5 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml
+++ b/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml b/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml
index 21be5b8cdff10d41336eec32cfeb713b100c7d25..55670290a61eaef18502130c6f0161ad6e0235a0 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml
+++ b/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='isapc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml b/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml
index ddeeadca97874651de6a89a6611c0e22a26bfdda..51d327de8dfc6abd5e0594b3bf37d81e3ad7d660 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml
+++ b/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='q35'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.xml
index 94cbbc243233781e2bdd039fca2f831f01374807..4d31f64a74d6e2d13a2171d10a3de4e7f861deb5 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.xml
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.xml
@@ -2,24 +2,18 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='usb' index='0' model='nec-xhci' ports='8'/>
     <hub type='usb'/>
-    <input type='mouse' bus='usb'>
-    </input>
-    <hub type='usb'>
-    </hub>
-    <input type='mouse' bus='usb'>
-    </input>
-    <input type='mouse' bus='usb'>
-    </input>
+    <input type='mouse' bus='usb'/>
+    <hub type='usb'/>
+    <input type='mouse' bus='usb'/>
+    <input type='mouse' bus='usb'/>
     <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml
index 08a04183b6836b53788790c48895151255ee0821..7b29cb5aec00dcb46ee7614423af344c16158fd8 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml
@@ -2,11 +2,9 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
index e6f61c20c38cf525c3e3b0d876f9666e496e2ca4..9039037ab7896051e848560e8fd8f8014100e949 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.xml
@@ -17,13 +17,13 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <controller type='usb' index='0' model='nec-xhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
     </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml
index e6f61c20c38cf525c3e3b0d876f9666e496e2ca4..9039037ab7896051e848560e8fd8f8014100e949 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.xml
@@ -17,13 +17,13 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <controller type='usb' index='0' model='nec-xhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
     </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci.xml
index 55b8725008bf119d0deaac7dbb42b1470c26ddb3..4b0123b67ac6a89fbb439fa50e366ccb9baba288 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci.xml
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci.xml
@@ -2,19 +2,12 @@
   <name>q35-test</name>
   <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
   <memory unit='KiB'>2097152</memory>
-  <currentMemory unit='KiB'>2097152</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='q35'>hvm</type>
-    <boot dev='hd'/>
   </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='pci' index='0' model='pcie-root'/>
     <controller type='usb' index='0' model='nec-xhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>

diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
index b2d71ccb60dd492569130021c219578da2ea4c84..e4be4266bbc4b8c9740088371d7f2616e305c5d1 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
@@ -28,6 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml
index c74353b0563c83e1384a5e4c64545fe21ed25709..89631180ac72a1e7ca5300a581c0abb37652cb95 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.xml
@@ -24,8 +24,6 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
+    <memballoon model='none'/>
   </devices>
 </domain>

diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.xml b/tests/qemuxmlconfdata/usb-controller-piix3.xml
index 4d685c696f0c0020e32140a80588d0c0951021ec..4af0304d87c2f9f91f73899adfac031ad4ff2e58 100644 (file)
--- a/tests/qemuxmlconfdata/usb-controller-piix3.xml
+++ b/tests/qemuxmlconfdata/usb-controller-piix3.xml
@@ -2,15 +2,13 @@
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory unit='KiB'>219136</memory>
-  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='usb' index='0' model='piix3-uhci'/>
-    <memballoon model='virtio'/>
+    <memballoon model='none'/>
   </devices>
 </domain>