diff --git a/0001-xen-fix-memory-corruption-in-legacy-driver.patch b/0001-xen-fix-memory-corruption-in-legacy-driver.patch index 34edbb0..5f15f68 100644 --- a/0001-xen-fix-memory-corruption-in-legacy-driver.patch +++ b/0001-xen-fix-memory-corruption-in-legacy-driver.patch @@ -1,5 +1,4 @@ -From 0e671a1646df543eab683b38f6644f70d12fbee1 Mon Sep 17 00:00:00 2001 -Message-Id: <0e671a1646df543eab683b38f6644f70d12fbee1.1376524611.git.crobinso@redhat.com> +From 815828b54398429bddb290d954e6b0291e8831a4 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Mon, 5 Aug 2013 10:27:23 -0600 Subject: [PATCH] xen: fix memory corruption in legacy driver @@ -25,15 +24,17 @@ of havoc in libvirtd such as aborts like the following /lib64/libc.so.6(clone+0x6d)[0x7ffff400e7dd] Fix by initializing ret to 0 and only setting to error on failure path. + +(cherry picked from commit 0e671a1646df543eab683b38f6644f70d12fbee1) --- src/xen/xend_internal.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c -index 1ce36e6..f698c8d 100644 +index 9d61fca..01e74bd 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c -@@ -2896,7 +2896,7 @@ xenDaemonListDefinedDomains(virConnectPtr conn, +@@ -2897,7 +2897,7 @@ xenDaemonListDefinedDomains(virConnectPtr conn, { struct sexpr *root = NULL; size_t i; @@ -42,7 +43,7 @@ index 1ce36e6..f698c8d 100644 struct sexpr *_for_i, *node; if (maxnames == 0) -@@ -2919,16 +2919,15 @@ xenDaemonListDefinedDomains(virConnectPtr conn, +@@ -2920,16 +2920,15 @@ xenDaemonListDefinedDomains(virConnectPtr conn, break; } @@ -61,6 +62,3 @@ index 1ce36e6..f698c8d 100644 goto cleanup; } --- -1.8.3.1 - diff --git a/0002-conf-add-default-USB-controller-in-qemu-post-parse-c.patch b/0002-conf-add-default-USB-controller-in-qemu-post-parse-c.patch new file mode 100644 index 0000000..eb7cb57 --- /dev/null +++ b/0002-conf-add-default-USB-controller-in-qemu-post-parse-c.patch @@ -0,0 +1,89 @@ +From ba3daaef85007c5ef48c0057284654cd22c168f7 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Fri, 2 Aug 2013 04:13:33 -0400 +Subject: [PATCH] conf: add default USB controller in qemu post-parse callback + +The parser shouldn't be doing arch-specific things like adding in +implicit controllers to the config. This should instead be done in the +hypervisor's post-parse callback. + +This patch removes the auto-add of a usb controller from the domain +parser, and puts it into the qemu driver's post-parse callback (just +as is already done with the auto-add of the pci-root controller). In +the future, any machine/arch that shouldn't have a default usb +controller added should just set addDefaultUSB = false in this +function. + +We've recently seen that q35 and ARMV7L domains shouldn't get a default USB +controller, so I've set addDefaultUSB to false for both of those. + +(cherry picked from commit c66da9d224ffba1d972beaf049c00dbebda4e8ea) +--- + src/conf/domain_conf.c | 6 ------ + src/qemu/qemu_domain.c | 14 +++++++++++++- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 783df96..18c6acf 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -11718,12 +11718,6 @@ virDomainDefParseXML(xmlDocPtr xml, + goto error; + } + +- if (def->virtType == VIR_DOMAIN_VIRT_QEMU || +- def->virtType == VIR_DOMAIN_VIRT_KQEMU || +- def->virtType == VIR_DOMAIN_VIRT_KVM) +- if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0, -1) < 0) +- goto error; +- + /* analysis of the resource leases */ + if ((n = virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index da3b768..648121a 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -699,6 +699,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, + virCapsPtr caps, + void *opaque ATTRIBUTE_UNUSED) + { ++ bool addDefaultUSB = true; + bool addPCIRoot = false; + + /* check for emulator and create a default one if needed */ +@@ -714,8 +715,10 @@ qemuDomainDefPostParse(virDomainDefPtr def, + break; + if (STRPREFIX(def->os.machine, "pc-q35") || + STREQ(def->os.machine, "q35") || +- STREQ(def->os.machine, "isapc")) ++ STREQ(def->os.machine, "isapc")) { ++ addDefaultUSB = false; + break; ++ } + if (!STRPREFIX(def->os.machine, "pc-0.") && + !STRPREFIX(def->os.machine, "pc-1.") && + !STRPREFIX(def->os.machine, "pc-i440") && +@@ -725,6 +728,10 @@ qemuDomainDefPostParse(virDomainDefPtr def, + addPCIRoot = true; + break; + ++ case VIR_ARCH_ARMV7L: ++ addDefaultUSB = false; ++ break; ++ + case VIR_ARCH_ALPHA: + case VIR_ARCH_PPC: + case VIR_ARCH_PPC64: +@@ -737,6 +744,11 @@ qemuDomainDefPostParse(virDomainDefPtr def, + break; + } + ++ if (addDefaultUSB && ++ virDomainDefMaybeAddController( ++ def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0, -1) < 0) ++ return -1; ++ + if (addPCIRoot && + virDomainDefMaybeAddController( + def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, diff --git a/0003-qemu-rename-some-functions-in-qemu_command.c.patch b/0003-qemu-rename-some-functions-in-qemu_command.c.patch new file mode 100644 index 0000000..151d9eb --- /dev/null +++ b/0003-qemu-rename-some-functions-in-qemu_command.c.patch @@ -0,0 +1,300 @@ +From b90db10aa95fe048b039e2605884c300a1e00726 Mon Sep 17 00:00:00 2001 +From: Laine Stump +Date: Fri, 26 Jul 2013 21:04:18 -0400 +Subject: [PATCH] qemu: rename some functions in qemu_command.c + +* qemuDomainPCIAddressSetNextAddr + +The name of this function was confusing because 1) other functions in +the file that end in "Addr" are only operating on a single function of +one PCI slot, not the entire slot, while functions that do something +with the entire slot end in "Slot", and 2) it didn't contain a verb +describing what it is doing (the "Set" refers to the set that contains +all PCI buses in the system, used to keep track of which slots in +which buses are already reserved for use). + +It is now renamed to qemuDomainPCIAddressReserveNextSlot, which more +clearly describes what it is doing. Arguably, it could have been +changed to qemuDomainPCIAddressSetReserveNextSlot, but 1) the word +"set" is confusing in this context because it could be intended as a +verb or as a noun, and 2) most other functions that operate on a +single slot or address within this set are also named +qemuDomainPCIAddress... rather than qemuDomainPCIAddressSet... Only +the Create, Free, and Grow functions for an address set (which modify the +entire set, not just one element) use "Set" in their name. + +* qemuPCIAddressAsString, qemuPCIAddressValidate + +All the other functions in this set are named +qemuDomainPCIAddressxxxxx, so I renamed these to be consistent. + +(cherry picked from commit 29e3a1df474aeb35b5eeca4930e7748cd2664472) +--- + src/qemu/qemu_command.c | 78 ++++++++++++++++++++++++++++++------------------- + src/qemu/qemu_command.h | 6 ++-- + 2 files changed, 51 insertions(+), 33 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index aa3a2fd..4345456 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -1439,9 +1439,9 @@ struct _qemuDomainPCIAddressSet { + * with the specified PCI address set. + */ + static bool +-qemuPCIAddressValidate(qemuDomainPCIAddressSetPtr addrs ATTRIBUTE_UNUSED, +- virDevicePCIAddressPtr addr, +- qemuDomainPCIConnectFlags flags) ++qemuDomainPCIAddressValidate(qemuDomainPCIAddressSetPtr addrs, ++ virDevicePCIAddressPtr addr, ++ qemuDomainPCIConnectFlags flags) + { + qemuDomainPCIAddressBusPtr bus; + +@@ -1578,7 +1578,7 @@ qemuDomainPCIAddressSetGrow(qemuDomainPCIAddressSetPtr addrs, + + + static char * +-qemuPCIAddressAsString(virDevicePCIAddressPtr addr) ++qemuDomainPCIAddressAsString(virDevicePCIAddressPtr addr) + { + char *str; + +@@ -1648,10 +1648,10 @@ qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, + * that the bus is of the correct type for the device (via + * comparing the flags). + */ +- if (!qemuPCIAddressValidate(addrs, addr, flags)) ++ if (!qemuDomainPCIAddressValidate(addrs, addr, flags)) + return -1; + +- if (!(str = qemuPCIAddressAsString(addr))) ++ if (!(str = qemuDomainPCIAddressAsString(addr))) + goto cleanup; + + /* check if already in use */ +@@ -1729,7 +1729,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, + if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) + goto cleanup; + /* Reserve 1 extra slot for a (potential) bridge */ +- if (qemuDomainPCIAddressSetNextAddr(addrs, &info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) + goto cleanup; + + for (i = 1; i < addrs->nbuses; i++) { +@@ -1740,7 +1740,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, + i, bus->model)) < 0) + goto cleanup; + /* If we added a new bridge, we will need one more address */ +- if (rv > 0 && qemuDomainPCIAddressSetNextAddr(addrs, &info, flags) < 0) ++ if (rv > 0 && qemuDomainPCIAddressReserveNextSlot(addrs, &info, ++ flags) < 0) + goto cleanup; + } + nbuses = addrs->nbuses; +@@ -1881,7 +1882,7 @@ qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, + if (addrs->dryRun && qemuDomainPCIAddressSetGrow(addrs, addr, flags) < 0) + return -1; + +- if (!(str = qemuPCIAddressAsString(addr))) ++ if (!(str = qemuDomainPCIAddressAsString(addr))) + return -1; + + VIR_DEBUG("Reserving PCI addr %s", str); +@@ -1923,7 +1924,7 @@ qemuDomainPCIAddressReserveSlot(qemuDomainPCIAddressSetPtr addrs, + if (addrs->dryRun && qemuDomainPCIAddressSetGrow(addrs, addr, flags) < 0) + return -1; + +- if (!(str = qemuPCIAddressAsString(addr))) ++ if (!(str = qemuDomainPCIAddressAsString(addr))) + return -1; + + VIR_DEBUG("Reserving PCI slot %s", str); +@@ -1959,12 +1960,12 @@ int qemuDomainPCIAddressEnsureAddr(qemuDomainPCIAddressSetPtr addrs, + return -1; + } + +- if (!qemuPCIAddressValidate(addrs, &dev->addr.pci, flags)) ++ if (!qemuDomainPCIAddressValidate(addrs, &dev->addr.pci, flags)) + return -1; + + ret = qemuDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + } else { +- ret = qemuDomainPCIAddressSetNextAddr(addrs, dev, flags); ++ ret = qemuDomainPCIAddressReserveNextSlot(addrs, dev, flags); + } + return ret; + } +@@ -1986,7 +1987,7 @@ qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, + */ + qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_TYPES_MASK; + +- if (!qemuPCIAddressValidate(addrs, addr, flags)) ++ if (!qemuDomainPCIAddressValidate(addrs, addr, flags)) + return -1; + + addrs->buses[addr->bus].slots[addr->slot] = 0; +@@ -2059,9 +2060,9 @@ success: + } + + int +-qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, +- virDomainDeviceInfoPtr dev, +- qemuDomainPCIConnectFlags flags) ++qemuDomainPCIAddressReserveNextSlot(qemuDomainPCIAddressSetPtr addrs, ++ virDomainDeviceInfoPtr dev, ++ qemuDomainPCIConnectFlags flags) + { + virDevicePCIAddress addr; + if (qemuDomainPCIAddressGetNextSlot(addrs, &addr, flags) < 0) +@@ -2188,14 +2189,16 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, + primaryVideo->info.addr.pci.function = 0; + addrptr = &primaryVideo->info.addr.pci; + +- if (!qemuPCIAddressValidate(addrs, addrptr, flags)) ++ if (!qemuDomainPCIAddressValidate(addrs, addrptr, flags)) + goto error; + + if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDeviceVideoUsable) { + virResetLastError(); +- if (qemuDomainPCIAddressSetNextAddr(addrs, &primaryVideo->info, flags) < 0) +- goto error;; ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ &primaryVideo->info, ++ flags) < 0) ++ goto error; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("PCI address 0:0:2.0 is in use, " +@@ -2296,7 +2299,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + continue; + if (def->controllers[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->controllers[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ &def->controllers[i]->info, ++ flags) < 0) + goto error; + } + } +@@ -2307,7 +2312,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + + /* Only support VirtIO-9p-pci so far. If that changes, + * we might need to skip devices here */ +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->fss[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->fss[i]->info, ++ flags) < 0) + goto error; + } + +@@ -2321,7 +2327,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + (def->nets[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)) { + continue; + } +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->nets[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->nets[i]->info, ++ flags) < 0) + goto error; + } + +@@ -2334,7 +2341,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) + continue; + +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->sounds[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->sounds[i]->info, ++ flags) < 0) + goto error; + } + +@@ -2409,7 +2417,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + def->controllers[i]->info.addr.pci = addr; + } else { +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->controllers[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ &def->controllers[i]->info, ++ flags) < 0) + goto error; + } + } +@@ -2434,7 +2444,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + goto error; + } + +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->disks[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->disks[i]->info, ++ flags) < 0) + goto error; + } + +@@ -2446,7 +2457,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + def->hostdevs[i]->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + continue; + +- if (qemuDomainPCIAddressSetNextAddr(addrs, def->hostdevs[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ def->hostdevs[i]->info, ++ flags) < 0) + goto error; + } + +@@ -2454,7 +2467,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + if (def->memballoon && + def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO && + def->memballoon->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->memballoon->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ &def->memballoon->info, ++ flags) < 0) + goto error; + } + +@@ -2462,7 +2477,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + if (def->rng && + def->rng->model == VIR_DOMAIN_RNG_MODEL_VIRTIO && + def->rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->rng->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, ++ &def->rng->info, flags) < 0) + goto error; + } + +@@ -2470,7 +2486,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + if (def->watchdog && + def->watchdog->model != VIR_DOMAIN_WATCHDOG_MODEL_IB700 && + def->watchdog->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->watchdog->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->watchdog->info, ++ flags) < 0) + goto error; + } + +@@ -2483,7 +2500,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, + } + if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; +- if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info, flags) < 0) ++ if (qemuDomainPCIAddressReserveNextSlot(addrs, &def->videos[i]->info, ++ flags) < 0) + goto error; + } + for (i = 0; i < def->ninputs; i++) { +diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h +index 2b02d6e..c9f1600 100644 +--- a/src/qemu/qemu_command.h ++++ b/src/qemu/qemu_command.h +@@ -254,9 +254,9 @@ int qemuDomainPCIAddressReserveSlot(qemuDomainPCIAddressSetPtr addrs, + int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, + virDevicePCIAddressPtr addr, + qemuDomainPCIConnectFlags flags); +-int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, +- virDomainDeviceInfoPtr dev, +- qemuDomainPCIConnectFlags flags); ++int qemuDomainPCIAddressReserveNextSlot(qemuDomainPCIAddressSetPtr addrs, ++ virDomainDeviceInfoPtr dev, ++ qemuDomainPCIConnectFlags flags); + int qemuDomainPCIAddressEnsureAddr(qemuDomainPCIAddressSetPtr addrs, + virDomainDeviceInfoPtr dev); + int qemuDomainPCIAddressReleaseAddr(qemuDomainPCIAddressSetPtr addrs, diff --git a/0004-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch b/0004-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch new file mode 100644 index 0000000..1b7e663 --- /dev/null +++ b/0004-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch @@ -0,0 +1,3369 @@ +From d77c4e688131be9ae811e1d650f4fdcc9fc1cee2 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Sat, 17 Aug 2013 15:30:47 -0400 +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. +--- + src/qemu/qemu_command.c | 7 ++++++- + 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 ++- + .../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 ++- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args | 3 ++- + tests/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 ++- + tests/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 ++- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args | 3 ++- + .../qemuxml2argv-disk-drive-network-iscsi-auth.args | 3 ++- + .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- + tests/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 ++- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 ++- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args | 3 ++- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- + .../qemuxml2argv-disk-drive-network-rbd-ceph-env.args | 4 ++-- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- + tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args | 2 +- + .../qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args | 2 +- + tests/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 +- + tests/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 ++- + .../qemuxml2argvdata/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 ++- + .../qemuxml2argvdata/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 ++- + tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args | 3 ++- + .../qemuxml2argv-hostdev-usb-address-device-boot.args | 3 ++- + .../qemuxml2argvdata/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-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 ++- + tests/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 ++- + ...emuxml2argv-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 ++- + tests/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-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 +- + tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args | 2 +- + tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.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 +- + .../qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args | 3 ++- + 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 ++- + tests/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 ++- + .../qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args | 3 ++- + tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args | 3 ++- + .../qemuxml2argv-smartcard-passthrough-spicevmc.args | 3 ++- + tests/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 +- + tests/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 +- + 281 files changed, 516 insertions(+), 284 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 4345456..d968333 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -7160,9 +7160,13 @@ 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"); + ++ /* trying to talk directly to pulseaudio is generally problematic */ ++ 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)) +@@ -8226,6 +8230,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/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-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-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-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-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-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-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/0005-qemu-Only-setup-vhost-if-virtType-kvm.patch b/0005-qemu-Only-setup-vhost-if-virtType-kvm.patch new file mode 100644 index 0000000..74abfe5 --- /dev/null +++ b/0005-qemu-Only-setup-vhost-if-virtType-kvm.patch @@ -0,0 +1,31 @@ +From 9475a3ba1e808aa3fe1a975e98bcd1ac7a660d01 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Wed, 31 Jul 2013 21:37:40 -0400 +Subject: [PATCH] qemu: Only setup vhost if virtType == "kvm" + +vhost only works in KVM mode at the moment, and is infact compiled +out if the emulator is built for non-native architecture. While it +may work at some point in the future for plain qemu, for now it's +just noise on the command line (and which contributes to arm cli +breakage). +--- + src/qemu/qemu_command.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index d968333..6710bf0 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -441,8 +441,10 @@ qemuOpenVhostNet(virDomainDefPtr def, + { + size_t i; + +- /* If the config says explicitly to not use vhost, return now */ +- if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { ++ /* If running a plain QEMU guest, or ++ * if the config says explicitly to not use vhost, return now*/ ++ if (def->virtType != VIR_DOMAIN_VIRT_KVM || ++ net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { + *vhostfdSize = 0; + return 0; + } diff --git a/0006-domain_conf-Add-default-memballon-in-PostParse-callb.patch b/0006-domain_conf-Add-default-memballon-in-PostParse-callb.patch new file mode 100644 index 0000000..19d8ae0 --- /dev/null +++ b/0006-domain_conf-Add-default-memballon-in-PostParse-callb.patch @@ -0,0 +1,51 @@ +From a9d7a8a2f604f30f4769cdfe62a36aba28ce7368 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Fri, 16 Aug 2013 20:33:23 -0400 +Subject: [PATCH] domain_conf: Add default memballon in PostParse callbacks + +This should be a no-op change for now. +--- + src/qemu/qemu_domain.c | 9 +++++++++ + src/xen/xen_driver.c | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index 648121a..dc7ab3e 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -755,6 +755,15 @@ qemuDomainDefPostParse(virDomainDefPtr def, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) < 0) + 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 4ae38d3..780230f 100644 +--- a/src/xen/xen_driver.c ++++ b/src/xen/xen_driver.c +@@ -330,6 +330,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/0007-qemu-Don-t-add-default-memballoon-device-on-ARM.patch b/0007-qemu-Don-t-add-default-memballoon-device-on-ARM.patch new file mode 100644 index 0000000..8e4a481 --- /dev/null +++ b/0007-qemu-Don-t-add-default-memballoon-device-on-ARM.patch @@ -0,0 +1,224 @@ +From 56aa5100965134dcc9773dcb47c2cf88b26717f9 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 30 Jul 2013 15:41:14 -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/conf/domain_conf.c | 14 --------- + 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 ++++++++++++++++++++++ + 7 files changed, 89 insertions(+), 15 deletions(-) + 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 745b959..781ecfd 100644 +--- a/docs/schemas/domaincommon.rng ++++ b/docs/schemas/domaincommon.rng +@@ -303,6 +303,7 @@ + + + ++ + + + hvm +@@ -412,6 +413,24 @@ + + + ++ ++ ++ ++ ++ ++ armv7l ++ ++ ++ ++ ++ ++ ++ [a-zA-Z0-9_\.\-]+ ++ ++ ++ ++ ++ + + + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 18c6acf..8ede44d 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -8801,7 +8801,6 @@ virDomainVideoDefaultRAM(virDomainDefPtr def, + } + } + +- + int + virDomainVideoDefaultType(virDomainDefPtr def) + { +@@ -12136,19 +12135,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 dc7ab3e..36df403 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -701,6 +701,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, + { + bool addDefaultUSB = true; + bool addPCIRoot = false; ++ bool addDefaultMemballoon = true; + + /* check for emulator and create a default one if needed */ + if (!def->emulator && +@@ -730,6 +731,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, + + case VIR_ARCH_ARMV7L: + addDefaultUSB = false; ++ addDefaultMemballoon = false; + break; + + case VIR_ARCH_ALPHA: +@@ -755,7 +757,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, + VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) < 0) + return -1; + +- 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 b7485fc..361ddb8 100644 +--- a/tests/qemuxml2argvtest.c ++++ b/tests/qemuxml2argvtest.c +@@ -1027,6 +1027,9 @@ mymain(void) + DO_TEST_PARSE_ERROR("pci-root-address", + QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); + ++ 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/0008-qemu-Fix-adding-specifying-char-devs-for-ARM.patch b/0008-qemu-Fix-adding-specifying-char-devs-for-ARM.patch new file mode 100644 index 0000000..7f0c721 --- /dev/null +++ b/0008-qemu-Fix-adding-specifying-char-devs-for-ARM.patch @@ -0,0 +1,156 @@ +From 2797780706ba62cff67540be18e59d0fd6438389 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 30 Jul 2013 17:49:11 -0400 +Subject: [PATCH] qemu: Fix adding 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 08406b8..5c8316f 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -2810,3 +2810,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 f5f685d..56f8405 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -272,4 +272,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 6710bf0..e6000d9 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -7996,8 +7996,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 d631a6f..57036e8 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -1583,22 +1583,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); +@@ -1632,19 +1635,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. */ +@@ -1662,8 +1667,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; +@@ -1753,7 +1759,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/0009-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch b/0009-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch new file mode 100644 index 0000000..5896a85 --- /dev/null +++ b/0009-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch @@ -0,0 +1,43 @@ +From d859b21108e4d45a7851c2be0a61895da66159a2 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 30 Jul 2013 18:56:15 -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 e6000d9..66b02fc 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -1694,6 +1694,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, +@@ -1760,8 +1770,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/0010-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch b/0010-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch new file mode 100644 index 0000000..b44e5b7 --- /dev/null +++ b/0010-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch @@ -0,0 +1,146 @@ +From a0d15c46d153d5574f68e18ea2f027cdb98e9390 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Wed, 31 Jul 2013 09:00:26 -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 78e132e..1314806 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -1660,7 +1660,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 781ecfd..4f4564b 100644 +--- a/docs/schemas/domaincommon.rng ++++ b/docs/schemas/domaincommon.rng +@@ -1286,6 +1286,7 @@ + usb + uml + sata ++ sd + + + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 8ede44d..5485d86 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", +@@ -17227,6 +17228,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 abf024c..cf075e1 100644 +--- a/src/conf/domain_conf.h ++++ b/src/conf/domain_conf.h +@@ -508,6 +508,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 66b02fc..d4ab1a6 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'"), +@@ -3406,7 +3410,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; + } + +@@ -7693,12 +7699,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); +@@ -9383,6 +9390,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; +@@ -9532,7 +9541,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/0011-qemu-Fix-networking-for-ARM-guests.patch b/0011-qemu-Fix-networking-for-ARM-guests.patch new file mode 100644 index 0000000..227f1f6 --- /dev/null +++ b/0011-qemu-Fix-networking-for-ARM-guests.patch @@ -0,0 +1,206 @@ +From 2661a048446d64fa0e4f6516ca7295e6087b5ec7 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 30 Jul 2013 18:51:30 -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 d4ab1a6..1d57ccc 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 " +@@ -6872,8 +6891,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, +@@ -6881,7 +6899,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, + goto cleanup; + virCommandAddArgList(cmd, "-netdev", host, NULL); + } +- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { ++ if (qemuDomainSupportsNicdev(def, qemuCaps)) { + if (!(nic = qemuBuildNicDevStr(net, vlan, bootindex, qemuCaps))) + goto cleanup; + virCommandAddArgList(cmd, "-device", nic, NULL); +@@ -6890,8 +6908,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, +@@ -7888,8 +7905,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 36df403..0b3503a 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -769,6 +769,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, +@@ -784,8 +801,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 361ddb8..0bf2724 100644 +--- a/tests/qemuxml2argvtest.c ++++ b/tests/qemuxml2argvtest.c +@@ -1029,6 +1029,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/0012-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch b/0012-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch new file mode 100644 index 0000000..f2f813d --- /dev/null +++ b/0012-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch @@ -0,0 +1,446 @@ +From cd745209fc0b4a433ae7127bab616373e91a8a22 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Wed, 31 Jul 2013 21:40:35 -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 | 16 ++++-- + src/qemu/qemu_capabilities.h | 1 + + 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, 137 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 5485d86..73e5af4 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", +@@ -2386,6 +2387,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: +@@ -3027,6 +3029,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); +@@ -3491,6 +3496,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, +@@ -5738,6 +5746,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")); +@@ -6349,6 +6358,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 cf075e1..f0344ac 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 5c8316f..c4c6fbd 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -234,6 +234,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, + + "vnc-share-policy", /* 150 */ + "device-del-event", ++ "virtio-mmio", + ); + + struct _virQEMUCaps { +@@ -1381,6 +1382,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { + { "pci-bridge", QEMU_CAPS_DEVICE_PCI_BRIDGE }, + { "vfio-pci", QEMU_CAPS_DEVICE_VFIO_PCI }, + { "scsi-generic", QEMU_CAPS_DEVICE_SCSI_GENERIC }, ++ { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, + }; + + static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { +@@ -2814,17 +2816,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 56f8405..fdb61b0 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -190,6 +190,7 @@ enum virQEMUCapsFlags { + QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ + QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ + QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ ++ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 152, /* -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 1d57ccc..360be4e 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 " +@@ -1146,8 +1151,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' +@@ -1281,7 +1286,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())) +@@ -1296,7 +1301,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); + } + +@@ -1319,6 +1324,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, +@@ -1834,6 +1851,10 @@ int qemuDomainAssignAddresses(virDomainDefPtr def, + if (rc) + return rc; + ++ rc = qemuDomainAssignARMVirtioMMIOAddresses(def, qemuCaps); ++ if (rc) ++ return rc; ++ + return qemuDomainAssignPCIAddresses(def, qemuCaps, obj); + } + +@@ -3957,6 +3978,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"); + } +@@ -4234,6 +4258,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; +@@ -4263,6 +4290,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"); + } +@@ -4378,6 +4408,8 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, + 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"; + +@@ -4622,6 +4654,9 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, + 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'"), +@@ -5615,6 +5650,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); + +@@ -6891,7 +6928,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, +@@ -6899,7 +6936,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, + goto cleanup; + virCommandAddArgList(cmd, "-netdev", host, NULL); + } +- if (qemuDomainSupportsNicdev(def, qemuCaps)) { ++ if (qemuDomainSupportsNicdev(def, qemuCaps, net)) { + if (!(nic = qemuBuildNicDevStr(net, vlan, bootindex, qemuCaps))) + goto cleanup; + virCommandAddArgList(cmd, "-device", nic, NULL); +@@ -6908,7 +6945,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, +@@ -7905,7 +7942,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 0bf2724..2bdd18e 100644 +--- a/tests/qemuxml2argvtest.c ++++ b/tests/qemuxml2argvtest.c +@@ -1032,6 +1032,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/libvirt.spec b/libvirt.spec index 3661534..3d5661e 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -350,7 +350,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 1.1.1 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -364,6 +364,18 @@ Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz # CVE-2013-4239: xen: memory corruption in legacy driver (bz #996241, bz # #996244) Patch0001: 0001-xen-fix-memory-corruption-in-legacy-driver.patch +# Fix launching ARM guests on x86 (patches posted upstream, F20 feature) +Patch0002: 0002-conf-add-default-USB-controller-in-qemu-post-parse-c.patch +Patch0003: 0003-qemu-rename-some-functions-in-qemu_command.c.patch +Patch0004: 0004-qemu-Set-QEMU_AUDIO_DRV-none-with-nographic.patch +Patch0005: 0005-qemu-Only-setup-vhost-if-virtType-kvm.patch +Patch0006: 0006-domain_conf-Add-default-memballon-in-PostParse-callb.patch +Patch0007: 0007-qemu-Don-t-add-default-memballoon-device-on-ARM.patch +Patch0008: 0008-qemu-Fix-adding-specifying-char-devs-for-ARM.patch +Patch0009: 0009-qemu-Don-t-try-to-allocate-PCI-addresses-for-ARM.patch +Patch0010: 0010-domain_conf-Add-disk-bus-sd-wire-it-up-for-qemu.patch +Patch0011: 0011-qemu-Fix-networking-for-ARM-guests.patch +Patch0012: 0012-qemu-Support-virtio-mmio-transport-for-virtio-on-ARM.patch %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} @@ -1138,6 +1150,18 @@ of recent versions of Linux (and other OSes). # CVE-2013-4239: xen: memory corruption in legacy driver (bz #996241, bz # #996244) %patch0001 -p1 +# Fix launching ARM guests on x86 (patches posted upstream, F20 feature) +%patch0002 -p1 +%patch0003 -p1 +%patch0004 -p1 +%patch0005 -p1 +%patch0006 -p1 +%patch0007 -p1 +%patch0008 -p1 +%patch0009 -p1 +%patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 %build %if ! %{with_xen} @@ -2077,6 +2101,9 @@ fi %endif %changelog +* Tue Aug 20 2013 Cole Robinson - 1.1.1-3 +- Fix launching ARM guests on x86 (patches posted upstream, F20 feature) + * Wed Aug 14 2013 Cole Robinson - 1.1.1-2 - CVE-2013-4239: xen: memory corruption in legacy driver (bz #996241, bz #996244)