From a2951dccb5c00c9f67cfd0bc4c6c53d36a6b8043 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Oct 01 2013 07:51:28 +0000 Subject: Rebase ot upstream 1.1.3 --- diff --git a/0001-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch b/0001-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch deleted file mode 100644 index 496ff08..0000000 --- a/0001-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch +++ /dev/null @@ -1,3570 +0,0 @@ -From 0f30e63c7d763278204f99e10ba47b08457f1d41 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 2 Sep 2013 11:23:59 +0100 -Subject: [PATCH] qemu: Set QEMU_AUDIO_DRV=none with -nographic - -On my machine, a guest fails to boot if it has a sound card, but not -graphical device/display is configured, because pulseaudio fails to -initialize since it can't access $HOME. - -A workaround is removing the audio device, however on ARM boards there -isn't any option to do that, so -nographic always fails. - -Set QEMU_AUDIO_DRV=none if no are configured. Unfortunately -this has massive test suite fallout. - -Add a qemu.conf parameter nographics_allow_host_audio, that if enabled -will pass through QEMU_AUDIO_DRV from sysconfig (similar to -vnc_allow_host_audio) ---- - src/qemu/libvirtd_qemu.aug | 3 +++ - src/qemu/qemu.conf | 9 +++++++++ - src/qemu/qemu_cgroup.c | 2 +- - src/qemu/qemu_command.c | 9 ++++++++- - src/qemu/qemu_conf.c | 1 + - src/qemu/qemu_conf.h | 1 + - src/qemu/test_libvirtd_qemu.aug.in | 1 + - tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 3 ++- - .../qemuxml2argv-boot-menu-disable-drive-bootindex.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-network.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-bootloader.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-clock-france.args | 4 ++-- - tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-compat.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args | 2 +- - .../qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args | 3 ++- - .../qemuxml2argv-disk-drive-cache-directsync.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args | 2 +- - .../qemuxml2argv-disk-drive-error-policy-enospace.args | 3 ++- - .../qemuxml2argv-disk-drive-error-policy-stop.args | 3 ++- - .../qemuxml2argv-disk-drive-error-policy-wreport-rignore.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args | 3 ++- - .../qemuxml2argv-disk-drive-network-gluster.args | 3 ++- - .../qemuxml2argv-disk-drive-network-iscsi-auth.args | 3 ++- - .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- - .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args | 3 ++- - .../qemuxml2argv-disk-drive-network-nbd-export.args | 3 ++- - .../qemuxml2argv-disk-drive-network-nbd-ipv6-export.args | 3 ++- - .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 ++- - .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args | 3 ++- - .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- - .../qemuxml2argv-disk-drive-network-rbd-ceph-env.args | 4 ++-- - .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args | 2 +- - .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args | 2 +- - .../qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args | 3 ++- - .../qemuxml2argv-disk-drive-readonly-no-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args | 3 ++- - .../qemuxml2argv-disk-floppy-tray-no-device-cap.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-order.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- - .../qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args | 3 ++- - .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args | 3 ++- - .../qemuxml2argv-hostdev-pci-address-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args | 3 ++- - .../qemuxml2argv-hostdev-usb-address-device-boot.args | 3 ++- - .../qemuxml2argv-hostdev-usb-address-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-lease.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-client.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-server.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-nographics.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args | 3 ++- - .../qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 3 ++- - ...uxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args | 3 ++- - .../qemuxml2argv-numad-auto-vcpu-static-numatune.args | 3 ++- - .../qemuxml2argv-numad-static-memory-auto-vcpu.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-numad.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args | 2 +- - .../qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 ++-- - tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args | 2 +- - .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 ++- - .../qemuxml2argv-seclabel-dynamic-labelskip.args | 2 +- - .../qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-file.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-many.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args | 3 ++- - .../qemuxml2argv-smartcard-host-certificates.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args | 3 ++- - .../qemuxml2argv-smartcard-passthrough-spicevmc.args | 3 ++- - .../qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-smp.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-sound-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-sound.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- - tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args | 3 ++- - tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 3 ++- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args | 2 +- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args | 2 +- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args | 2 +- - .../qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args | 2 +- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args | 2 +- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args | 2 +- - tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 2 +- - 296 files changed, 543 insertions(+), 294 deletions(-) - -diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug -index 5344125..cd13d53 100644 ---- a/src/qemu/libvirtd_qemu.aug -+++ b/src/qemu/libvirtd_qemu.aug -@@ -39,6 +39,8 @@ module Libvirtd_qemu = - | str_entry "spice_tls_x509_cert_dir" - | str_entry "spice_password" - -+ let nogfx_entry = bool_entry "nographics_allow_host_audio" -+ - let remote_display_entry = int_entry "remote_display_port_min" - | int_entry "remote_display_port_max" - | int_entry "remote_websocket_port_min" -@@ -79,6 +81,7 @@ module Libvirtd_qemu = - (* Each entry in the config is one of the following ... *) - let entry = vnc_entry - | spice_entry -+ | nogfx_entry - | remote_display_entry - | security_entry - | save_entry -diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf -index cdf1ec4..5fd6263 100644 ---- a/src/qemu/qemu.conf -+++ b/src/qemu/qemu.conf -@@ -140,6 +140,15 @@ - #spice_password = "XYZ12345" - - -+# By default, if no graphical front end is configured, libvirt will disable -+# QEMU audio output since directly talking to alsa/pulseaudio may not work -+# with various security settings. If you know what you're doing, enable -+# the setting below and libvirt will passthrough the QEMU_AUDIO_DRV -+# environment variable when using nographics. -+# -+#nographics_allow_host_audio = 1 -+ -+ - # Override the port for creating both VNC and SPICE sessions (min). - # This defaults to 5900 and increases for consecutive sessions - # or when ports are occupied, until it hits the maximum. -diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c -index e27945e..cf41c33 100644 ---- a/src/qemu/qemu_cgroup.c -+++ b/src/qemu/qemu_cgroup.c -@@ -488,7 +488,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, - defaultDeviceACL; - - if (vm->def->nsounds && -- (!vm->def->ngraphics || -+ ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) || - ((vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - cfg->vncAllowHostAudio) || - (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL)))) { -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index f8fccea..9dfdb73 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -7605,9 +7605,15 @@ qemuBuildCommandLine(virConnectPtr conn, - * if you ask for nographic. So we have to make sure we override - * these defaults ourselves... - */ -- if (!def->graphics) -+ if (!def->graphics) { - virCommandAddArg(cmd, "-nographic"); - -+ if (cfg->nogfxAllowHostAudio) -+ virCommandAddEnvPass(cmd, "QEMU_AUDIO_DRV"); -+ else -+ virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=none"); -+ } -+ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - /* Disable global config files and default devices */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG)) -@@ -8723,6 +8729,7 @@ qemuBuildCommandLine(virConnectPtr conn, - def->graphics[i]) < 0) - goto error; - } -+ - if (def->nvideos > 0) { - int primaryVideoType = def->videos[0]->type; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY) && -diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c -index 86ed9ed..1f57f72 100644 ---- a/src/qemu/qemu_conf.c -+++ b/src/qemu/qemu_conf.c -@@ -338,6 +338,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, - GET_VALUE_BOOL("vnc_sasl", cfg->vncSASL); - GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir); - GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio); -+ GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio); - - p = virConfGetValue(conf, "security_driver"); - if (p && p->type == VIR_CONF_LIST) { -diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h -index 8229cfc..206f2c6 100644 ---- a/src/qemu/qemu_conf.h -+++ b/src/qemu/qemu_conf.h -@@ -128,6 +128,7 @@ struct _virQEMUDriverConfig { - - bool relaxedACS; - bool vncAllowHostAudio; -+ bool nogfxAllowHostAudio; - bool clearEmulatorCapabilities; - bool allowDiskFormatProbing; - bool setProcessName; -diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in -index d4e4fae..ea770dc 100644 ---- a/src/qemu/test_libvirtd_qemu.aug.in -+++ b/src/qemu/test_libvirtd_qemu.aug.in -@@ -15,6 +15,7 @@ module Test_libvirtd_qemu = - { "spice_tls" = "1" } - { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } - { "spice_password" = "XYZ12345" } -+{ "nographics_allow_host_audio" = "1" } - { "remote_display_port_min" = "5900" } - { "remote_display_port_max" = "65535" } - { "remote_websocket_port_min" = "5700" } -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args -index de4877b..bca7f6b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -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,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args -index 48af1c4..e31a278 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -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,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args -index 48af1c4..e31a278 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -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,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args -index b5bbfcb..e8ef763 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \ - -m 1024 -smp 1 -nographic -nodefaults -device sga \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args -index 4809788..ce7b5da 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=off,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args -index 9a6120b..1e27394 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args -index 9a6120b..1e27394 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args -index d839632..f890f04 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args -@@ -1,3 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 d -usb -cdrom /dev/cdrom -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args -index a2f9067..ab10a57 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args -index 15b0b7c..903d066 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args -index b8aad6a..96c7d4d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 a -usb -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args -index 8279d55..7904902 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S \ - -M pc \ - -m 214 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args -index 0e128ce..aa83301 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S \ - -M pc \ - -m 214 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args -index 87200e0..272346c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 order=d,menu=off -usb -cdrom /dev/cdrom -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args -index fa1efb4..b985dc8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S \ - -M pc \ - -m 214 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args -index 0416d0b..6041e44 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 order=dcna,menu=on -usb -cdrom /dev/cdrom -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args -index c45b8cc..f83c8fd 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 n -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ - none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args -index 3caece8..398629c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S \ - -M pc \ - -m 214 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args -index ad5368c..d7c4139 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/xenner -S \ - -M xenner -m 214 -smp 1 -domid 6 -nographic -monitor unix:/tmp/test-monitor,\ - server,nowait -no-acpi -bootloader /usr/bin/pygrub -usb -cdrom /dev/cdrom -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args -index b65eb14..7a15369 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args -index 061cd45..f7d7409 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args -index 01d2aa2..f2fab0f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args -index df47f84..8ad61f5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test TZ=Europe/Paris \ --/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+TZ=Europe/Paris /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -rtc base=localtime -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args -index 57134af..d43a283 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -localtime -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args -index ee001f6..57fc6e3 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args -index 04e3e8c..d67fbf5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -rtc \ - base=2010-2-2T18:22:10 -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args -index 0662eac..a5a57d6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 pty -parallel \ - none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args -index ac0c4b6..c97f196 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args -index 0662eac..a5a57d6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 pty -parallel \ - none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args -index 86bd82d..e0699b1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M \ - s390-virtio -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args -index ea4cc10..ada1b07 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M \ - s390-ccw -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args -index 1fb2ccb..2c97f45 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args -index 7b7f8f3..b525c24 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M \ - s390-virtio -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args -index 7d158b0..3e5fd1c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args -index 3186645..eed5c4d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args -index 55f3eae..794a14a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args -index f61f733..76c2c48 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args -index f9817eb..0e37379 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args -index f9817eb..0e37379 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args -index 043395c..4ee8391 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args -@@ -2,7 +2,7 @@ LC_ALL=C \ - PATH=/bin \ - HOME=/home/test \ - USER=test \ --LOGNAME=test \ -+LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args -index 817f844..507fcf4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -enable-kvm -cpu host,-kvmclock -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args -index 4aba51f..fc0caba 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args -@@ -2,7 +2,7 @@ LC_ALL=C \ - PATH=/bin \ - HOME=/home/test \ - USER=test \ --LOGNAME=test \ -+LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args -index f4ba2db..2f82dac 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args -@@ -2,7 +2,7 @@ LC_ALL=C \ - PATH=/bin \ - HOME=/home/test \ - USER=test \ --LOGNAME=test \ -+LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args -index 83de5a9..a3fc48f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args -@@ -2,7 +2,7 @@ LC_ALL=C \ - PATH=/bin \ - HOME=/home/test \ - USER=test \ --LOGNAME=test \ -+LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args -index a76f2c2..e5a9f57 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -enable-kvm -cpu core2duo,-kvmclock -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args -index f84fb9f..0630ef4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\ - +acpi,+ds -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,\ - nowait -no-acpi -boot n -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args -index 9ed7b1a..830994f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\ - +acpi,+ds,-lm,-nx,-syscall -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args -index 37736de..418fa44 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 16 -numa node,nodeid=0,cpus=0-7,mem=107 \ - -numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args -index 6da7de6..ca34f73 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 16,sockets=2,cores=4,threads=2 \ - -numa node,nodeid=0,cpus=0-7,mem=107 \ - -numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args -index 18ee92b..8b545a7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+est,+vmx,+ds_cpl,+tm,+ht,+acpi,+ds,-nx \ - -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot n -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args -index ca354d5..732dd20 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 6,sockets=3,cores=2,threads=1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args -index a093826..5f9ca44 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu core2duo -m 214 -smp 6,sockets=1,cores=2,threads=3 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args -index 1f3d5f1..d9fa7b5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args -@@ -1,3 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot n -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args -index 33a7767..bc6d241 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 2 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args -index 278405c..eacaf40 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=none,aio=native -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args -index 5385d9b..33f8714 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args -index a002f89..31ffe59 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - if=ide,media=cdrom,bus=1,unit=0 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args -index 4fae2b0..39cdf59 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/kvm -S \ - -M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ - -drive file=ftp://host.name:21/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args -index 97f5406..2b85ba9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/kvm -S \ - -M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ - -drive file=http://host.name:80/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args -index 762741c..9d7683b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args -index ac0fbe5..f102947 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ - -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args -index f7e55dd..4868042 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -cdrom /root/boot.iso -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args -index cf917fc..da83b18 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args -index 46855ce..7f54d77 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 d -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args -index 7d18216..b36ea95 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args -index 1a9f861..a0e1825 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=directsync -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args -index d469d95..b088c8a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=unsafe -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args -index ad42cd6..cec72bc 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args -index 0889264..c654256 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args -index ad42cd6..cec72bc 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args -index ce1ebd0..e3fe676 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=none -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args -index 4925cc2..345a3f2 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=writeback -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args -index 95eec7c..14d483d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,cache=writethrough -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args -index 0e3fdf0..2ff57f6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ - -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args -index cd77a2f..84e4845 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 control,unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args -index 594a2d8..f577cc8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 control,unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args -index 001631a..9514483 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 control,unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args -index 9a98e81..e4cb986 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=fat:/var/somefiles,if=ide,bus=0,unit=0 -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args -index 7cab3a2..28e0234 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args -index 4274e23..4e772d1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 \ - -drive file=gluster://example.org:6000/Volume1/Image,if=virtio,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args -index c82a299..dd8fee4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 \ - -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args -index 8911524..109f2f8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args -index 84f8d46..605f0d5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 \ - -drive file=iscsi://example.org:6000/iqn.1992-01.com.example,if=virtio,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args -index ca70ce4..8e68f0a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args -index 745efe7..400695f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args -index 0331ff5..6e77ab5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args -index 84cae4a..b7a8491 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args -index 8d0f69f..7ae4579 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args -index 6714553..07a13db 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -drive \ - file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args -index 4544e9e..3acbf05 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args -@@ -1,5 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test CEPH_ARGS=-m \ --mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+CEPH_ARGS=-m mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ - /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ - file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive file=rbd:pool/image,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args -index 6623161..b7435d2 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -drive \ - file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args -index cf433a3..30f8845 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -drive \ - file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args -index e0a5cfa..0b4b460 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMU,,Guest,,,,1,if=ide,bus=0,unit=0,format=raw \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args -index 91386f4..64f0684 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args -index 71274c6..8632300 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ - file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 -device ide-drive,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args -index e13e070..e7d1465 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - file=/dev/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args -index 88cd71e..a049d59 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - format=qcow2,serial=XYZXYZXYZYXXYZYZYXYZY,cache=off -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args -index f1ef167..87d71e2 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -fda /dev/fd0 \ - -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args -index 82a6df5..01d64ec 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args -index d6e6fd7..3f9df0b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -fda /dev/fd0 -fdb \ - /tmp/firmware.img -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args -index 387aed2..a43a0ac 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ - cyls=16383,heads=16,secs=63,trans=lba \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args -index a590579..9ccdd5e 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args -index 3b9693c..bd2fba4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,serial=WD-WMAP9A966149 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args -index 89a3f96..ac96b5f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args -index 8459d87..f6a7d91 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -hdb /dev/HostVG/QEMUGuest2 -hdc \ - /tmp/data.img -hdd /tmp/logs.img -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args -index 09c0b4c..aeacb2d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S \ - -M pc \ - -m 214 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args -index 913ee94..475a0b1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device ahci,id=ahci0,\ - bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args -index ac55b32..d37d429 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\ - bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args -index ac55b32..d37d429 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\ - bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args -index d33407b..87799b2 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args -index f5c1999..aa6e639 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args -index 4cf9dc1..f2e1a95 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args -index cf855c3..163b91d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args -index c4d5f87..f20f25e 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ - megasas,id=scsi0,bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args -index 825c0f1..de53ece 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ - virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args -index 1e61e15..a353b06 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device spapr-vscsi,\ - id=scsi0,reg=0x2000 -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args -index 1f922ed..06b3fd9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args -index 65a8f95..d2b80d7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ - file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 -device ide-drive,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args -index 138b57c..af946de 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -usbdevice disk:/tmp/usbdisk.img \ - -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args -index 92fa433..12db9fb 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args -index a682bb3..970c7b7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args -index 725f4a5..b4d760d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args -index 01ceac2..7b4d24b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args -index 810bffc..4f03a79 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 8 -nographic -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args -index d3a3087..1318ae7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args -index 9e1b46f..ab4bc84 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ - file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args -index 21d05f2..9bf2525 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ - none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args -index 6326f47..63d09fb 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ - none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args -index 6b3e799..92383f0 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args -index 12d1ba7..7b8c42f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 a -usb -drive file=fat:floppy:/var/somefiles,if=floppy,unit=0 -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args -index aceba52..d943a55 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -fsdev local,security_model=passthrough,id=fsdev-fs0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args -index ac9cfc0..67ef88f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args -@@ -1,5 +1,6 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \ -+SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ - 127.0.0.1:3,sasl -vga cirrus -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args -index dd99025..d71a998 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args -@@ -1,5 +1,6 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \ -+SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ - 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args -index b0c59b1..a499e55 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args -@@ -1,4 +1,5 @@ - 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 \ -+QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc -m 214 -smp 1 \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -usb -net none -serial none -parallel none -vnc 127.0.0.1:0,websocket=5700 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args -index 42fd9b9..214b246 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest2 -device pci-assign,host=06:12.5,id=hostdev0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args -index 9d696f5..21e6215 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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/QEMUGuest2 -net none -serial none -parallel \ - none -pcidevice host=06:12.5 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args -index 5cff24b..ae33f07 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args -index 39d5a58..4083a74 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args -index b2d7ea3..bdac202 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args -index 26b78bc..ada5c38 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args -index beb093c..f2cc35d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -usb -hda \ - /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args -index fcadda3..4c73a51 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args -index 2d6af27..5ab1668 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -usbdevice host:14.6 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args -index e6e42de..557b733 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest2 -device vfio-pci,host=06:12.5,id=hostdev0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args -index c4bd9c5..e78dff4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M pc -m 4096 -smp 4 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait \ - -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args -index b327147..d42d9fc 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M \ - pc -m 214 -mem-prealloc -mem-path /dev/hugepages/libvirt/qemu -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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args -index 23d9ecc..363fd2a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S -M pc -cpu qemu32 -m 214 -smp 6 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait \ - -boot n -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args -index df6b207..91b3570 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args -index b43b20e..07ea004 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -device usb-mouse,id=input0,bus=usb.0,port=4 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args -index 3dd8037..160079d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -usbdevice mouse -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args -index 3cd962f..0ab13cb 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -usbdevice tablet -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args -index ac4ed6e..d438f03 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -machine pc-1.0,accel=kvm -m 4096 \ - -smp 4 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args -index c0ac4cc..b7082dd 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M pc \ - -cpu qemu32,-kvmclock,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ - none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args -index 1351551..260006a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S -M pc \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/kvm -S -M pc \ - -cpu qemu32,-kvmclock -m 214 -smp 6 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ - none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args -index 126e4ff..2a2cff0 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -cdrom /root/boot.iso -net none \ - -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args -index 6f48e83..db9a1f2 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-x86_64 -S -M pc-0.11 -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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args -index 1ffcd53..7f84007 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/kvm -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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args -index 67de73a..b590f20 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S -machine pc,accel=tcg,dump-guest-core=off -m 214 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args -index 42d0fdd..7650266 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S -machine pc,accel=tcg,dump-guest-core=on -m 214 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args -index 2a51b27..4f073c5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S -machine pc,accel=tcg,usb=off -m 214 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args -index f0146c7..8bef546 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args -index f0146c7..8bef546 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args -index 010b242..9f7b6b7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -incoming tcp:10.0.0.1:5000 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args -index 2ca3155..6aee214 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M s390-virtio -m 214 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args -index 9a6120b..1e27394 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args -index 4558d77..082add6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args -@@ -1,3 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args -index c80ce4b..418e142 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -global PIIX4_PM.disable_s3=1 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ - -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args -index a45c5a1..e5102f0 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args -index fd701aa..171defa 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -global PIIX4_PM.disable_s4=0 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ - -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args -index afa6ff2..e1c8ebe 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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-reboot -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args -index 05a09f9..bb071c4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 1 \ - -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ - -nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb -hda \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args -index 2a5d94c..5b757d1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 -realtime mlock=off \ - -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args -index bb6de13..8dc82c9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 -realtime mlock=on \ - -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args -index 54dd3b9..e998e7f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args -index ca22df3..0d0b3a7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=control -no-acpi -boot c -usb -hda /dev/hda1 -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args -index 3069659..ed4e981 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args -index 34fab0a..c21cc96 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args -index 6aef307..2cd18ae 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net tap,ifname=nic02,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args -index 57761c5..6146e84 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 -net tap,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args -index 877dac2..28a094b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net tap,script=/etc/qemu-ifup,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args -index da5886e..3a3963c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -usb -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args -index 7ee43a7..184811b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -usb -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args -index ed4f01e..75203db 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,mcast=192.0.0.1:5558,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args -index c92a3ff..0919500 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args -index 814167b..33cd8f4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net user,vlan=0 -serial none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args -index 4a98280..a8d20fd 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args -index 19a6d66..73f2f51 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -device virtio-net-pci,tx=bh,vlan=0,id=net0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args -index 1a4f2db..a71c7ab 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -netdev user,id=hostnet0 -device virtio-net-pci,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args -index 59c53e6..bed03d8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S \ - -M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args -index 0569ef1..0a116e9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 nic,\ - macaddr=00:11:22:33:44:55,vlan=0,model=virtio -net user,vlan=0 -serial none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args -index ca60eed..da009b5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args -@@ -2,7 +2,7 @@ LC_ALL=C \ - PATH=/bin \ - HOME=/home/test \ - USER=test \ --LOGNAME=test \ -+LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ - -S \ - -M pc \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args -index 96ab182..51f90de 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -vga none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args -index ee001f6..57fc6e3 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args -index a32dfe5..9e05c71 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -S -machine pc,accel=tcg,mem-merge=off -m 215 -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 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args -index cc54cc6..dab2c12 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 2 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args -index 66de016..fcfb7de 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args -index 0401407..f7a0d54 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args -index 89def2b..4775b56 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - tcp:127.0.0.1:9999,server,nowait -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args -index b346c72..362cd08 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot c \ - -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args -index bd2706e..3cc5be1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot c \ - -device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args -index b2cf685..893eaa1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-kvm \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-kvm \ - -S -M pc-i440fx-1.4 -cpu qemu64,-kvmclock -bios /usr/share/seabios/bios.bin \ - -m 3907 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args -index cb360f6..c850613 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest2 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args -index 84428f9..af5734d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/libexec/qemu-kvm \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/libexec/qemu-kvm \ - -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args -index 6d33b65..e10ccb1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot c -global q35-pcihost.pci-hole64-size=1048576K \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args -index 3165139..35fbf8f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot c -global i440FX-pcihost.pci-hole64-size=1048576K -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args -index 93e8f9c..fd7e994 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc -S -M ppce500v2 -m 256 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -kernel /media/ram/uImage -initrd /media/ram/ramdisk \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args -index 7b115ec..30e4b43 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic \ - -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args -index 2215796..7c6d610 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-system-ppc64 \ - -S -M pseries -m 512 -smp 1 -nographic \ - -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot c -usb -net none -serial none -parallel none \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args -index a63ba3b..3a21b76 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 \ - -nographic -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args -index 0d8c761..88f3afd 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 \ - -nographic -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args -index d69526e..c62cc9a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc64 \ - -S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args -index 60b31c1..f7c3af0 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-ppc64 \ - -S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args -index 9e67be5..4461eba 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ - -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args -index e69a3b6..7606c1a 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -unknown parameter -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args -index 334eeac..8d42a32 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args -@@ -1,5 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR='' \ --/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+NS=ns BAR='' /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 -unknown \ - parameter -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args -index 1d33d7d..394e9f9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args -@@ -1,3 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot order=n,reboot-timeout=-1 -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args -index 9dd7293..1bbd3ae 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args -@@ -1,3 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ - -no-acpi -boot order=n,reboot-timeout=128 -usb -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args -index 96cfeec..5c67702 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -incoming stdio -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args -index 3260f6e..4999c32 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -incoming fd:7 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args -index fea4179..ade277c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -incoming exec:cat -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args -index 0d53d2b..c09382f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 -nographic \ - -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args -index 753d84f..6d97156 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 \ - -nographic -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args -index f0146c7..8bef546 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args -index 892c6b5..74357f8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args -index 35c3e81..397df23 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args -index f0146c7..8bef546 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args -index f0146c7..8bef546 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args -index 892c6b5..74357f8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu \ - -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -hda /dev/HostVG/QEMUGuest1 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args -index f4a5c6d..dc5bc2b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -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 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args -index 4e71106..1c34dc1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu \ - -name QEMUGuest1 -S -M \ - pc -m 214 -smp 1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args -index 586406e..45487df 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args -index 8b3486d..0eb67a8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 /dev/ttyS2 \ - -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args -index 2fe53f0..ff5aeda 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args -index b7bc08a..847c56f 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - file:/tmp/serial.log -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args -index 964484d..87304c3 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args -index a9dbeab..d73091b 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 pty -serial \ - file:/tmp/serial.log -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args -index ac0c4b6..c97f196 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args -index 0662eac..a5a57d6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 pty -parallel \ - none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args -index 81dff7f..3785682 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args -index 18ac4c7..8061344 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args -index 90131da..b23df34 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - telnet:127.0.0.1:9999,server,nowait -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args -index 0341ff4..747c850 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - tcp:127.0.0.1:9999 -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args -index 6dd89d6..c1539a9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args -index 8f5579e..cd61fa5 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - udp:127.0.0.1:9998@127.0.0.1:9999 -serial udp::9999@:0 -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args -index d2cca23..7634f42 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args -index dcec207..512dead 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 \ - unix:/tmp/serial.sock -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args -index 53fc179..a075627 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev socket,\ - id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ - id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args -index 21ed170..afb0177 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 vc -parallel \ - none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args -index 3d85bf4..5e58867 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args -index b7b14c7..33d3b08 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args -index 3d85bf4..5e58867 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args -index 51a57f5..eed319c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args -index 0bd9baf..c350977 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args -index 1d34b46..e939aca 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \ - -smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ - serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args -index d20ecf3..c7727fc 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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,maxcpus=2,sockets=2,cores=1,threads=1 -nographic -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args -index 7c5f05c..d358453 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args -index 0ae89b1..1aa7486 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -soundhw pcspk,es1370,sb16,ac97 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args -index 81cd95b..fe2d4e4 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.12 -m 2048 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb \ - -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args -index 167f950..2fd8513 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args -index 4252eed..3768dfa 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args -index 080d483..9f97df1 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args -index cf070a1..d66d89e 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args -index 09b66b8..9ce8d31 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args -index 1b2d5c1..ae83650 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args -index bde0ae1..5d53848 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args -index 92ea6dc..eadfdab 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args -index 05bb6ef..a672e7c 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args -index 81d85ba..46e83b9 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args -index 0a61af5..e8efba8 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefconfig -nodefaults \ - -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ - -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args -index ea743e4..8e5eb50 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ - -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args -index d2ac074..a1b2eb6 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu -S -M \ - s390-ccw -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ - socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ - chardev=charmonitor,id=monitor,mode=readline -no-acpi \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args -index a5f04fd..01e9f89 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args -index 8a59011..5530f7d 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args -index 5d296e8..ecd510e 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -+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 -nodefaults \ - -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ - -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args -index cf2ad26..f416525 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -nodefconfig -nodefaults -monitor \ - unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -device ib700,id=watchdog0 -watchdog-action \ -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args -index a4caa0d..a4817e7 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -watchdog ib700 -watchdog-action pause -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args -index 6e792e0..91290bb 100644 ---- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args -+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args -@@ -1,4 +1,5 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -+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 -watchdog ib700 -watchdog-action poweroff -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args -index dbf443f..ad16f43 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 ARGUMENT -diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args -index 29cf9c3..26038a0 100644 ---- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args -+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args -@@ -1,4 +1,4 @@ --LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -+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 diff --git a/0002-domain_conf-Add-default-memballoon-in-PostParse-call.patch b/0002-domain_conf-Add-default-memballoon-in-PostParse-call.patch deleted file mode 100644 index 941ae8f..0000000 --- a/0002-domain_conf-Add-default-memballoon-in-PostParse-call.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1bab38008dbfb16329e73b419fd9871e6f15990c Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:30 -0400 -Subject: [PATCH] domain_conf: Add default memballoon in PostParse callbacks - -This should be a no-op change for now. ---- - src/conf/domain_conf.c | 13 ------------- - src/qemu/qemu_domain.c | 10 ++++++++++ - src/xen/xen_driver.c | 9 +++++++++ - 3 files changed, 19 insertions(+), 13 deletions(-) - -diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c -index f8fbf79..fafbb89 100644 ---- a/src/conf/domain_conf.c -+++ b/src/conf/domain_conf.c -@@ -12184,19 +12184,6 @@ virDomainDefParseXML(xmlDocPtr xml, - - def->memballoon = memballoon; - VIR_FREE(nodes); -- } else { -- if (def->virtType == VIR_DOMAIN_VIRT_XEN || -- def->virtType == VIR_DOMAIN_VIRT_QEMU || -- def->virtType == VIR_DOMAIN_VIRT_KQEMU || -- def->virtType == VIR_DOMAIN_VIRT_KVM) { -- virDomainMemballoonDefPtr memballoon; -- if (VIR_ALLOC(memballoon) < 0) -- goto error; -- memballoon->model = def->virtType == VIR_DOMAIN_VIRT_XEN ? -- VIR_DOMAIN_MEMBALLOON_MODEL_XEN : -- VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; -- def->memballoon = memballoon; -- } - } - - /* Parse the RNG device */ -diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c -index 7f4d17d..9260301 100644 ---- a/src/qemu/qemu_domain.c -+++ b/src/qemu/qemu_domain.c -@@ -784,6 +784,16 @@ qemuDomainDefPostParse(virDomainDefPtr def, - return -1; - } - } -+ -+ if (!def->memballoon) { -+ virDomainMemballoonDefPtr memballoon; -+ if (VIR_ALLOC(memballoon) < 0) -+ return -1; -+ -+ memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; -+ def->memballoon = memballoon; -+ } -+ - return 0; - } - -diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c -index cb64de6..6cb4f4f 100644 ---- a/src/xen/xen_driver.c -+++ b/src/xen/xen_driver.c -@@ -340,6 +340,15 @@ xenDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, - STRNEQ(def->os.type, "hvm")) - dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; - -+ if (!def->memballoon) { -+ virDomainMemballoonDefPtr memballoon; -+ if (VIR_ALLOC(memballoon) < 0) -+ return -1; -+ -+ memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_XEN; -+ def->memballoon = memballoon; -+ } -+ - return 0; - } - diff --git a/0003-qemu-Don-t-add-default-memballoon-device-on-ARM.patch b/0003-qemu-Don-t-add-default-memballoon-device-on-ARM.patch deleted file mode 100644 index b20b418..0000000 --- a/0003-qemu-Don-t-add-default-memballoon-device-on-ARM.patch +++ /dev/null @@ -1,191 +0,0 @@ -From d85bc1315cc00800ed6d4a1baeda9a91c34e52c4 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:31 -0400 -Subject: [PATCH] qemu: Don't add default memballoon device on ARM - -And add test cases for a basic working ARM guest. ---- - docs/schemas/domaincommon.rng | 19 +++++++++++++ - src/qemu/qemu_domain.c | 4 ++- - .../qemuxml2argv-arm-vexpressa9-nodevs.args | 5 ++++ - .../qemuxml2argv-arm-vexpressa9-nodevs.xml | 26 +++++++++++++++++ - tests/qemuxml2argvtest.c | 3 ++ - tests/testutilsqemu.c | 33 ++++++++++++++++++++++ - 6 files changed, 89 insertions(+), 1 deletion(-) - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml - -diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng -index 6978dc7..68c3e4d 100644 ---- a/docs/schemas/domaincommon.rng -+++ b/docs/schemas/domaincommon.rng -@@ -304,6 +304,7 @@ - - - -+ - - - hvm -@@ -413,6 +414,24 @@ - - - -+ -+ -+ -+ -+ -+ armv7l -+ -+ -+ -+ -+ -+ -+ [a-zA-Z0-9_\.\-]+ -+ -+ -+ -+ -+ - - - -diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c -index 9260301..cff6d70 100644 ---- a/src/qemu/qemu_domain.c -+++ b/src/qemu/qemu_domain.c -@@ -703,6 +703,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, - bool addImplicitSATA = false; - bool addPCIRoot = false; - bool addPCIeRoot = false; -+ bool addDefaultMemballoon = true; - - /* check for emulator and create a default one if needed */ - if (!def->emulator && -@@ -737,6 +738,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, - - case VIR_ARCH_ARMV7L: - addDefaultUSB = false; -+ addDefaultMemballoon = false; - break; - - case VIR_ARCH_ALPHA: -@@ -785,7 +787,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, - } - } - -- if (!def->memballoon) { -+ if (addDefaultMemballoon && !def->memballoon) { - virDomainMemballoonDefPtr memballoon; - if (VIR_ALLOC(memballoon) < 0) - return -1; -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args -new file mode 100644 -index 0000000..794dba2 ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args -@@ -0,0 +1,5 @@ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ -+-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ -+-boot c -kernel /arm.kernel -initrd /arm.initrd \ -+-append console=ttyAMA0,115200n8 -dtb /arm.dtb -usb -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml -new file mode 100644 -index 0000000..3f318c8 ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml -@@ -0,0 +1,26 @@ -+ -+ armtest -+ 496d7ea8-9739-544b-4ebd-ef08be936e6a -+ 1048576 -+ 1048576 -+ 1 -+ -+ hvm -+ /arm.kernel -+ /arm.initrd -+ /arm.dtb -+ console=ttyAMA0,115200n8 -+ -+ -+ -+ -+ -+ -+ -+ destroy -+ restart -+ restart -+ -+ /usr/bin/qemu-system-arm -+ -+ -diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c -index 4e3508b..cb6106f 100644 ---- a/tests/qemuxml2argvtest.c -+++ b/tests/qemuxml2argvtest.c -@@ -1057,6 +1057,9 @@ mymain(void) - QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_Q35_PCI_HOLE64_SIZE); - -+ DO_TEST("arm-vexpressa9-nodevs", -+ QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB); -+ - virObjectUnref(driver.config); - virObjectUnref(driver.caps); - virObjectUnref(driver.xmlopt); -diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c -index fac83b2..92433ef 100644 ---- a/tests/testutilsqemu.c -+++ b/tests/testutilsqemu.c -@@ -145,6 +145,36 @@ error: - return -1; - } - -+static int testQemuAddArmGuest(virCapsPtr caps) -+{ -+ static const char *machines[] = { "vexpress-a9", -+ "vexpress-a15", -+ "versatilepb" }; -+ virCapsGuestMachinePtr *capsmachines = NULL; -+ virCapsGuestPtr guest; -+ -+ capsmachines = virCapabilitiesAllocMachines(machines, -+ ARRAY_CARDINALITY(machines)); -+ if (!capsmachines) -+ goto error; -+ -+ guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_ARMV7L, -+ "/usr/bin/qemu-system-arm", NULL, -+ ARRAY_CARDINALITY(machines), -+ capsmachines); -+ if (!guest) -+ goto error; -+ -+ if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL)) -+ goto error; -+ -+ return 0; -+ -+error: -+ virCapabilitiesFreeMachines(capsmachines, ARRAY_CARDINALITY(machines)); -+ return -1; -+} -+ - - virCapsPtr testQemuCapsInit(void) { - virCapsPtr caps; -@@ -270,6 +300,9 @@ virCapsPtr testQemuCapsInit(void) { - if (testQemuAddS390Guest(caps)) - goto cleanup; - -+ if (testQemuAddArmGuest(caps)) -+ goto cleanup; -+ - if (virTestGetDebug()) { - char *caps_str; - diff --git a/0004-qemu-Fix-specifying-char-devs-for-ARM.patch b/0004-qemu-Fix-specifying-char-devs-for-ARM.patch deleted file mode 100644 index a7660d8..0000000 --- a/0004-qemu-Fix-specifying-char-devs-for-ARM.patch +++ /dev/null @@ -1,156 +0,0 @@ -From c72361536b151a2b9bd839bd528671bafbd5dee2 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:32 -0400 -Subject: [PATCH] qemu: Fix specifying char devs for ARM - -QEMU ARM boards don't give us any way to explicitly wire in -a -chardev, so use the old style -serial options. - -Unfortunately this isn't as simple as just turning off the CHARDEV flag -for qemu-system-arm, as upcoming virtio support _will_ use device/chardev. ---- - src/qemu/qemu_capabilities.c | 18 ++++++++++++++++++ - src/qemu/qemu_capabilities.h | 4 ++++ - src/qemu/qemu_command.c | 3 +-- - src/qemu/qemu_process.c | 37 ++++++++++++++++++++++--------------- - 4 files changed, 45 insertions(+), 17 deletions(-) - -diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c -index 7888e2d..72df793 100644 ---- a/src/qemu/qemu_capabilities.c -+++ b/src/qemu/qemu_capabilities.c -@@ -2827,3 +2827,21 @@ virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps) - { - return qemuCaps->usedQMP; - } -+ -+bool -+virQEMUCapsSupportsChardev(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps, -+ virDomainChrDefPtr chr ATTRIBUTE_UNUSED) -+{ -+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || -+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) -+ return false; -+ -+ /* This may not be true for all ARM machine types, but at least -+ * the only supported serial devices of vexpress and versatile -+ * don't have the -chardev property wired up. */ -+ if (def->os.arch != VIR_ARCH_ARMV7L) -+ return false; -+ -+ return true; -+} -diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h -index 69f3395..5180ee9 100644 ---- a/src/qemu/qemu_capabilities.h -+++ b/src/qemu/qemu_capabilities.h -@@ -275,4 +275,8 @@ int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str); - VIR_ENUM_DECL(virQEMUCaps); - - bool virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps); -+bool virQEMUCapsSupportsChardev(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps, -+ virDomainChrDefPtr chr); -+ - #endif /* __QEMU_CAPABILITIES_H__*/ -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index 9dfdb73..a8e532c 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -8493,8 +8493,7 @@ qemuBuildCommandLine(virConnectPtr conn, - char *devstr; - - /* Use -chardev with -device if they are available */ -- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { -+ if (virQEMUCapsSupportsChardev(def, qemuCaps, serial)) { - virCommandAddArg(cmd, "-chardev"); - if (!(devstr = qemuBuildChrChardevStr(&serial->source, - serial->info.alias, -diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c -index dfe8142..abe0060 100644 ---- a/src/qemu/qemu_process.c -+++ b/src/qemu/qemu_process.c -@@ -1604,22 +1604,25 @@ qemuProcessExtractTTYPath(const char *haystack, - } - - static int --qemuProcessLookupPTYs(virDomainChrDefPtr *devices, -+qemuProcessLookupPTYs(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps, -+ virDomainChrDefPtr *devices, - int count, -- virHashTablePtr paths, -- bool chardevfmt) -+ virHashTablePtr paths) - { - size_t i; -- const char *prefix = chardevfmt ? "char" : ""; - - for (i = 0; i < count; i++) { - virDomainChrDefPtr chr = devices[i]; -+ bool chardevfmt = virQEMUCapsSupportsChardev(def, qemuCaps, chr); -+ - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { - char id[32]; - const char *path; - - if (snprintf(id, sizeof(id), "%s%s", -- prefix, chr->info.alias) >= sizeof(id)) -+ chardevfmt ? "char" : "", -+ chr->info.alias) >= sizeof(id)) - return -1; - - path = (const char *) virHashLookup(paths, id); -@@ -1653,19 +1656,21 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, - virQEMUCapsPtr qemuCaps, - virHashTablePtr paths) - { -- bool chardevfmt = virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV); - size_t i = 0; - -- if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, -- paths, chardevfmt) < 0) -+ if (qemuProcessLookupPTYs(vm->def, qemuCaps, -+ vm->def->serials, vm->def->nserials, -+ paths) < 0) - return -1; - -- if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels, -- paths, chardevfmt) < 0) -+ if (qemuProcessLookupPTYs(vm->def, qemuCaps, -+ vm->def->parallels, vm->def->nparallels, -+ paths) < 0) - return -1; - -- if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, -- paths, chardevfmt) < 0) -+ if (qemuProcessLookupPTYs(vm->def, qemuCaps, -+ vm->def->channels, vm->def->nchannels, -+ paths) < 0) - return -1; - /* For historical reasons, console[0] can be just an alias - * for serial[0]. That's why we need to update it as well. */ -@@ -1683,8 +1688,9 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, - } - } - -- if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - i, -- paths, chardevfmt) < 0) -+ if (qemuProcessLookupPTYs(vm->def, qemuCaps, -+ vm->def->consoles + i, vm->def->nconsoles - i, -+ paths) < 0) - return -1; - - return 0; -@@ -1774,7 +1780,8 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, - virHashTablePtr paths = NULL; - qemuDomainObjPrivatePtr priv; - -- if (!virQEMUCapsUsedQMP(qemuCaps) && pos != -1) { -+ if (!virQEMUCapsUsedQMP(qemuCaps) -+ && pos != -1) { - if ((logfd = qemuDomainOpenLog(driver, vm, pos)) < 0) - return -1; - diff --git a/0005-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch b/0005-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch deleted file mode 100644 index e90071f..0000000 --- a/0005-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c8e47add2fe77905523f6112ceb6b844337f6d3f Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:33 -0400 -Subject: [PATCH] qemu: Don't try to allocate PCI addresses for ARM - ---- - src/qemu/qemu_command.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index a8e532c..87345c7 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -1773,6 +1773,16 @@ cleanup: - return ret; - } - -+static bool -+qemuDomainSupportsPCI(virDomainDefPtr def) { -+ if (def->os.arch != VIR_ARCH_ARMV7L) -+ return true; -+ -+ if (STREQ(def->os.machine, "versatilepb")) -+ return true; -+ -+ return false; -+} - - int - qemuDomainAssignPCIAddresses(virDomainDefPtr def, -@@ -1838,8 +1848,10 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, - if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false))) - goto cleanup; - -- if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) -- goto cleanup; -+ if (qemuDomainSupportsPCI(def)) { -+ if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) -+ goto cleanup; -+ } - } - - if (obj && obj->privateData) { diff --git a/0006-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch b/0006-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch deleted file mode 100644 index e5ba752..0000000 --- a/0006-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch +++ /dev/null @@ -1,146 +0,0 @@ -From e534a73a71655d45a0b0af98b4b9b9176d701fb3 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:34 -0400 -Subject: [PATCH] domain_conf: Add disk bus=sd, wire it up for qemu - -This corresponds to '-sd' and '-drive if=sd' on the qemu command line. -Needed for many ARM boards which don't provide any other way to -pass in storage. ---- - docs/formatdomain.html.in | 3 ++- - docs/schemas/domaincommon.rng | 1 + - src/conf/domain_conf.c | 4 +++- - src/conf/domain_conf.h | 1 + - src/qemu/qemu_command.c | 20 +++++++++++++++----- - 5 files changed, 22 insertions(+), 7 deletions(-) - -diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in -index cce179d..af9b4ae 100644 ---- a/docs/formatdomain.html.in -+++ b/docs/formatdomain.html.in -@@ -1785,7 +1785,8 @@ - as a device ordering hint. The optional bus - attribute specifies the type of disk device to emulate; - possible values are driver specific, with typical values being -- "ide", "scsi", "virtio", "xen", "usb" or "sata". If omitted, the bus -+ "ide", "scsi", "virtio", "xen", "usb", "sata", or -+ "sd" "sd" since 1.1.2. If omitted, the bus - type is inferred from the style of the device name (e.g. a device named - 'sda' will typically be exported using a SCSI bus). The optional - attribute tray indicates the tray status of the -diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng -index 68c3e4d..79ea746 100644 ---- a/docs/schemas/domaincommon.rng -+++ b/docs/schemas/domaincommon.rng -@@ -1295,6 +1295,7 @@ - usb - uml - sata -+ sd - - - -diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c -index fafbb89..2c62a2d 100644 ---- a/src/conf/domain_conf.c -+++ b/src/conf/domain_conf.c -@@ -239,7 +239,8 @@ VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST, - "xen", - "usb", - "uml", -- "sata") -+ "sata", -+ "sd") - - VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, - "default", -@@ -17308,6 +17309,7 @@ virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk, - case VIR_DOMAIN_DISK_BUS_USB: - case VIR_DOMAIN_DISK_BUS_VIRTIO: - case VIR_DOMAIN_DISK_BUS_XEN: -+ case VIR_DOMAIN_DISK_BUS_SD: - default: - *busIdx = 0; - *devIdx = idx; -diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h -index 56739b7..380e2bb 100644 ---- a/src/conf/domain_conf.h -+++ b/src/conf/domain_conf.h -@@ -509,6 +509,7 @@ enum virDomainDiskBus { - VIR_DOMAIN_DISK_BUS_USB, - VIR_DOMAIN_DISK_BUS_UML, - VIR_DOMAIN_DISK_BUS_SATA, -+ VIR_DOMAIN_DISK_BUS_SD, - - VIR_DOMAIN_DISK_BUS_LAST - }; -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index 87345c7..6733709 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -73,7 +73,8 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, - "xen", - "usb", - "uml", -- "sata") -+ "sata", -+ "sd") - - - VIR_ENUM_DECL(qemuDiskCacheV1) -@@ -646,6 +647,9 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) - case VIR_DOMAIN_DISK_BUS_XEN: - ret = virAsprintf(&dev_name, "xenblk%d", devid); - break; -+ case VIR_DOMAIN_DISK_BUS_SD: -+ ret = virAsprintf(&dev_name, "sd%d", devid); -+ break; - default: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk name mapping for bus '%s'"), -@@ -3786,7 +3790,9 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, - break; - - case VIR_DOMAIN_DISK_BUS_XEN: -- /* Xen has no address type currently, so assign based on index */ -+ case VIR_DOMAIN_DISK_BUS_SD: -+ /* Xen and SD have no address type currently, so assign -+ * based on index */ - break; - } - -@@ -8190,12 +8196,13 @@ qemuBuildCommandLine(virConnectPtr conn, - virCommandAddArg(cmd, "-drive"); - - /* Unfortunately it is not possible to use -- -device for floppies, or Xen paravirt -+ -device for floppies, xen PV, or SD - devices. Fortunately, those don't need - static PCI addresses, so we don't really - care that we can't use -device */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { -- if (disk->bus != VIR_DOMAIN_DISK_BUS_XEN) { -+ if (disk->bus != VIR_DOMAIN_DISK_BUS_XEN && -+ disk->bus != VIR_DOMAIN_DISK_BUS_SD) { - withDeviceArg = true; - } else { - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE); -@@ -9892,6 +9899,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, - def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO; - else if (STREQ(values[i], "xen")) - def->bus = VIR_DOMAIN_DISK_BUS_XEN; -+ else if (STREQ(values[i], "sd")) -+ def->bus = VIR_DOMAIN_DISK_BUS_SD; - } else if (STREQ(keywords[i], "media")) { - if (STREQ(values[i], "cdrom")) { - def->device = VIR_DOMAIN_DISK_DEVICE_CDROM; -@@ -10041,7 +10050,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, - - if (def->bus == VIR_DOMAIN_DISK_BUS_IDE) { - ignore_value(VIR_STRDUP(def->dst, "hda")); -- } else if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) { -+ } else if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI || -+ def->bus == VIR_DOMAIN_DISK_BUS_SD) { - ignore_value(VIR_STRDUP(def->dst, "sda")); - } else if (def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { - ignore_value(VIR_STRDUP(def->dst, "vda")); diff --git a/0007-qemu-Fix-networking-for-ARM-guests.patch b/0007-qemu-Fix-networking-for-ARM-guests.patch deleted file mode 100644 index cc9b8af..0000000 --- a/0007-qemu-Fix-networking-for-ARM-guests.patch +++ /dev/null @@ -1,206 +0,0 @@ -From b09ab6961b8dd60691839f0b1a5f259925819425 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:35 -0400 -Subject: [PATCH] qemu: Fix networking for ARM guests - -Similar to the chardev bit, ARM boards depend on the old style '-net nic' -for actually instantiating net devices. But we can't block out --netdev altogether since it's needed for upcoming virtio support. - -And add tests for working ARM XML with console, disk, and networking. ---- - src/qemu/qemu_command.c | 34 ++++++++++++++++------ - src/qemu/qemu_domain.c | 20 +++++++++++-- - .../qemuxml2argv-arm-vexpressa9-basic.args | 8 +++++ - .../qemuxml2argv-arm-vexpressa9-basic.xml | 34 ++++++++++++++++++++++ - tests/qemuxml2argvtest.c | 3 ++ - 5 files changed, 88 insertions(+), 11 deletions(-) - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml - -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index 6733709..787381b 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -417,6 +417,26 @@ cleanup: - return ret; - } - -+static bool -+qemuDomainSupportsNicdev(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) -+{ -+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) -+ return false; -+ -+ /* arm boards require legacy -net nic */ -+ if (def->os.arch == VIR_ARCH_ARMV7L) -+ return false; -+ -+ return true; -+} -+ -+static bool -+qemuDomainSupportsNetdev(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) -+{ -+ if (!qemuDomainSupportsNicdev(def, qemuCaps)) -+ return false; -+ return virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV); -+} - - /** - * qemuOpenVhostNet: -@@ -454,8 +474,7 @@ qemuOpenVhostNet(virDomainDefPtr def, - * option), don't try to open the device. - */ - if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_NET) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) { -+ qemuDomainSupportsNetdev(def, qemuCaps))) { - if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("vhost-net is not supported with " -@@ -7312,8 +7331,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - * - * NB, no support for -netdev without use of -device - */ -- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { -+ if (qemuDomainSupportsNetdev(def, qemuCaps)) { - if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, - tapfdName, tapfdSize, -@@ -7321,7 +7339,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - goto cleanup; - virCommandAddArgList(cmd, "-netdev", host, NULL); - } -- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { -+ if (qemuDomainSupportsNicdev(def, qemuCaps)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, -@@ -7333,8 +7351,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - goto cleanup; - virCommandAddArgList(cmd, "-net", nic, NULL); - } -- if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) { -+ if (!qemuDomainSupportsNetdev(def, qemuCaps)) { - if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, - tapfdName, tapfdSize, -@@ -8385,8 +8402,7 @@ qemuBuildCommandLine(virConnectPtr conn, - int vlan; - - /* VLANs are not used with -netdev, so don't record them */ -- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && -- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) -+ if (qemuDomainSupportsNetdev(def, qemuCaps)) - vlan = -1; - else - vlan = i; -diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c -index cff6d70..30588fb 100644 ---- a/src/qemu/qemu_domain.c -+++ b/src/qemu/qemu_domain.c -@@ -799,6 +799,23 @@ qemuDomainDefPostParse(virDomainDefPtr def, - return 0; - } - -+static const char * -+qemuDomainDefaultNetModel(virDomainDefPtr def) { -+ if (def->os.arch == VIR_ARCH_S390 || -+ def->os.arch == VIR_ARCH_S390X) -+ return "virtio"; -+ -+ if (def->os.arch == VIR_ARCH_ARMV7L) { -+ if (STREQ(def->os.machine, "versatilepb")) -+ return "smc91c111"; -+ -+ /* Incomplete. vexpress (and a few others) use this, but not all -+ * arm boards */ -+ return "lan9118"; -+ } -+ -+ return "rtl8139"; -+} - - static int - qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, -@@ -814,8 +831,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, - dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, -- def->os.arch == VIR_ARCH_S390 || -- def->os.arch == VIR_ARCH_S390X ? "virtio" : "rtl8139") < 0) -+ qemuDomainDefaultNetModel(def)) < 0) - goto cleanup; - } - -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args -new file mode 100644 -index 0000000..a23fde4 ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args -@@ -0,0 +1,8 @@ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ -+-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ -+-boot c -kernel /arm.kernel -initrd /arm.initrd -append \ -+'console=ttyAMA0,115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \ -+-dtb /arm.dtb -usb -drive file=/arm.raw,if=sd,index=0 \ -+-net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \ -+-net user,vlan=0,name=hostnet0 -serial pty -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml -new file mode 100644 -index 0000000..ec9374f ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml -@@ -0,0 +1,34 @@ -+ -+ armtest -+ 496d7ea8-9739-544b-4ebd-ef08be936e6a -+ 1048576 -+ 1048576 -+ 1 -+ -+ hvm -+ /arm.kernel -+ /arm.initrd -+ /arm.dtb -+ console=ttyAMA0,115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0 -+ -+ -+ -+ -+ -+ -+ -+ destroy -+ restart -+ restart -+ -+ /usr/bin/qemu-system-arm -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c -index cb6106f..6ecabbf 100644 ---- a/tests/qemuxml2argvtest.c -+++ b/tests/qemuxml2argvtest.c -@@ -1059,6 +1059,9 @@ mymain(void) - - DO_TEST("arm-vexpressa9-nodevs", - QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB); -+ DO_TEST("arm-vexpressa9-basic", -+ QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, -+ QEMU_CAPS_DRIVE); - - virObjectUnref(driver.config); - virObjectUnref(driver.caps); diff --git a/0008-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch b/0008-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch deleted file mode 100644 index f60a794..0000000 --- a/0008-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch +++ /dev/null @@ -1,448 +0,0 @@ -From cddd76962c2a0fcbb8c80240d234b7d0d657324d Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Fri, 30 Aug 2013 12:41:36 -0400 -Subject: [PATCH] qemu: Support virtio-mmio transport for virtio on ARM - -Starting with qemu 1.6, the qemu-system-arm vexpress-a9 model has a -hardcoded virtio-mmio transport which enables attaching all virtio -devices. - -On the command line, we have to use virtio-XXX-device rather than -virtio-XXX-pci, thankfully s390 already set the precedent here so -it's fairly straight forward. - -At the XML level, this adds a new device address type virtio-mmio. -The controller and addressing don't have any subelements at the -moment because we they aren't needed for this usecase, but could -be added later if needed. - -Add a test case for an ARM guest with one of every virtio device -enabled. ---- - src/conf/domain_conf.c | 12 +++- - src/conf/domain_conf.h | 1 + - src/qemu/qemu_capabilities.c | 17 ++++-- - src/qemu/qemu_capabilities.h | 2 + - src/qemu/qemu_command.c | 65 +++++++++++++++++----- - .../qemuxml2argv-arm-vexpressa9-virtio.args | 14 +++++ - .../qemuxml2argv-arm-vexpressa9-virtio.xml | 45 +++++++++++++++ - tests/qemuxml2argvtest.c | 4 ++ - 8 files changed, 139 insertions(+), 21 deletions(-) - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args - create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml - -diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c -index 2c62a2d..3b51ae8 100644 ---- a/src/conf/domain_conf.c -+++ b/src/conf/domain_conf.c -@@ -210,7 +210,8 @@ VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, - "usb", - "spapr-vio", - "virtio-s390", -- "ccw") -+ "ccw", -+ "virtio-mmio") - - VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, - "block", -@@ -2390,6 +2391,7 @@ int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, - return 1; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: -+ case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - return 1; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: -@@ -3031,6 +3033,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf, - info->addr.ccw.devno); - break; - -+ case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: -+ break; -+ - default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown address type '%d'"), info->type); -@@ -3495,6 +3500,9 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, - goto cleanup; - break; - -+ case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: -+ break; -+ - default: - /* Should not happen */ - virReportError(VIR_ERR_INTERNAL_ERROR, -@@ -5827,6 +5835,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && -+ def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Controllers must use the 'pci' address type")); -@@ -6387,6 +6396,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && -+ def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Network interfaces must use 'pci' address type")); -diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h -index 380e2bb..1d70eba 100644 ---- a/src/conf/domain_conf.h -+++ b/src/conf/domain_conf.h -@@ -207,6 +207,7 @@ enum virDomainDeviceAddressType { - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW, -+ VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO, - - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST - }; -diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c -index 72df793..a0f7773 100644 ---- a/src/qemu/qemu_capabilities.c -+++ b/src/qemu/qemu_capabilities.c -@@ -237,6 +237,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, - "dmi-to-pci-bridge", - "i440fx-pci-hole64-size", - "q35-pci-hole64-size", -+ -+ "virtio-mmio", /* 155 */ - ); - - struct _virQEMUCaps { -@@ -1385,6 +1387,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { - { "vfio-pci", QEMU_CAPS_DEVICE_VFIO_PCI }, - { "scsi-generic", QEMU_CAPS_DEVICE_SCSI_GENERIC }, - { "i82801b11-bridge", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE }, -+ { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, - }; - - static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { -@@ -2831,17 +2834,19 @@ virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps) - bool - virQEMUCapsSupportsChardev(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, -- virDomainChrDefPtr chr ATTRIBUTE_UNUSED) -+ virDomainChrDefPtr chr) - { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) - return false; - -- /* This may not be true for all ARM machine types, but at least -- * the only supported serial devices of vexpress and versatile -- * don't have the -chardev property wired up. */ - if (def->os.arch != VIR_ARCH_ARMV7L) -- return false; -+ return true; - -- return true; -+ /* This may not be true for all ARM machine types, but at least -+ * the only supported non-virtio serial devices of vexpress and versatile -+ * don't have the -chardev property wired up. */ -+ return (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO || -+ (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && -+ chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO)); - } -diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h -index 5180ee9..e000ce5 100644 ---- a/src/qemu/qemu_capabilities.h -+++ b/src/qemu/qemu_capabilities.h -@@ -194,6 +194,8 @@ enum virQEMUCapsFlags { - QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ - QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ - -+ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 155, /* -device virtio-mmio */ -+ - QEMU_CAPS_LAST, /* this must always be the last item */ - }; - -diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c -index 787381b..efbfc97 100644 ---- a/src/qemu/qemu_command.c -+++ b/src/qemu/qemu_command.c -@@ -418,22 +418,27 @@ cleanup: - } - - static bool --qemuDomainSupportsNicdev(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) -+qemuDomainSupportsNicdev(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps, -+ virDomainNetDefPtr net) - { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) - return false; - -- /* arm boards require legacy -net nic */ -- if (def->os.arch == VIR_ARCH_ARMV7L) -+ /* non-virtio ARM nics require legacy -net nic */ -+ if (def->os.arch == VIR_ARCH_ARMV7L && -+ net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) - return false; - - return true; - } - - static bool --qemuDomainSupportsNetdev(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) -+qemuDomainSupportsNetdev(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps, -+ virDomainNetDefPtr net) - { -- if (!qemuDomainSupportsNicdev(def, qemuCaps)) -+ if (!qemuDomainSupportsNicdev(def, qemuCaps, net)) - return false; - return virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV); - } -@@ -474,7 +479,7 @@ qemuOpenVhostNet(virDomainDefPtr def, - * option), don't try to open the device. - */ - if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_NET) && -- qemuDomainSupportsNetdev(def, qemuCaps))) { -+ qemuDomainSupportsNetdev(def, qemuCaps, net))) { - if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("vhost-net is not supported with " -@@ -1154,8 +1159,8 @@ cleanup: - } - - static void --qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, -- enum virDomainDeviceAddressType type) -+qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, -+ enum virDomainDeviceAddressType type) - { - /* - declare address-less virtio devices to be of address type 'type' -@@ -1289,7 +1294,7 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, - - if (STREQLEN(def->os.machine, "s390-ccw", 8) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { -- qemuDomainPrimeS390VirtioDevices( -+ qemuDomainPrimeVirtioDeviceAddresses( - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); - - if (!(addrs = qemuDomainCCWAddressSetCreate())) -@@ -1304,7 +1309,7 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, - goto cleanup; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - /* deal with legacy virtio-s390 */ -- qemuDomainPrimeS390VirtioDevices( -+ qemuDomainPrimeVirtioDeviceAddresses( - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); - } - -@@ -1327,6 +1332,18 @@ cleanup: - - return ret; - } -+static int -+qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, -+ virQEMUCapsPtr qemuCaps) -+{ -+ if (def->os.arch == VIR_ARCH_ARMV7L && -+ STRPREFIX(def->os.machine, "vexpress-") && -+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { -+ qemuDomainPrimeVirtioDeviceAddresses( -+ def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); -+ } -+ return 0; -+} - - static int - qemuSpaprVIOFindByReg(virDomainDefPtr def ATTRIBUTE_UNUSED, -@@ -1912,6 +1929,10 @@ int qemuDomainAssignAddresses(virDomainDefPtr def, - if (rc) - return rc; - -+ rc = qemuDomainAssignARMVirtioMMIOAddresses(def, qemuCaps); -+ if (rc) -+ return rc; -+ - return qemuDomainAssignPCIAddresses(def, qemuCaps, obj); - } - -@@ -4367,6 +4388,9 @@ qemuBuildDriveDevStr(virDomainDefPtr def, - } else if (disk->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { - virBufferAddLit(&opt, "virtio-blk-s390"); -+ } else if (disk->info.type == -+ VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) { -+ virBufferAddLit(&opt, "virtio-blk-device"); - } else { - virBufferAddLit(&opt, "virtio-blk-pci"); - } -@@ -4645,6 +4669,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, - else if (def->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) - virBufferAddLit(&buf, "virtio-scsi-s390"); -+ else if (def->info.type == -+ VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) -+ virBufferAddLit(&buf, "virtio-scsi-device"); - else - virBufferAddLit(&buf, "virtio-scsi-pci"); - break; -@@ -4674,6 +4701,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, - } else if (def->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { - virBufferAddLit(&buf, "virtio-serial-s390"); -+ } else if (def->info.type == -+ VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) { -+ virBufferAddLit(&buf, "virtio-serial-device"); - } else { - virBufferAddLit(&buf, "virtio-serial"); - } -@@ -4806,6 +4836,8 @@ qemuBuildNicDevStr(virDomainDefPtr def, - nic = "virtio-net-ccw"; - else if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) - nic = "virtio-net-s390"; -+ else if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) -+ nic = "virtio-net-device"; - else - nic = "virtio-net-pci"; - -@@ -5054,6 +5086,9 @@ qemuBuildMemballoonDevStr(virDomainDefPtr def, - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - virBufferAddLit(&buf, "virtio-balloon-ccw"); - break; -+ case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: -+ virBufferAddLit(&buf, "virtio-balloon-device"); -+ break; - default: - virReportError(VIR_ERR_XML_ERROR, - _("memballoon unsupported with address type '%s'"), -@@ -6055,6 +6090,8 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, - virBufferAsprintf(&buf, "virtio-rng-ccw,rng=%s", dev->info.alias); - else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) - virBufferAsprintf(&buf, "virtio-rng-s390,rng=%s", dev->info.alias); -+ else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) -+ virBufferAsprintf(&buf, "virtio-rng-device,rng=%s", dev->info.alias); - else - virBufferAsprintf(&buf, "virtio-rng-pci,rng=%s", dev->info.alias); - -@@ -7331,7 +7368,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - * - * NB, no support for -netdev without use of -device - */ -- if (qemuDomainSupportsNetdev(def, qemuCaps)) { -+ if (qemuDomainSupportsNetdev(def, qemuCaps, net)) { - if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, - tapfdName, tapfdSize, -@@ -7339,7 +7376,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - goto cleanup; - virCommandAddArgList(cmd, "-netdev", host, NULL); - } -- if (qemuDomainSupportsNicdev(def, qemuCaps)) { -+ if (qemuDomainSupportsNicdev(def, qemuCaps, net)) { - bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; - - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, -@@ -7351,7 +7388,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, - goto cleanup; - virCommandAddArgList(cmd, "-net", nic, NULL); - } -- if (!qemuDomainSupportsNetdev(def, qemuCaps)) { -+ if (!qemuDomainSupportsNetdev(def, qemuCaps, net)) { - if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, - tapfdName, tapfdSize, -@@ -8402,7 +8439,7 @@ qemuBuildCommandLine(virConnectPtr conn, - int vlan; - - /* VLANs are not used with -netdev, so don't record them */ -- if (qemuDomainSupportsNetdev(def, qemuCaps)) -+ if (qemuDomainSupportsNetdev(def, qemuCaps, net)) - vlan = -1; - else - vlan = i; -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args -new file mode 100644 -index 0000000..62de9d3 ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args -@@ -0,0 +1,14 @@ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ -+-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ -+-boot c -kernel /arm.kernel -initrd /arm.initrd -append \ -+'console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0' \ -+-dtb /arm.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ -+-drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ -+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -+-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -+-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ -+-device virtconsole,chardev=charconsole1,id=console1 \ -+-device virtio-balloon-device,id=balloon0 \ -+-object rng-random,id=rng0,filename=/dev/random \ -+-device virtio-rng-device,rng=rng0 -diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml -new file mode 100644 -index 0000000..2acf3c9 ---- /dev/null -+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml -@@ -0,0 +1,45 @@ -+ -+ armtest -+ 496d7ea8-9739-544b-4ebd-ef08be936e6a -+ 1048576 -+ 1048576 -+ 1 -+ -+ hvm -+ /arm.kernel -+ /arm.initrd -+ /arm.dtb -+ console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0 -+ -+ -+ -+ -+ -+ -+ -+ destroy -+ restart -+ restart -+ -+ /usr/bin/qemu-system-arm -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ /dev/random -+ -+ -+ -diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c -index 6ecabbf..ae8cc3b 100644 ---- a/tests/qemuxml2argvtest.c -+++ b/tests/qemuxml2argvtest.c -@@ -1062,6 +1062,10 @@ mymain(void) - DO_TEST("arm-vexpressa9-basic", - QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, - QEMU_CAPS_DRIVE); -+ DO_TEST("arm-vexpressa9-virtio", -+ QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, -+ QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, -+ QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - - virObjectUnref(driver.config); - virObjectUnref(driver.caps); diff --git a/0101-virFileNBDDeviceAssociate-Avoid-use-of-uninitialized.patch b/0101-virFileNBDDeviceAssociate-Avoid-use-of-uninitialized.patch deleted file mode 100644 index 5e8edf9..0000000 --- a/0101-virFileNBDDeviceAssociate-Avoid-use-of-uninitialized.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 580025d7a58ee4c07312d33aa78186dbe7e0d9ee Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -Date: Tue, 3 Sep 2013 18:56:06 +0200 -Subject: [PATCH] virFileNBDDeviceAssociate: Avoid use of uninitialized - variable - -The @qemunbd variable can be used uninitialized. - -(cherry picked from commit 2dba0323ff0cec31bdcea9dd3b2428af297401f2) ---- - src/util/virfile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/virfile.c b/src/util/virfile.c -index 2b07ac9..7af0843 100644 ---- a/src/util/virfile.c -+++ b/src/util/virfile.c -@@ -732,7 +732,7 @@ int virFileNBDDeviceAssociate(const char *file, - char **dev) - { - char *nbddev; -- char *qemunbd; -+ char *qemunbd = NULL; - virCommandPtr cmd = NULL; - int ret = -1; - const char *fmtstr = NULL; diff --git a/0102-Fix-AM_LDFLAGS-typo.patch b/0102-Fix-AM_LDFLAGS-typo.patch deleted file mode 100644 index 5bc3be1..0000000 --- a/0102-Fix-AM_LDFLAGS-typo.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a0ed55a9ab7c90723490363febabd27fa59877c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Sun, 1 Sep 2013 09:53:03 +0200 -Subject: [PATCH] Fix AM_LDFLAGS typo (cherry picked from commit - fe502de3bcdd76a0d256206111945ca7e4f4388a) - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 636bcbc..19dfb81 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1455,7 +1455,7 @@ libvirt_driver_nwfilter_la_CFLAGS = \ - -I$(top_srcdir)/src/access \ - -I$(top_srcdir)/src/conf \ - $(AM_CFLAGS) --libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) -+libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS) - libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) - if WITH_DRIVER_MODULES - libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/0103-Pass-AM_LDFLAGS-to-driver-modules-too.patch b/0103-Pass-AM_LDFLAGS-to-driver-modules-too.patch deleted file mode 100644 index c014fe2..0000000 --- a/0103-Pass-AM_LDFLAGS-to-driver-modules-too.patch +++ /dev/null @@ -1,88 +0,0 @@ -From bd4e7f927fcc2edcba29e441973389ad845d648c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Sun, 1 Sep 2013 08:50:58 +0200 -Subject: [PATCH] Pass AM_LDFLAGS to driver modules too - -This gives us a RO got, otherwise Debian's lintian complains: - -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_vbox.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_xen.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so -W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so -W: libvirt-sanlock: hardening-no-relro usr/lib/libvirt/lock-driver/sanlock.so -(cherry picked from commit f1f0e53b0814aab3c093f1219da95c0f836cdf4a) ---- - src/Makefile.am | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 19dfb81..097682c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1000,7 +1000,7 @@ libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_xen.la - libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_xen_la_LDFLAGS = -module -avoid-version -+libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_xen.la - # Stateful, so linked to daemon instead -@@ -1050,7 +1050,7 @@ libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_vbox.la - libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version -+libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_vbox.la - # GPLv2-only license requries that it be linked into -@@ -1083,7 +1083,7 @@ libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_libxl.la - libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version -+libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_libxl.la - # Stateful, so linked to daemon instead -@@ -1108,7 +1108,7 @@ libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_qemu.la - libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version -+libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_qemu.la - # Stateful, so linked to daemon instead -@@ -1184,7 +1184,7 @@ libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_uml.la - libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_uml_la_LDFLAGS = -module -avoid-version -+libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_uml.la - # Stateful, so linked to daemon instead -@@ -1361,7 +1361,7 @@ libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la - if WITH_DRIVER_MODULES - mod_LTLIBRARIES += libvirt_driver_storage.la - libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la --libvirt_driver_storage_la_LDFLAGS = -module -avoid-version -+libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - else - noinst_LTLIBRARIES += libvirt_driver_storage.la - # Stateful, so linked to daemon instead -@@ -2114,7 +2114,7 @@ if WITH_SANLOCK - lockdriver_LTLIBRARIES += sanlock.la - sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) - sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) --sanlock_la_LDFLAGS = -module -avoid-version -+sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - sanlock_la_LIBADD = -lsanlock_client \ - ../gnulib/lib/libgnu.la - diff --git a/0104-build-fix-build-with-latest-rawhide-kernel-headers.patch b/0104-build-fix-build-with-latest-rawhide-kernel-headers.patch deleted file mode 100644 index 3ebb3c7..0000000 --- a/0104-build-fix-build-with-latest-rawhide-kernel-headers.patch +++ /dev/null @@ -1,125 +0,0 @@ -From bcba68498f698dedfdc83687c72e0e6dd7dc0e96 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Fri, 13 Sep 2013 10:11:26 -0600 -Subject: [PATCH] build: fix build with latest rawhide kernel headers - -Bother those kernel developers. In the latest rawhide, kernel -and glibc have now been unified so that and - no longer clash; but is still -not self-contained. Because of the latest header change, the -build is failing with: - -checking for linux/param.h... no -configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support - -with details: - -In file included from conftest.c:561:0: -/usr/include/linux/in6.h:71:18: error: field 'flr_dst' has incomplete type - struct in6_addr flr_dst; - -We need a workaround to avoid our workaround :) - -* configure.ac (NETINET_LINUX_WORKAROUND): New test. -* src/util/virnetdevbridge.c (includes): Use it. - -Signed-off-by: Eric Blake -(cherry picked from commit e62e0094dcd0ca1484491a9cc62919473b647f11) ---- - configure.ac | 39 +++++++++++++++++++++++++++++---------- - src/util/virnetdevbridge.c | 24 ++++++++++++++---------- - 2 files changed, 43 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f853e03..1956717 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1003,18 +1003,37 @@ dnl check for kernel headers required by src/bridge.c - dnl - if test "$with_linux" = "yes"; then - if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then -+ # Various kernel versions have headers that are not self-standing, but -+ # yet are incompatible with the corresponding glibc headers. In order -+ # to guarantee compilation across a wide range of versions (from RHEL 5 -+ # to rawhide), we first have to probe whether glibc and kernel can be -+ # used in tandem; and if not, provide workarounds that ensure that -+ # ABI-compatible IPv6 types are present for use by the kernel headers. -+ # These probes mirror the usage in virnetdevbridge.c -+ AC_CACHE_CHECK( -+ [whether and headers are compatible], -+ [lv_cv_netinet_linux_compatible], -+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include -+ #include -+ ]])], -+ [lv_cv_netinet_linux_compatible=yes], -+ [lv_cv_netinet_linux_compatible=no])]) -+ if test "x$lv_cv_netinet_linux_compatible" != xyes; then -+ AC_DEFINE([NETINET_LINUX_WORKAROUND], [1], -+ [define to 1 if Linux kernel headers require a workaround to avoid -+ compilation errors when mixed with glibc netinet headers]) -+ fi - AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],, - [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])], -- [[/* The kernel folks broke their headers when used with particular -- * glibc versions; although the structs are ABI compatible, the -- * C type system doesn't like struct redefinitions. We work around -- * the problem here in the same manner as in virnetdevbridge.c. */ -- #include -- #define in6_addr in6_addr_ -- #define sockaddr_in6 sockaddr_in6_ -- #define ipv6_mreq ipv6_mreq_ -- #define in6addr_any in6addr_any_ -- #define in6addr_loopback in6addr_loopback_ -+ [[#include -+ #if NETINET_LINUX_WORKAROUND -+ # define in6_addr in6_addr_ -+ # define sockaddr_in6 sockaddr_in6_ -+ # define ipv6_mreq ipv6_mreq_ -+ # define in6addr_any in6addr_any_ -+ # define in6addr_loopback in6addr_loopback_ -+ #endif - #include - ]]) - fi -diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c -index e4daa27..1a3740a 100644 ---- a/src/util/virnetdevbridge.c -+++ b/src/util/virnetdevbridge.c -@@ -39,22 +39,26 @@ - #ifdef __linux__ - # include - # include /* HZ */ -+# if NETINET_LINUX_WORKAROUND - /* Depending on the version of kernel vs. glibc, there may be a collision - * between and kernel IPv6 structures. The different types - * are ABI compatible, but choke the C type system; work around it by - * using temporary redefinitions. */ --# define in6_addr in6_addr_ --# define sockaddr_in6 sockaddr_in6_ --# define ipv6_mreq ipv6_mreq_ --# define in6addr_any in6addr_any_ --# define in6addr_loopback in6addr_loopback_ -+# define in6_addr in6_addr_ -+# define sockaddr_in6 sockaddr_in6_ -+# define ipv6_mreq ipv6_mreq_ -+# define in6addr_any in6addr_any_ -+# define in6addr_loopback in6addr_loopback_ -+# endif - # include - # include /* SYSFS_BRIDGE_ATTR */ --# undef in6_addr --# undef sockaddr_in6 --# undef ipv6_mreq --# undef in6addr_any --# undef in6addr_loopback -+# if NETINET_LINUX_WORKAROUND -+# undef in6_addr -+# undef sockaddr_in6 -+# undef ipv6_mreq -+# undef in6addr_any -+# undef in6addr_loopback -+# endif - - # define JIFFIES_TO_MS(j) (((j)*1000)/HZ) - # define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) diff --git a/0105-Also-store-user-group-ID-values-in-virIdentity.patch b/0105-Also-store-user-group-ID-values-in-virIdentity.patch deleted file mode 100644 index 464648d..0000000 --- a/0105-Also-store-user-group-ID-values-in-virIdentity.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 2fb7c4d202da975a1498fd205cc3e1bc49595d3c Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Thu, 22 Aug 2013 16:00:01 +0100 -Subject: [PATCH] Also store user & group ID values in virIdentity - -Future improvements to the polkit code will require access to -the numeric user ID, not merely user name. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit db7a5688c05f3fd60d9d2b74c72427eb9ee9c176) ---- - src/rpc/virnetserverclient.c | 18 ++++++++++++++++++ - src/util/viridentity.c | 23 +++++++++++++++++++---- - src/util/viridentity.h | 2 ++ - 3 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c -index 83d5cf1..19c4100 100644 ---- a/src/rpc/virnetserverclient.c -+++ b/src/rpc/virnetserverclient.c -@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) - char *processid = NULL; - char *processtime = NULL; - char *username = NULL; -+ char *userid = NULL; - char *groupname = NULL; -+ char *groupid = NULL; - #if WITH_SASL - char *saslname = NULL; - #endif -@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) - - if (!(username = virGetUserName(uid))) - goto cleanup; -+ if (virAsprintf(&userid, "%d", (int)uid) < 0) -+ goto cleanup; - if (!(groupname = virGetGroupName(gid))) - goto cleanup; -+ if (virAsprintf(&userid, "%d", (int)gid) < 0) -+ goto cleanup; - if (virAsprintf(&processid, "%llu", - (unsigned long long)pid) < 0) - goto cleanup; -@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) - VIR_IDENTITY_ATTR_UNIX_USER_NAME, - username) < 0) - goto error; -+ if (userid && -+ virIdentitySetAttr(ret, -+ VIR_IDENTITY_ATTR_UNIX_USER_ID, -+ userid) < 0) -+ goto error; - if (groupname && - virIdentitySetAttr(ret, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, - groupname) < 0) - goto error; -+ if (groupid && -+ virIdentitySetAttr(ret, -+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, -+ groupid) < 0) -+ goto error; - if (processid && - virIdentitySetAttr(ret, - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, -@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) - - cleanup: - VIR_FREE(username); -+ VIR_FREE(userid); - VIR_FREE(groupname); -+ VIR_FREE(groupid); - VIR_FREE(processid); - VIR_FREE(processtime); - VIR_FREE(seccontext); -diff --git a/src/util/viridentity.c b/src/util/viridentity.c -index 781f660..03c375b 100644 ---- a/src/util/viridentity.c -+++ b/src/util/viridentity.c -@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident) - virIdentityPtr virIdentityGetSystem(void) - { - char *username = NULL; -+ char *userid = NULL; - char *groupname = NULL; -+ char *groupid = NULL; - char *seccontext = NULL; - virIdentityPtr ret = NULL; - #if WITH_SELINUX -@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void) - - if (!(username = virGetUserName(getuid()))) - goto cleanup; -+ if (virAsprintf(&userid, "%d", (int)getuid()) < 0) -+ goto cleanup; -+ - if (!(groupname = virGetGroupName(getgid()))) - goto cleanup; -+ if (virAsprintf(&groupid, "%d", (int)getgid()) < 0) -+ goto cleanup; - - #if WITH_SELINUX - if (getcon(&con) < 0) { -@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void) - if (!(ret = virIdentityNew())) - goto cleanup; - -- if (username && -- virIdentitySetAttr(ret, -+ if (virIdentitySetAttr(ret, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, - username) < 0) - goto error; -- if (groupname && -- virIdentitySetAttr(ret, -+ if (virIdentitySetAttr(ret, -+ VIR_IDENTITY_ATTR_UNIX_USER_ID, -+ userid) < 0) -+ goto error; -+ if (virIdentitySetAttr(ret, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, - groupname) < 0) - goto error; -+ if (virIdentitySetAttr(ret, -+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, -+ groupid) < 0) -+ goto error; - if (seccontext && - virIdentitySetAttr(ret, - VIR_IDENTITY_ATTR_SELINUX_CONTEXT, -@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void) - - cleanup: - VIR_FREE(username); -+ VIR_FREE(userid); - VIR_FREE(groupname); -+ VIR_FREE(groupid); - VIR_FREE(seccontext); - VIR_FREE(processid); - return ret; -diff --git a/src/util/viridentity.h b/src/util/viridentity.h -index 4bae8d6..a240c2d 100644 ---- a/src/util/viridentity.h -+++ b/src/util/viridentity.h -@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr; - - typedef enum { - VIR_IDENTITY_ATTR_UNIX_USER_NAME, -+ VIR_IDENTITY_ATTR_UNIX_USER_ID, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, -+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, - VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, - VIR_IDENTITY_ATTR_SASL_USER_NAME, diff --git a/0106-Ensure-system-identity-includes-process-start-time.patch b/0106-Ensure-system-identity-includes-process-start-time.patch deleted file mode 100644 index 522c422..0000000 --- a/0106-Ensure-system-identity-includes-process-start-time.patch +++ /dev/null @@ -1,68 +0,0 @@ -From fe544fd4c18d6982e652a1d5cd016816c609b72c Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Wed, 28 Aug 2013 15:22:05 +0100 -Subject: [PATCH] Ensure system identity includes process start time - -The polkit access driver will want to use the process start -time field. This was already set for network identities, but -not for the system identity. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit e65667c0c6e016d42abea077e31628ae43f57b74) ---- - src/util/viridentity.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/util/viridentity.c b/src/util/viridentity.c -index 03c375b..f681f85 100644 ---- a/src/util/viridentity.c -+++ b/src/util/viridentity.c -@@ -35,6 +35,7 @@ - #include "virthread.h" - #include "virutil.h" - #include "virstring.h" -+#include "virprocess.h" - - #define VIR_FROM_THIS VIR_FROM_IDENTITY - -@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void) - security_context_t con; - #endif - char *processid = NULL; -+ unsigned long long timestamp; -+ char *processtime = NULL; - - if (virAsprintf(&processid, "%llu", - (unsigned long long)getpid()) < 0) - goto cleanup; - -+ if (virProcessGetStartTime(getpid(), ×tamp) < 0) -+ goto cleanup; -+ -+ if (timestamp != 0 && -+ virAsprintf(&processtime, "%llu", timestamp) < 0) -+ goto cleanup; -+ - if (!(username = virGetUserName(getuid()))) - goto cleanup; - if (virAsprintf(&userid, "%d", (int)getuid()) < 0) -@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void) - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, - processid) < 0) - goto error; -+ if (processtime && -+ virIdentitySetAttr(ret, -+ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, -+ processtime) < 0) -+ goto error; - - cleanup: - VIR_FREE(username); -@@ -206,6 +221,7 @@ cleanup: - VIR_FREE(groupid); - VIR_FREE(seccontext); - VIR_FREE(processid); -+ VIR_FREE(processtime); - return ret; - - error: diff --git a/0107-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/0107-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch deleted file mode 100644 index 4fd9327..0000000 --- a/0107-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch +++ /dev/null @@ -1,178 +0,0 @@ -From dcba8ce65b0ee9f18dca6ac4bdbb57f5cbcc75c6 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Wed, 28 Aug 2013 15:25:40 +0100 -Subject: [PATCH] Add support for using 3-arg pkcheck syntax for process - (CVE-2013-4311) - -With the existing pkcheck (pid, start time) tuple for identifying -the process, there is a race condition, where a process can make -a libvirt RPC call and in another thread exec a setuid application, -causing it to change to effective UID 0. This in turn causes polkit -to do its permission check based on the wrong UID. - -To address this, libvirt must get the UID the caller had at time -of connect() (from SO_PEERCRED) and pass a (pid, start time, uid) -triple to the pkcheck program. - -This fix requires that libvirt is re-built against a version of -polkit that has the fix for its CVE-2013-4288, so that libvirt -can see 'pkg-config --variable pkcheck_supports_uid polkit-gobject-1' - -Signed-off-by: Colin Walters -Signed-off-by: Daniel P. Berrange -(cherry picked from commit 922b7fda77b094dbf022d625238262ea05335666) ---- - configure.ac | 8 ++++++++ - daemon/remote.c | 22 ++++++++++++++++++--- - libvirt.spec.in | 3 +-- - src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++----- - 4 files changed, 63 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1956717..8baf6fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1203,6 +1203,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then - AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH]) - if test "x$PKCHECK_PATH" != "x" ; then - AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program]) -+ AC_MSG_CHECKING([whether pkcheck supports uid value]) -+ pkcheck_supports_uid=`$PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1` -+ if test "x$pkcheck_supports_uid" = "xtrue"; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck]) -+ else -+ AC_MSG_RESULT([no]) -+ fi - AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, - [use PolicyKit for UNIX socket access checks]) - AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1, -diff --git a/daemon/remote.c b/daemon/remote.c -index 6ace7af..b5395dd 100644 ---- a/daemon/remote.c -+++ b/daemon/remote.c -@@ -2738,10 +2738,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - int status = -1; - char *ident = NULL; - bool authdismissed = 0; -+ bool supportsuid = false; - char *pkout = NULL; - struct daemonClientPrivate *priv = - virNetServerClientGetPrivateData(client); - virCommandPtr cmd = NULL; -+ static bool polkitInsecureWarned; - - virMutexLock(&priv->lock); - action = virNetServerClientGetReadonly(client) ? -@@ -2763,14 +2765,28 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - goto authfail; - } - -+ if (timestamp == 0) { -+ VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time", -+ (long long)callerPid); -+ goto authfail; -+ } -+ - VIR_INFO("Checking PID %lld running as %d", - (long long) callerPid, callerUid); - - virCommandAddArg(cmd, "--process"); -- if (timestamp != 0) { -- virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); -+# ifdef PKCHECK_SUPPORTS_UID -+ supportsuid = true; -+# endif -+ if (supportsuid) { -+ virCommandAddArgFormat(cmd, "%lld,%llu,%lu", -+ (long long) callerPid, timestamp, (unsigned long) callerUid); - } else { -- virCommandAddArgFormat(cmd, "%lld", (long long) callerPid); -+ if (!polkitInsecureWarned) { -+ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); -+ polkitInsecureWarned = true; -+ } -+ virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); - } - virCommandAddArg(cmd, "--allow-user-interaction"); - -diff --git a/libvirt.spec.in b/libvirt.spec.in -index e94901a..b9c8c91 100644 ---- a/libvirt.spec.in -+++ b/libvirt.spec.in -@@ -508,8 +508,7 @@ BuildRequires: cyrus-sasl-devel - %endif - %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 --# Only need the binary, not -devel --BuildRequires: polkit >= 0.93 -+BuildRequires: polkit-devel >= 0.93 - %else - BuildRequires: PolicyKit-devel >= 0.6 - %endif -diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c -index 4c76e64..bb170b5 100644 ---- a/src/access/viraccessdriverpolkit.c -+++ b/src/access/viraccessdriverpolkit.c -@@ -72,8 +72,12 @@ static char * - virAccessDriverPolkitFormatProcess(const char *actionid) - { - virIdentityPtr identity = virIdentityGetCurrent(); -- const char *process = NULL; -+ const char *callerPid = NULL; -+ const char *callerTime = NULL; -+ const char *callerUid = NULL; - char *ret = NULL; -+ bool supportsuid = false; -+ static bool polkitInsecureWarned; - - if (!identity) { - virAccessError(VIR_ERR_ACCESS_DENIED, -@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid) - actionid); - return NULL; - } -- if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0) -+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0) -+ goto cleanup; -+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0) -+ goto cleanup; -+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0) - goto cleanup; - -- if (!process) { -+ if (!callerPid) { - virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No UNIX process ID available")); - goto cleanup; - } -- -- if (VIR_STRDUP(ret, process) < 0) -+ if (!callerTime) { -+ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("No UNIX process start time available")); -+ goto cleanup; -+ } -+ if (!callerUid) { -+ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", -+ _("No UNIX caller UID available")); - goto cleanup; -+ } -+ -+#ifdef PKCHECK_SUPPORTS_UID -+ supportsuid = true; -+#endif -+ if (supportsuid) { -+ if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) -+ goto cleanup; -+ } else { -+ if (!polkitInsecureWarned) { -+ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); -+ polkitInsecureWarned = true; -+ } -+ if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) -+ goto cleanup; -+ } - - cleanup: - virObjectUnref(identity); diff --git a/0108-Fix-crash-in-remoteDispatchDomainMemoryStats-CVE-201.patch b/0108-Fix-crash-in-remoteDispatchDomainMemoryStats-CVE-201.patch deleted file mode 100644 index 909bfc4..0000000 --- a/0108-Fix-crash-in-remoteDispatchDomainMemoryStats-CVE-201.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3bee40f9bd3b3c11d782b79eb90f46087d3ab9be Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Tue, 3 Sep 2013 16:52:06 +0100 -Subject: [PATCH] Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) - -The 'stats' variable was not initialized to NULL, so if some -early validation of the RPC call fails, it is possible to jump -to the 'cleanup' label and VIR_FREE an uninitialized pointer. -This is a security flaw, since the API can be called from a -readonly connection which can trigger the validation checks. - -This was introduced in release v0.9.1 onwards by - - commit 158ba8730e44b7dd07a21ab90499996c5dec080a - Author: Daniel P. Berrange - Date: Wed Apr 13 16:21:35 2011 +0100 - - Merge all returns paths from dispatcher into single path - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit e7f400a110e2e3673b96518170bfea0855dd82c0) ---- - daemon/remote.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/daemon/remote.c b/daemon/remote.c -index b5395dd..afd9fb5 100644 ---- a/daemon/remote.c -+++ b/daemon/remote.c -@@ -1146,7 +1146,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, - remote_domain_memory_stats_ret *ret) - { - virDomainPtr dom = NULL; -- struct _virDomainMemoryStat *stats; -+ struct _virDomainMemoryStat *stats = NULL; - int nr_stats; - size_t i; - int rv = -1; diff --git a/0109-virsh-add-missing-async-option-in-opts_block_commit.patch b/0109-virsh-add-missing-async-option-in-opts_block_commit.patch deleted file mode 100644 index d6e8f4b..0000000 --- a/0109-virsh-add-missing-async-option-in-opts_block_commit.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f19543baee399bf6b3d91da38fa0b7025f233dee Mon Sep 17 00:00:00 2001 -From: Simone Gotti -Date: Thu, 19 Sep 2013 15:08:29 +0200 -Subject: [PATCH] virsh: add missing "async" option in opts_block_commit - -After commit 8aecd351266a66efa59b7f7be77bf66693d99ce0 it'll detect -that a required option is not defined and it will assert and exit with: - -virsh.c:1364: vshCommandOpt: Assertion `valid->name' failed. - -Problem has been latent since commit ed23b106. - -Signed-off-by: Eric Blake -(cherry picked from commit fe64499dd14315b2d9d62cdf421bd3c97a46b7ac) ---- - tools/virsh-domain.c | 4 ++++ - tools/virsh.pod | 7 +++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c -index 568d61d..da6ab87 100644 ---- a/tools/virsh-domain.c -+++ b/tools/virsh-domain.c -@@ -1544,6 +1544,10 @@ static const vshCmdOptDef opts_block_commit[] = { - .type = VSH_OT_INT, - .help = N_("with --wait, abort if copy exceeds timeout (in seconds)") - }, -+ {.name = "async", -+ .type = VSH_OT_BOOL, -+ .help = N_("with --wait, don't wait for cancel to finish") -+ }, - {.name = NULL} - }; - -diff --git a/tools/virsh.pod b/tools/virsh.pod -index 0ae5178..2864f3d 100644 ---- a/tools/virsh.pod -+++ b/tools/virsh.pod -@@ -737,7 +737,7 @@ I) will accept the MAC address printed by this command. - - =item B I I [I] - {[I] | [I<--shallow>]} [I] [I<--delete>] --[I<--wait> [I<--verbose>] [I<--timeout> B]] -+[I<--wait> [I<--verbose>] [I<--timeout> B] [I<--async>]] - - Reduce the length of a backing image chain, by committing changes at the - top of the chain (snapshot or delta files) into backing images. By -@@ -756,7 +756,10 @@ operation can be checked with B. However, if I<--wait> is - specified, then this command will block until the operation completes, - or cancel the operation if the optional I in seconds elapses - or SIGINT is sent (usually with C). Using I<--verbose> along --with I<--wait> will produce periodic status updates. -+with I<--wait> will produce periodic status updates. If job cancellation -+is triggered, I<--async> will return control to the user as fast as -+possible, otherwise the command may continue to block a little while -+longer until the job is done cleaning up. - - I specifies fully-qualified path of the disk; it corresponds - to a unique target name () or source file ( -Date: Mon, 23 Sep 2013 12:46:25 +0100 -Subject: [PATCH] Fix typo in identity code which is pre-requisite for - CVE-2013-4311 - -The fix for CVE-2013-4311 had a pre-requisite enhancement -to the identity code - - commit db7a5688c05f3fd60d9d2b74c72427eb9ee9c176 - Author: Daniel P. Berrange - Date: Thu Aug 22 16:00:01 2013 +0100 - - Also store user & group ID values in virIdentity - -This had a typo which caused the group ID to overwrite the -user ID string. This meant any checks using this would have -the wrong ID value. This only affected the ACL code, not the -initial polkit auth. It also leaked memory. - -Signed-off-by: Daniel P. Berrange ---- - src/rpc/virnetserverclient.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c -index 19c4100..0b9ab52 100644 ---- a/src/rpc/virnetserverclient.c -+++ b/src/rpc/virnetserverclient.c -@@ -678,7 +678,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) - goto cleanup; - if (!(groupname = virGetGroupName(gid))) - goto cleanup; -- if (virAsprintf(&userid, "%d", (int)gid) < 0) -+ if (virAsprintf(&groupid, "%d", (int)gid) < 0) - goto cleanup; - if (virAsprintf(&processid, "%llu", - (unsigned long long)pid) < 0) diff --git a/0111-Add-a-virNetSocketNewConnectSockFD-method.patch b/0111-Add-a-virNetSocketNewConnectSockFD-method.patch deleted file mode 100644 index 7cf7f56..0000000 --- a/0111-Add-a-virNetSocketNewConnectSockFD-method.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9e7cec4d755341cfb4c27c16aa59b22135612f0e Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Mon, 23 Sep 2013 12:46:26 +0100 -Subject: [PATCH] Add a virNetSocketNewConnectSockFD method - -To allow creation of a virNetSocketPtr instance from a pre-opened -socketpair FD, add a virNetSocketNewConnectSockFD method. - -Signed-off-by: Daniel P. Berrange ---- - src/libvirt_private.syms | 1 + - src/rpc/virnetsocket.c | 18 ++++++++++++++++++ - src/rpc/virnetsocket.h | 2 ++ - 3 files changed, 21 insertions(+) - -diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms -index 35f0f1b..873d93d 100644 ---- a/src/libvirt_private.syms -+++ b/src/libvirt_private.syms -@@ -1008,6 +1008,7 @@ virNetSocketLocalAddrString; - virNetSocketNewConnectCommand; - virNetSocketNewConnectExternal; - virNetSocketNewConnectLibSSH2; -+virNetSocketNewConnectSockFD; - virNetSocketNewConnectSSH; - virNetSocketNewConnectTCP; - virNetSocketNewConnectUNIX; -diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c -index ae81512..b311aae 100644 ---- a/src/rpc/virnetsocket.c -+++ b/src/rpc/virnetsocket.c -@@ -884,6 +884,24 @@ int virNetSocketNewConnectExternal(const char **cmdargv, - } - - -+int virNetSocketNewConnectSockFD(int sockfd, -+ virNetSocketPtr *retsock) -+{ -+ virSocketAddr localAddr; -+ -+ localAddr.len = sizeof(localAddr.data); -+ if (getsockname(sockfd, &localAddr.data.sa, &localAddr.len) < 0) { -+ virReportSystemError(errno, "%s", _("Unable to get local socket name")); -+ return -1; -+ } -+ -+ if (!(*retsock = virNetSocketNew(&localAddr, NULL, true, sockfd, -1, -1))) -+ return -1; -+ -+ return 0; -+} -+ -+ - virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object) - { - virSocketAddr localAddr; -diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h -index ca9ae91..86bc2f6 100644 ---- a/src/rpc/virnetsocket.h -+++ b/src/rpc/virnetsocket.h -@@ -97,6 +97,8 @@ int virNetSocketNewConnectLibSSH2(const char *host, - int virNetSocketNewConnectExternal(const char **cmdargv, - virNetSocketPtr *addr); - -+int virNetSocketNewConnectSockFD(int sockfd, -+ virNetSocketPtr *retsock); - - virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object); - diff --git a/0112-Add-test-case-for-virNetServerClient-object-identity.patch b/0112-Add-test-case-for-virNetServerClient-object-identity.patch deleted file mode 100644 index 1b07c7e..0000000 --- a/0112-Add-test-case-for-virNetServerClient-object-identity.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 7e1b75ca5d4127a86ff1eaa0dfe37b485eeb0a7a Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Mon, 23 Sep 2013 12:46:27 +0100 -Subject: [PATCH] Add test case for virNetServerClient object identity code - -Start a test case for the virNetServerClient object, which -initially checks the creation of a virIdentityPtr object. - -Signed-off-by: Daniel P. Berrange ---- - cfg.mk | 2 +- - tests/Makefile.am | 14 +++- - tests/virnetserverclientmock.c | 64 +++++++++++++++++ - tests/virnetserverclienttest.c | 159 +++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 237 insertions(+), 2 deletions(-) - create mode 100644 tests/virnetserverclientmock.c - create mode 100644 tests/virnetserverclienttest.c - -diff --git a/cfg.mk b/cfg.mk -index 9a9616c..7f817ef 100644 ---- a/cfg.mk -+++ b/cfg.mk -@@ -939,7 +939,7 @@ exclude_file_name_regexp--sc_prohibit_asprintf = \ - ^(bootstrap.conf$$|src/util/virstring\.[ch]$$|examples/domain-events/events-c/event-test\.c$$|tests/vircgroupmock\.c$$) - - exclude_file_name_regexp--sc_prohibit_strdup = \ -- ^(docs/|examples/|python/|src/util/virstring\.c$$) -+ ^(docs/|examples/|python/|src/util/virstring\.c|tests/virnetserverclientmock.c$$) - - exclude_file_name_regexp--sc_prohibit_close = \ - (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vircgroupmock\.c)$$) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c800179..ae99b38 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -114,7 +114,7 @@ test_programs = virshtest sockettest \ - nodeinfotest virbuftest \ - commandtest seclabeltest \ - virhashtest virnetmessagetest virnetsockettest \ -- viratomictest \ -+ viratomictest virnetserverclienttest \ - utiltest shunloadtest \ - virtimetest viruritest virkeyfiletest \ - virauthconfigtest \ -@@ -281,6 +281,7 @@ EXTRA_DIST += $(test_scripts) - - test_libraries = libshunload.la \ - libvirportallocatormock.la \ -+ virnetserverclientmock.la \ - vircgroupmock.la \ - $(NULL) - if WITH_QEMU -@@ -611,6 +612,17 @@ virnetsockettest_SOURCES = \ - virnetsockettest.c testutils.h testutils.c - virnetsockettest_LDADD = $(LDADDS) - -+virnetserverclienttest_SOURCES = \ -+ virnetserverclienttest.c \ -+ testutils.h testutils.c -+virnetserverclienttest_LDADD = $(LDADDS) -+ -+virnetserverclientmock_la_SOURCES = \ -+ virnetserverclientmock.c -+virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) -+virnetserverclientmock_la_LDFLAGS = -module -avoid-version \ -+ -rpath /evil/libtool/hack/to/force/shared/lib/creation -+ - if WITH_GNUTLS - virnettlscontexttest_SOURCES = \ - virnettlscontexttest.c \ -diff --git a/tests/virnetserverclientmock.c b/tests/virnetserverclientmock.c -new file mode 100644 -index 0000000..caef1e3 ---- /dev/null -+++ b/tests/virnetserverclientmock.c -@@ -0,0 +1,64 @@ -+/* -+ * Copyright (C) 2013 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see -+ * . -+ * -+ * Author: Daniel P. Berrange -+ */ -+ -+#include -+ -+#include "rpc/virnetsocket.h" -+#include "virutil.h" -+#include "internal.h" -+ -+int virEventAddTimeout(int frequency ATTRIBUTE_UNUSED, -+ virEventTimeoutCallback cb ATTRIBUTE_UNUSED, -+ void *opaque ATTRIBUTE_UNUSED, -+ virFreeCallback ff ATTRIBUTE_UNUSED) -+{ -+ return 0; -+} -+ -+int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, -+ uid_t *uid, -+ gid_t *gid, -+ pid_t *pid, -+ unsigned long long *timestamp) -+{ -+ *uid = 666; -+ *gid = 7337; -+ *pid = 42; -+ *timestamp = 12345678; -+ return 0; -+} -+ -+char *virGetUserName(uid_t uid ATTRIBUTE_UNUSED) -+{ -+ return strdup("astrochicken"); -+} -+ -+char *virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) -+{ -+ return strdup("fictionalusers"); -+} -+ -+int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, -+ char **context) -+{ -+ if (!(*context = strdup("foo_u:bar_r:wizz_t:s0-s0:c0.c1023"))) -+ return -1; -+ return 0; -+} -diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c -new file mode 100644 -index 0000000..1ddff3e ---- /dev/null -+++ b/tests/virnetserverclienttest.c -@@ -0,0 +1,159 @@ -+/* -+ * Copyright (C) 2013 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see -+ * . -+ * -+ * Author: Daniel P. Berrange -+ */ -+ -+#include -+ -+#include "testutils.h" -+#include "virerror.h" -+#include "rpc/virnetserverclient.h" -+ -+#define VIR_FROM_THIS VIR_FROM_RPC -+ -+#ifdef HAVE_SOCKETPAIR -+static int testIdentity(const void *opaque ATTRIBUTE_UNUSED) -+{ -+ int sv[2]; -+ int ret = -1; -+ virNetSocketPtr sock = NULL; -+ virNetServerClientPtr client = NULL; -+ virIdentityPtr ident = NULL; -+ const char *gotUsername = NULL; -+ const char *gotUserID = NULL; -+ const char *gotGroupname = NULL; -+ const char *gotGroupID = NULL; -+ const char *gotSELinuxContext = NULL; -+ -+ if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) { -+ virReportSystemError(errno, "%s", -+ "Cannot create socket pair"); -+ return -1; -+ } -+ -+ if (virNetSocketNewConnectSockFD(sv[0], &sock) < 0) { -+ virDispatchError(NULL); -+ goto cleanup; -+ } -+ sv[0] = -1; -+ -+ if (!(client = virNetServerClientNew(sock, 0, false, 1, -+# ifdef WITH_GNUTLS -+ NULL, -+# endif -+ NULL, NULL, NULL, NULL))) { -+ virDispatchError(NULL); -+ goto cleanup; -+ } -+ -+ if (!(ident = virNetServerClientGetIdentity(client))) { -+ fprintf(stderr, "Failed to create identity\n"); -+ goto cleanup; -+ } -+ -+ if (virIdentityGetAttr(ident, -+ VIR_IDENTITY_ATTR_UNIX_USER_NAME, -+ &gotUsername) < 0) { -+ fprintf(stderr, "Missing username in identity\n"); -+ goto cleanup; -+ } -+ if (STRNEQ_NULLABLE("astrochicken", gotUsername)) { -+ fprintf(stderr, "Want username 'astrochicken' got '%s'\n", -+ NULLSTR(gotUsername)); -+ goto cleanup; -+ } -+ -+ if (virIdentityGetAttr(ident, -+ VIR_IDENTITY_ATTR_UNIX_USER_ID, -+ &gotUserID) < 0) { -+ fprintf(stderr, "Missing user ID in identity\n"); -+ goto cleanup; -+ } -+ if (STRNEQ_NULLABLE("666", gotUserID)) { -+ fprintf(stderr, "Want username '666' got '%s'\n", -+ NULLSTR(gotUserID)); -+ goto cleanup; -+ } -+ -+ if (virIdentityGetAttr(ident, -+ VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, -+ &gotGroupname) < 0) { -+ fprintf(stderr, "Missing groupname in identity\n"); -+ goto cleanup; -+ } -+ if (STRNEQ_NULLABLE("fictionalusers", gotGroupname)) { -+ fprintf(stderr, "Want groupname 'fictionalusers' got '%s'\n", -+ NULLSTR(gotGroupname)); -+ goto cleanup; -+ } -+ -+ if (virIdentityGetAttr(ident, -+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID, -+ &gotGroupID) < 0) { -+ fprintf(stderr, "Missing group ID in identity\n"); -+ goto cleanup; -+ } -+ if (STRNEQ_NULLABLE("7337", gotGroupID)) { -+ fprintf(stderr, "Want groupname '7337' got '%s'\n", -+ NULLSTR(gotGroupID)); -+ goto cleanup; -+ } -+ -+ if (virIdentityGetAttr(ident, -+ VIR_IDENTITY_ATTR_SELINUX_CONTEXT, -+ &gotSELinuxContext) < 0) { -+ fprintf(stderr, "Missing SELinux context in identity\n"); -+ goto cleanup; -+ } -+ if (STRNEQ_NULLABLE("foo_u:bar_r:wizz_t:s0-s0:c0.c1023", gotSELinuxContext)) { -+ fprintf(stderr, "Want groupname 'foo_u:bar_r:wizz_t:s0-s0:c0.c1023' got '%s'\n", -+ NULLSTR(gotGroupID)); -+ goto cleanup; -+ } -+ -+ ret = 0; -+ cleanup: -+ virObjectUnref(sock); -+ virObjectUnref(client); -+ virObjectUnref(ident); -+ VIR_FORCE_CLOSE(sv[0]); -+ VIR_FORCE_CLOSE(sv[1]); -+ return ret; -+} -+ -+ -+static int -+mymain(void) -+{ -+ int ret = 0; -+ -+ -+ if (virtTestRun("Identity", 1, -+ testIdentity, NULL) < 0) -+ ret = -1; -+ -+ return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -+} -+#else -+static int -+mymain(void) -+{ -+ return AM_TEST_SKIP; -+} -+#endif -+VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetserverclientmock.so") diff --git a/0201-qemu-Fix-checking-of-ABI-stability-when-restoring-ex.patch b/0201-qemu-Fix-checking-of-ABI-stability-when-restoring-ex.patch deleted file mode 100644 index 75e024c..0000000 --- a/0201-qemu-Fix-checking-of-ABI-stability-when-restoring-ex.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 08a0e5d5ab9a0254045e6b6304bfdb7061f5e249 Mon Sep 17 00:00:00 2001 -From: Peter Krempa -Date: Mon, 16 Sep 2013 13:37:34 +0200 -Subject: [PATCH] qemu: Fix checking of ABI stability when restoring external - checkpoints - -External checkpoints have a bug in the implementation where they use the -normal definition instead of the "migratable" one. This causes errors -when the snapshot is being reverted using the workaround method via -qemuDomainRestoreFlags() with a custom XML. This issue was introduced -when commit 07966f6a8b5ccb5bb4c716b25deb8ba2e572cc67 changed the code to -compare "migratable" XMLs from the user as we should have used -migratable in the image too. - -This patch adds a compatibility layer, so that fixing the snapshot code -won't make existing snapshots fail to load. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1008340 -(cherry picked from commit 59898a88ce8431bd3ea249b8789edc2ef9985827) ---- - src/qemu/qemu_driver.c | 23 ++++++++++++++++++++--- - 1 file changed, 20 insertions(+), 3 deletions(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index ed29373..3a7c9d0 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -5251,14 +5251,31 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, - goto error; - - newdef = qemuDomainDefCopy(driver, def2, VIR_DOMAIN_XML_MIGRATABLE); -- virDomainDefFree(def2); -- if (!newdef) -+ if (!newdef) { -+ virDomainDefFree(def2); - goto error; -+ } - - if (!virDomainDefCheckABIStability(def, newdef)) { - virDomainDefFree(newdef); -- goto error; -+ virResetLastError(); -+ -+ /* Due to a bug in older version of external snapshot creation -+ * code, the XML saved in the save image was not a migratable -+ * XML. To ensure backwards compatibility with the change of the -+ * saved XML type, we need to check the ABI compatibility against -+ * the user provided XML if the check against the migratable XML -+ * fails. Snapshots created prior to v1.1.3 have this issue. */ -+ if (!virDomainDefCheckABIStability(def, def2)) { -+ virDomainDefFree(def2); -+ goto error; -+ } -+ -+ /* use the user provided XML */ -+ newdef = def2; -+ def2 = NULL; - } -+ - virDomainDefFree(def); - def = newdef; - } diff --git a/0202-qemu-Use-migratable-XML-definition-when-doing-extern.patch b/0202-qemu-Use-migratable-XML-definition-when-doing-extern.patch deleted file mode 100644 index 79f69fa..0000000 --- a/0202-qemu-Use-migratable-XML-definition-when-doing-extern.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 438dc5b4e161f675575c6febb07d75fbf6022d6e Mon Sep 17 00:00:00 2001 -From: Peter Krempa -Date: Mon, 16 Sep 2013 13:40:42 +0200 -Subject: [PATCH] qemu: Use "migratable" XML definition when doing external - checkpoints - -In the original implementation of external checkpoints I've mistakenly -used the live definition to be stored in the save image. The normal -approach is to use the "migratable" definition. This was discovered when -commit 07966f6a8b5ccb5bb4c716b25deb8ba2e572cc67 changed the behavior to -use a converted XML from the user to do the compatibility check to fix -problem when using the regular machine saving. - -As the previous patch added a compatibility layer, we can now change the -type of the XML in the image. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1008340 -(cherry picked from commit 1b7bfa65e36996fc3a204452d2a844ab9f4b52b3) ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index 3a7c9d0..c500728 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -12186,7 +12186,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, - JOB_MASK(QEMU_JOB_SUSPEND) | - JOB_MASK(QEMU_JOB_MIGRATION_OP)); - -- if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, false))) -+ if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) - goto endjob; - - if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, diff --git a/libvirt.spec b/libvirt.spec index c938b52..0ce6329 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -13,13 +13,11 @@ # touch configure.ac or Makefile.am. %{!?enable_autotools:%define enable_autotools 0} -# Drop after libvirt-1.1.3 is rebased -%define enable_autotools 1 - # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd -# Default to a full server + client build -%define client_only 0 +# Default to a full server + client build, but with the possibility +# of a command-line or ~/.rpmmacros override for client-only. +%{!?client_only:%define client_only 0} # Now turn off server build in certain cases @@ -53,6 +51,7 @@ %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} +%define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts @@ -74,7 +73,6 @@ # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} -%define with_vbox 0%{!?_without_vbox:1} %define with_vmware 0%{!?_without_vmware:1} %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} @@ -368,8 +366,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 1.1.2 -Release: 4%{?dist}%{?extra_release} +Version: 1.1.3 +Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -380,34 +378,6 @@ URL: http://libvirt.org/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz -# Fix launching ARM guests on x86 (patches posted upstream, F20 feature) -Patch0001: 0001-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch -Patch0002: 0002-domain_conf-Add-default-memballoon-in-PostParse-call.patch -Patch0003: 0003-qemu-Don-t-add-default-memballoon-device-on-ARM.patch -Patch0004: 0004-qemu-Fix-specifying-char-devs-for-ARM.patch -Patch0005: 0005-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch -Patch0006: 0006-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch -Patch0007: 0007-qemu-Fix-networking-for-ARM-guests.patch -Patch0008: 0008-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch - -# Sync with v1.1.2-maint -Patch0101: 0101-virFileNBDDeviceAssociate-Avoid-use-of-uninitialized.patch -Patch0102: 0102-Fix-AM_LDFLAGS-typo.patch -Patch0103: 0103-Pass-AM_LDFLAGS-to-driver-modules-too.patch -Patch0104: 0104-build-fix-build-with-latest-rawhide-kernel-headers.patch -Patch0105: 0105-Also-store-user-group-ID-values-in-virIdentity.patch -Patch0106: 0106-Ensure-system-identity-includes-process-start-time.patch -Patch0107: 0107-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch -Patch0108: 0108-Fix-crash-in-remoteDispatchDomainMemoryStats-CVE-201.patch -Patch0109: 0109-virsh-add-missing-async-option-in-opts_block_commit.patch -Patch0110: 0110-Fix-typo-in-identity-code-which-is-pre-requisite-for.patch -Patch0111: 0111-Add-a-virNetSocketNewConnectSockFD-method.patch -Patch0112: 0112-Add-test-case-for-virNetServerClient-object-identity.patch - -# Fix snapshot restore when VM has disabled usb support (bz #1011520) -Patch0201: 0201-qemu-Fix-checking-of-ABI-stability-when-restoring-ex.patch -Patch0202: 0202-qemu-Use-migratable-XML-definition-when-doing-extern.patch - %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} %if %{with_network} @@ -539,8 +509,7 @@ BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -# Only need the binary, not -devel -BuildRequires: polkit >= 0.93 +BuildRequires: polkit-devel >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 %endif @@ -629,7 +598,6 @@ BuildRequires: audit-libs-devel BuildRequires: systemtap-sdt-devel %endif - %if %{with_storage_fs} # For mount/umount in FS driver BuildRequires: util-linux @@ -1184,34 +1152,6 @@ of recent versions of Linux (and other OSes). %prep %setup -q -# Fix launching ARM guests on x86 (patches posted upstream, F20 feature) -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1 -%patch0004 -p1 -%patch0005 -p1 -%patch0006 -p1 -%patch0007 -p1 -%patch0008 -p1 - -# Sync with v1.1.2-maint -%patch0101 -p1 -%patch0102 -p1 -%patch0103 -p1 -%patch0104 -p1 -%patch0105 -p1 -%patch0106 -p1 -%patch0107 -p1 -%patch0108 -p1 -%patch0109 -p1 -%patch0110 -p1 -%patch0111 -p1 -%patch0112 -p1 - -# Fix snapshot restore when VM has disabled usb support (bz #1011520) -%patch0201 -p1 -%patch0202 -p1 - %build %if ! %{with_xen} %define _without_xen --without-xen @@ -1783,6 +1723,8 @@ fi %files docs %defattr(-, root, root) +%doc AUTHORS ChangeLog.gz NEWS README TODO + # Website %dir %{_datadir}/doc/libvirt-docs-%{version} %dir %{_datadir}/doc/libvirt-docs-%{version}/html @@ -1799,7 +1741,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2071,20 +2012,26 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO +%doc COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf +%if %{with_lxc} %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf +%endif %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-host-validate.1* +%if %{with_lxc} %{_mandir}/man1/virt-login-shell.1* +%endif %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate %{_bindir}/virt-host-validate +%if %{with_lxc} %attr(4755, root, root) %{_bindir}/virt-login-shell +%endif %{_libdir}/lib*.so.* %if %{with_dtrace} @@ -2155,7 +2102,6 @@ fi %files python %defattr(-, root, root) -%doc AUTHORS NEWS README COPYING COPYING.LESSER %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt_qemu.py* %{_libdir}/python*/site-packages/libvirt_lxc.py* @@ -2165,6 +2111,14 @@ fi %endif %changelog +* Tue Oct 1 2013 Daniel Veillard - 1.1.3-1 +- VMware: Initial VMware Fusion support and various improvements +- libvirt: add new public API virConnectGetCPUModelNames +- various libxl driver improvements +- LXC many container driver improvement +- ARM cpu improvements +- a lot of bug and leak fixes and various improvements + * Tue Sep 24 2013 Cole Robinson - 1.1.2-4 - Fix snapshot restore when VM has disabled usb support (bz #1011520) diff --git a/sources b/sources index bfb1abc..ca601f5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 1835bbfa492099bce12e2934870e5611 libvirt-1.1.2.tar.gz +b0dfe373ebe0c588b42a28c14d36a3e6 libvirt-1.1.3.tar.gz