Ping? The meat of this is very small - most of the lines are just
changes to test data.
On 06/09/2014 01:29 PM, Laine Stump wrote:
> There are no options to parse here, and all three possible device
> names have the same prefix ("virtio-balloon" with "-ccw", "-pci", or
> "-device" appended), so it is fairly simple.
>
> qemuParseCommandLineString() previously would always add a <memballoon
> model='virtio'/> to every result (the comments erroneously say that it
> is adding a <memballoon model='none'/>) This has been changed to add
> model='none', and 84 test case xml's updated accordingly (so that
> qemuxml2argvtest won't fail).
>
> Now that the memballoon device is properly parsed, we can safely add a
> test for properly ignoring -nodefconfig and -nodefaults. Rather than
> adding an entire new test case for this (and memballoon), we just
> randomly pick the clock-utc test and modify it slightly to fulfill the
> purpose.
> ---
>
> I don't necessarily have any love for the memory balloon driver, but
> this ended up being necessary in order to prevent test failures after
> fixing the patch here to not ignore unrecognized -device args:
>
> https://www.redhat.com/archives/libvir-list/2014-June/msg00388.html
>
> src/qemu/qemu_command.c | 8 +++++++-
> tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 7 ++++---
> tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 +-
> .../qemuxml2argv-disk-drive-error-policy-enospace.xml | 2 +-
> .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 +-
> .../qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml | 2 +-
> .../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 +-
> .../qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml | 2 +-
> .../qemuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml | 2 +-
> .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +-
> tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +-
> tests/qemuxml2argvtest.c | 2 +-
> 88 files changed, 97 insertions(+), 90 deletions(-)
>
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 2caee66..e1d7e1b 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -11353,6 +11353,12 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
> virDomainHostdevDefFree(hostdev);
> goto error;
> }
> + } else if (STREQ(arg, "-device") && progargv[i + 1] &&
> + STRPREFIX(progargv[i + 1], "virtio-balloon")) {
> + WANT_VALUE();
> + if (VIR_ALLOC(def->memballoon) < 0)
> + goto error;
> + def->memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO;
> } else if (STREQ(arg, "-soundhw")) {
> const char *start;
> WANT_VALUE();
> @@ -11657,7 +11663,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
> virDomainMemballoonDefPtr memballoon;
> if (VIR_ALLOC(memballoon) < 0)
> goto error;
> - memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO;
> + memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_NONE;
>
> def->memballoon = memballoon;
> }
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
> index b5c37bb..b639821 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
> @@ -24,6 +24,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
> index e42f7ed..610321f 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
> @@ -30,6 +30,6 @@
> <controller type='fdc' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
> index 8124f34..f4ebc2e 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
> index 2acb71f..4e1f66b 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
> index 57fc6e3..9ed48c1 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
> @@ -1,5 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> /usr/bin/qemu -S -M \
> -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
> --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
> -none
> +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \
> +-monitor unix:/tmp/test-monitor,server,nowait \
> +-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \
> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
> index b1ee29c..dc2f851 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
> @@ -29,6 +29,6 @@
> <console type='pty'>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
> index d8ff676..60b3168 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
> @@ -29,6 +29,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
> index 75b9cec..5d94ec0 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
> index 59ef29d..31d3702 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
> @@ -29,6 +29,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
> index 0c9bc08..3b06a97 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
> @@ -29,6 +29,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
> index 0b85fb1..779aa17 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
> index 4bd8e24..481cc55 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
> index 7fe9082..933feb4 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
> index f0e7df4..4cc449d 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
> index 0beda48..63fb2b0 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
> index 00730f7..dcac861 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
> index 6ee75aa..0a93f00 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
> index 92fcd8a..ab88224 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
> index 83d5dd0..b78be46 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
> index ded9cd1..14dd1ca 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
> index 85fe2a9..a36b09c 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
> index 7c1fdb1..dce5f23 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml
> @@ -30,6 +30,6 @@
> </disk>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
> index a6b13ab..1764259 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml
> @@ -30,6 +30,6 @@
> </disk>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
> index dd52c39..62b17ec 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
> index c3bfa34..0ba7a05 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
> index 8087f90..aaafa63 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
> index 0955fee..82aeaf1 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
> index e74b95f..6d18d72 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
> index bba512e..37e9db5 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml
> @@ -32,6 +32,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
> index 06e852d..bc9d8d0 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml
> @@ -33,6 +33,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
> index bba512e..37e9db5 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml
> @@ -32,6 +32,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
> index d20ca3e..fc9ad16 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml
> @@ -30,6 +30,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
> index 8bbd324..343767d 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
> @@ -36,6 +36,6 @@
> <controller type='fdc' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
> index edcd015..9674237 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
> @@ -41,6 +41,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
> index 730c4f3..74a30df 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml
> @@ -28,6 +28,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
> index 3e2e550..458c55d 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
> @@ -40,6 +40,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
> index 3baf97d..e0bad71 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml
> @@ -40,6 +40,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
> index 4aa385c..0177654 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
> @@ -29,6 +29,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
> index 66ea35d..6bebd10 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
> @@ -29,6 +29,6 @@
> <video>
> <model type='vga' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
> index 0198930..694343f 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
> @@ -31,6 +31,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
> index eda2e87..b35c2bd 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
> @@ -31,6 +31,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
> index 2b13865..44df226 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
> @@ -29,6 +29,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
> index eda2e87..b35c2bd 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
> @@ -31,6 +31,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
> index 11e5a7a..cfa61be 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
> @@ -24,6 +24,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
> index 267876f..356ac36 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
> @@ -31,6 +31,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
> index 422127c..b9b5c14 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml
> @@ -28,6 +28,6 @@
> <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
> </source>
> </hostdev>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
> index ee00634..5807eff 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml
> @@ -28,6 +28,6 @@
> <address bus='14' device='6'/>
> </source>
> </hostdev>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
> index bb36fc0..5b80040 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml
> @@ -24,6 +24,6 @@
> <emulator>/usr/bin/qemu</emulator>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
> index 0863737..5765a04 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
> @@ -24,6 +24,6 @@
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> <input type='mouse' bus='usb'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
> index 03558dd..59d04eb 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
> @@ -24,6 +24,6 @@
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> <input type='tablet' bus='usb'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
> index a187aaa..32fb349 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml
> @@ -21,6 +21,6 @@
> <emulator>/usr/bin/kvm</emulator>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
> index 5eb229f..37a9e22 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
> index 0dd5b39..b98f434 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
> index 3a375fe..5fcc470 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
> index 6fe8a85..5e1a101 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
> index b9313e0..80d8f0f 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
> index f432732..5da5fa6 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml
> @@ -27,6 +27,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
> index cea52f8..8263642 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
> index 10c2d41..43a88ee 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
> index 6fe8a85..5e1a101 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
> index 8ad6eb7..d616918 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml
> @@ -29,6 +29,6 @@
> <target dev='nic02'/>
> <model type='rtl8139'/>
> </interface>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
> index 6f00fe1..bc1a981 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml
> @@ -28,6 +28,6 @@
> <script path='/etc/qemu-ifup'/>
> <model type='rtl8139'/>
> </interface>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
> index 960b7aa..80330aa 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
> @@ -27,6 +27,6 @@
> <mac address='00:11:22:33:44:55'/>
> <model type='rtl8139'/>
> </interface>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
> index 195a3d9..5c0ef55 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
> @@ -27,6 +27,6 @@
> <mac address='00:11:22:33:44:55'/>
> <model type='virtio'/>
> </interface>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
> index 3a375fe..5fcc470 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
> index 5e54cd0..c53b7c3 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
> index 60ea846..a3dfe9a 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
> @@ -28,6 +28,6 @@
> <protocol type='raw'/>
> <target port='0'/>
> </parallel>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
> index 64b70f3..1f896f8 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
> @@ -36,6 +36,6 @@
> <video>
> <model type='cirrus' vram='9216' heads='1'/>
> </video>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
> index d001ee7..9703bd4 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
> @@ -16,7 +16,7 @@
> <emulator>/usr/bin/qemu-system-ppc64</emulator>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> <nvram>
> <address type='spapr-vio' reg='0x4000'/>
> </nvram>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
> index 29f84db..3e43132 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
> @@ -23,7 +23,7 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> <qemu:commandline>
> <qemu:arg value='-unknown'/>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
> index 883a804..974b966 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml
> @@ -17,6 +17,6 @@
> <emulator>/usr/bin/qemu</emulator>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
> index a298b9d..4d400e1 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml
> @@ -17,6 +17,6 @@
> <emulator>/usr/bin/qemu</emulator>
> <controller type='usb' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
> index 138a83a..b40ca80 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
> index 3a375fe..5fcc470 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml
> @@ -23,6 +23,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
> index b1a7429..4c4de66 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
> @@ -31,6 +31,6 @@
> <source path='/dev/ttyS2'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
> index 4335f43..e4b0396 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
> @@ -31,6 +31,6 @@
> <source path='/tmp/serial.log'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
> index 4829285..8bce8f5 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
> @@ -33,6 +33,6 @@
> <console type='pty'>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
> index d2af760..1de2305 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
> @@ -29,6 +29,6 @@
> <console type='pty'>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
> index 06ce154..5a667d7 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
> @@ -33,6 +33,6 @@
> <protocol type='telnet'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
> index 493f8a1..cc8bcfe 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
> @@ -33,6 +33,6 @@
> <protocol type='raw'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
> index d525965..8cc2f9c 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
> @@ -37,6 +37,6 @@
> <source mode='connect' host='127.0.0.1' service='9998'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
> index 8aa052d..6bb1ce9 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
> @@ -31,6 +31,6 @@
> <source mode='connect' path='/tmp/serial.sock'/>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
> index 12107d7..ea789ab 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
> @@ -29,6 +29,6 @@
> <console type='vc'>
> <target type='serial' port='0'/>
> </console>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
> index 55bf16d..365e9df 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml
> @@ -26,6 +26,6 @@
> <controller type='usb' index='0'/>
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
> index 0bd1185..7349003 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
> @@ -27,6 +27,6 @@
> <sound model='es1370'/>
> <sound model='sb16'/>
> <sound model='ac97'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
> index 32d57e0..2bbb826 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml
> @@ -24,6 +24,6 @@
> <controller type='ide' index='0'/>
> <controller type='pci' index='0' model='pci-root'/>
> <watchdog model='ib700' action='poweroff'/>
> - <memballoon model='virtio'/>
> + <memballoon model='none'/>
> </devices>
> </domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 24d104e..803c3b8 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -630,7 +630,7 @@ mymain(void)
> DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
>
> DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA);
> - DO_TEST("clock-utc", NONE);
> + DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE);
> DO_TEST("clock-localtime", NONE);
> DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
> DO_TEST("clock-variable", QEMU_CAPS_RTC);
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list