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> --- ...r-automatic-unavailable-q35.x86_64-latest.xml | 2 +- .../usb-controller-automatic-unavailable-q35.xml | 7 ------- ...er-default-fallback-g3beige.ppc64-latest.args | 1 - ...ler-default-fallback-g3beige.ppc64-latest.xml | 11 ++--------- ...ller-default-fallback-mac99.ppc64-latest.args | 1 - ...oller-default-fallback-mac99.ppc64-latest.xml | 11 ++--------- ...ler-default-fallback-mac99ppc.ppc-latest.args | 1 - ...ller-default-fallback-mac99ppc.ppc-latest.xml | 11 ++--------- ...ler-default-fallback-nousb.aarch64-latest.xml | 1 - ...r-default-fallback-powernv9.ppc64-latest.args | 1 - ...er-default-fallback-powernv9.ppc64-latest.xml | 11 ++--------- ...-default-fallback-realview.aarch64-latest.xml | 1 - ...efault-fallback-versatilepb.armv7l-latest.xml | 2 +- ...-controller-default-g3beige.ppc64-latest.args | 1 - ...b-controller-default-g3beige.ppc64-latest.xml | 11 ++--------- .../usb-controller-default-g3beige.xml | 11 +---------- ...-controller-default-i440fx.x86_64-latest.args | 1 - ...b-controller-default-i440fx.x86_64-latest.xml | 4 +--- .../usb-controller-default-i440fx.xml | 4 +--- .../usb-controller-default-isapc.xml | 2 -- ...sb-controller-default-mac99.ppc64-latest.args | 1 - ...usb-controller-default-mac99.ppc64-latest.xml | 11 ++--------- .../usb-controller-default-mac99.xml | 11 +---------- ...b-controller-default-mac99ppc.ppc-latest.args | 1 - ...sb-controller-default-mac99ppc.ppc-latest.xml | 11 ++--------- .../usb-controller-default-mac99ppc.xml | 11 +---------- ...b-controller-default-nousb.aarch64-latest.xml | 1 - .../usb-controller-default-nousb.xml | 1 - ...controller-default-powernv9.ppc64-latest.args | 1 - ...-controller-default-powernv9.ppc64-latest.xml | 11 ++--------- .../usb-controller-default-powernv9.xml | 11 +---------- ...-default-pseries.ppc64-latest.abi-update.args | 1 - ...r-default-pseries.ppc64-latest.abi-update.xml | 11 ++--------- ...-controller-default-pseries.ppc64-latest.args | 1 - ...b-controller-default-pseries.ppc64-latest.xml | 11 ++--------- .../usb-controller-default-pseries.xml | 14 +------------- .../usb-controller-default-q35.x86_64-latest.xml | 12 ++++++------ .../usb-controller-default-q35.xml | 7 ------- ...ontroller-default-realview.aarch64-latest.xml | 1 - .../usb-controller-default-realview.xml | 1 - ...-default-unavailable-g3beige.ppc64-latest.xml | 11 ++--------- ...-default-unavailable-i440fx.x86_64-latest.xml | 4 +--- ...er-default-unavailable-mac99.ppc64-latest.xml | 11 ++--------- ...r-default-unavailable-mac99ppc.ppc-latest.xml | 11 ++--------- ...-default-unavailable-nousb.aarch64-latest.xml | 1 - ...default-unavailable-powernv9.ppc64-latest.xml | 11 ++--------- ...-default-unavailable-pseries.ppc64-latest.xml | 11 ++--------- ...ler-default-unavailable-q35.x86_64-latest.xml | 12 ++++++------ ...fault-unavailable-realview.aarch64-latest.xml | 1 - ...ult-unavailable-versatilepb.armv7l-latest.xml | 2 +- ...troller-default-versatilepb.armv7l-latest.xml | 2 +- .../usb-controller-default-versatilepb.xml | 1 - ...controller-ich9-autoassign.x86_64-latest.args | 1 - ...-controller-ich9-autoassign.x86_64-latest.xml | 4 +--- .../usb-controller-ich9-autoassign.xml | 16 +++++----------- ...-controller-ich9-companion.x86_64-latest.args | 1 - ...b-controller-ich9-companion.x86_64-latest.xml | 4 +--- .../usb-controller-ich9-companion.xml | 4 +--- ...-controller-ich9-ehci-addr.x86_64-latest.args | 1 - ...b-controller-ich9-ehci-addr.x86_64-latest.xml | 4 +--- .../usb-controller-ich9-ehci-addr.xml | 4 +--- .../usb-controller-ich9-no-companion.xml | 6 +----- .../usb-controller-implicit-i440fx.xml | 2 -- .../usb-controller-implicit-isapc.xml | 2 -- .../usb-controller-implicit-q35.xml | 2 -- .../usb-controller-nec-xhci-autoassign.xml | 14 ++++---------- .../usb-controller-nec-xhci-limit.xml | 2 -- ...roller-nec-xhci-unavailable.x86_64-latest.xml | 2 +- .../usb-controller-nec-xhci.x86_64-latest.xml | 2 +- .../qemuxmlconfdata/usb-controller-nec-xhci.xml | 7 ------- .../usb-controller-piix3.x86_64-latest.args | 1 - .../usb-controller-piix3.x86_64-latest.xml | 4 +--- tests/qemuxmlconfdata/usb-controller-piix3.xml | 4 +--- 73 files changed, 73 insertions(+), 317 deletions(-) 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 11ca806c63..d6e40f437e 100644 --- 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 d89dc4afe8..d3ceefe2f1 100644 --- 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 11c3b54f08..7b0fd85a77 100644 --- 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 93672e3d6b..655687b27a 100644 --- 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 79964a4d10..ba81f4e2ad 100644 --- 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 f510b2c713..1237fe1281 100644 --- 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 c89656699a..da5437bc24 100644 --- 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 7e74642ba5..2fbca012c9 100644 --- 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 a01dd15168..fa258c5671 100644 --- 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 c4b6238347..71528dee24 100644 --- 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 b8e2c77dca..4bbf78199f 100644 --- 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 d875deea19..f37501b769 100644 --- 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 d934c3e842..482029e3b0 100644 --- 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 11c3b54f08..7b0fd85a77 100644 --- 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 93672e3d6b..655687b27a 100644 --- 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 6ff8b78312..83bd3f38de 100644 --- 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 b2d71ccb60..e4be4266bb 100644 --- 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 c74353b056..89631180ac 100644 --- 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 3987b78ebc..2db9c16c48 100644 --- 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 fa87acbdff..195a59001e 100644 --- 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 79964a4d10..ba81f4e2ad 100644 --- 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 f510b2c713..1237fe1281 100644 --- 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 ad1b4a8588..f41aa2e219 100644 --- 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 1adccc8af8..dcb2b49a53 100644 --- 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 07efea9255..02cd54d7f7 100644 --- 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 5f6fcebded..6f1c1a89ce 100644 --- 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 a01dd15168..fa258c5671 100644 --- 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 83a405800f..5647f93e4a 100644 --- 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 c4b6238347..71528dee24 100644 --- 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 b8e2c77dca..4bbf78199f 100644 --- 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 62dc30c388..5ddf5892af 100644 --- 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 8ee4723b5a..3d8df5ff6f 100644 --- 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 a1509b73e3..1c11a18b28 100644 --- 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 e996fc73b8..1859e1f5f9 100644 --- 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 316a030af8..e92535a1f9 100644 --- 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 676a578eb0..7c57e37adf 100644 --- 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 4295586490..9418107fe4 100644 --- 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 b3a57365bc..ad6d7cbe47 100644 --- 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 d875deea19..f37501b769 100644 --- 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 2ff9d61308..8068d29515 100644 --- 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 e977af05ee..409aeffe87 100644 --- 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 183cfe3b9a..b2847caee7 100644 --- 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 45e5ef9890..4ee8c59607 100644 --- 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 3899a4ecb1..22ec793ffa 100644 --- 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 a01dd15168..fa258c5671 100644 --- 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 d25eb9b376..c27af33c06 100644 --- 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 0813a9fba1..2b71e447e8 100644 --- 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 f5561ebc1a..e46489882a 100644 --- 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 d875deea19..f37501b769 100644 --- 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 ebea79c6d0..93bf8dcd0a 100644 --- 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 dc1b37d626..e1a607c256 100644 --- 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 b496f2f9f0..e74d62c46b 100644 --- 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 59d8430a40..4a8ed73ef3 100644 --- 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 27038cfab8..48023e5c37 100644 --- 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 eb670dce8b..d0aa93d744 100644 --- 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 b935a43647..4225a3489c 100644 --- 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 a43c29e341..8af1e43a11 100644 --- 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 aa5fb12727..9bc81f9126 100644 --- 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 68b512e94b..2ac2bbe4aa 100644 --- 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 058880b2c4..50ebdb25e7 100644 --- 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 e5b0cf9eb6..314146019e 100644 --- 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 fbd1bbeb24..01dab2e1c7 100644 --- 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 fc48ea3cde..801912352d 100644 --- 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 21be5b8cdf..55670290a6 100644 --- 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 ddeeadca97..51d327de8d 100644 --- 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 94cbbc2432..4d31f64a74 100644 --- 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 08a04183b6..7b29cb5aec 100644 --- 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 e6f61c20c3..9039037ab7 100644 --- 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 e6f61c20c3..9039037ab7 100644 --- 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 55b8725008..4b0123b67a 100644 --- 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 b2d71ccb60..e4be4266bb 100644 --- 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 c74353b056..89631180ac 100644 --- 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 4d685c696f..4af0304d87 100644 --- 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> -- 2.51.0