- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Restore error/cleanup logic for qemuBuildNetCommandLine
by John Ferlan 14 Mar '16

14 Mar '16

The virDomainConfVMNWFilterTeardown was called in the error path of qemuBuildCommandLine once network setup was partially or fully completed using the last_good_net as the basis to determine which filters needed to be torn down. Commit id 'ef2ab8fd' moved that inside the new qemuBuildNetCommandLine, so that lost the failure. Moving that cleanup back outside the call to the more general failure case. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Jan notes post push that the cleanup path after building the network command line was there for any other failures and not just the failure in building the network command line: http://www.redhat.com/archives/libvir-list/2016-March/msg00561.html Even though the teardown is called during qemuProcessStop from virDomainConfVMNWFilterTeardown, the cleanup here could still be done. The reason for moving it inside was based on a different patch where the desire was to not leak anything that could have changed inside one of the moved qemuBuild*CommandLine functions. In this case, though since it's used more generally for cleanup, it seems a good idea to return it. The other option would be to just let qemuProcessStop handle it and a different patch to remove the error reset logic. src/qemu/qemu_command.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba8c216..2e15c05 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7659,10 +7659,10 @@ qemuBuildNetCommandLine(virCommandPtr cmd, bool emitBootindex, size_t *nnicindexes, int **nicindexes, - int *bootHostdevNet) + int *bootHostdevNet, + int *last_good_net) { size_t i; - int last_good_net = -1; if (!def->nnets) { /* If we have -device, then we set -nodefault already */ @@ -7697,9 +7697,9 @@ qemuBuildNetCommandLine(virCommandPtr cmd, qemuCaps, vlan, bootNet, vmop, standalone, nnicindexes, nicindexes) < 0) - goto error; + return -1; - last_good_net = i; + *last_good_net = i; /* if this interface is a type='hostdev' interface and we * haven't yet added a "bootindex" parameter to an * emulated network device, save the bootindex - hostdev @@ -7714,11 +7714,6 @@ qemuBuildNetCommandLine(virCommandPtr cmd, } } return 0; - - error: - for (i = 0; last_good_net != -1 && i <= last_good_net; i++) - virDomainConfNWFilterTeardown(def->nets[i]); - return -1; } @@ -8604,6 +8599,7 @@ qemuBuildCommandLine(virConnectPtr conn, bool emitBootindex = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int bootHostdevNet = 0; + int last_good_net = -1; VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " @@ -8725,7 +8721,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuBuildNetCommandLine(cmd, driver, def, qemuCaps, vmop, standalone, emitBootindex, nnicindexes, nicindexes, - &bootHostdevNet) < 0) + &bootHostdevNet, &last_good_net) < 0) goto error; if (qemuBuildSmartcardCommandLine(logManager, cmd, def, qemuCaps) < 0) @@ -9280,6 +9276,8 @@ qemuBuildCommandLine(virConnectPtr conn, /* free up any resources in the network driver * but don't overwrite the original error */ originalError = virSaveLastError(); + for (i = 0; last_good_net != -1 && i <= last_good_net; i++) + virDomainConfNWFilterTeardown(def->nets[i]); virSetError(originalError); virFreeError(originalError); virCommandFree(cmd); -- 2.5.0

2 1

[libvirt] [PATCH] vz: fix active domain listing
by Maxim Nestratov 14 Mar '16

14 Mar '16

Since commit 9c14a9ab we have broken active domain listing because reworked prlsdkLoadDomain doesn't set dom->def->id propely. It just looses it when a new def structure is set. Now we make prlsdkConvertDomainState function return void and move calling it after an old dom->def is replaces with a new one within prlsdkLoadDomain function. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index de73c31..f7d769b 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1051,7 +1051,7 @@ prlsdkAddVNCInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) return -1; } -static int +static void prlsdkConvertDomainState(VIRTUAL_MACHINE_STATE domainState, PRL_UINT32 envId, virDomainObjPtr dom) @@ -1121,17 +1121,12 @@ prlsdkConvertDomainState(VIRTUAL_MACHINE_STATE domainState, dom->def->id = envId; break; case VMS_UNKNOWN: + default: virDomainObjSetState(dom, VIR_DOMAIN_NOSTATE, VIR_DOMAIN_NOSTATE_UNKNOWN); - break; - default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown domain state: %X"), domainState); - return -1; + dom->def->id = -1; break; } - - return 0; } static int @@ -1374,9 +1369,6 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) goto error; } - if (prlsdkConvertDomainState(domainState, envId, dom) < 0) - goto error; - /* assign new virDomainDef without any checks * we can't use virDomainObjAssignDef, because it checks * for state and domain name */ @@ -1386,6 +1378,8 @@ prlsdkLoadDomain(vzConnPtr privconn, virDomainObjPtr dom) VIR_FREE(pdom->home); pdom->home = home; + prlsdkConvertDomainState(domainState, envId, dom); + if (!pdom->sdkdom) { PrlHandle_AddRef(sdkdom); pdom->sdkdom = sdkdom; @@ -1532,8 +1526,8 @@ prlsdkHandleVmStateEvent(vzConnPtr privconn, prlsdkCheckRetGoto(pret, cleanup); pdom = dom->privateData; - if (prlsdkConvertDomainState(domainState, pdom->id, dom) < 0) - goto cleanup; + + prlsdkConvertDomainState(domainState, pdom->id, dom); prlsdkNewStateToEvent(domainState, &lvEventType, -- 2.4.3

2 2

[libvirt] [REPOST PATCH 0/8] Reorganize qemu_command.c in smaller piles (round 3)
by John Ferlan 14 Mar '16

14 Mar '16

Final pile of split. Rather than hope for a review of 25 patches or creating some remote place to place a branch - I'll repost the original: http://www.redhat.com/archives/libvir-list/2016-February/msg00975.html in smaller chunks. Differences in this set of patches vs. original series includes handling merge conflicts for logManager series plus a few minor edits/tweaks for better formatting/flow. This series was based off of git head commit 'ef2ab8fdc' which is the round 1 of the split: http://www.redhat.com/archives/libvir-list/2016-March/msg00288.html This is round 2 of the split based off of commit id '95ca4fe2': http://www.redhat.com/archives/libvir-list/2016-March/msg00491.html John Ferlan (8): qemu: Introduce qemuBuildSoundCommandLine qemu: Introduce qemuBuildWatchdogCommandLine qemu: Introduce qemuBuildRedirdevCommandLine qemu: Introduce qemuBuildHostdevCommandLine qemu: Introduce qemuBuildMemballoonCommandLine qemu: Introduce qemuBuildRNGCommandLine qemu: Introduce qemuBuildNVRAMCommandLine qemu: Introduce qemuBuildPanicCommandLine src/qemu/qemu_command.c | 1346 ++++++++++++++++++++++++++--------------------- src/qemu/qemu_command.h | 25 +- 2 files changed, 743 insertions(+), 628 deletions(-) -- 2.5.0

2 9

[libvirt] [PATCH] qemuBuildVideoCommandLine: Don't access def->videos without check
by Michal Privoznik 14 Mar '16

14 Mar '16

This function can be called over a domain definition that has no video configured. The tests/qemuxml2argvdata/qemuxml2argv-minimal.xml file could serve as an example. Problem is, before the check that domain has some or none video configured, def->videos is dereferenced causing a segmentation fault in case there's none video configured. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba8c216..32d32b1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3809,7 +3809,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { size_t i; - int primaryVideoType = def->videos[0]->type; + int primaryVideoType; if (!def->nvideos) { /* If we have -device, then we set -nodefaults already */ @@ -3819,6 +3819,8 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, return 0; } + primaryVideoType = def->videos[0]->type; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY) && ((primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA)) || -- 2.4.10

3 2

[libvirt] Enhancement: Random Clock Offset
by bancfc＠openmailbox.org 14 Mar '16

14 Mar '16

For better system anonymity (to decouple VM OS timestamps leaked in traffic from host ones) a feature can be added to the clock offset variable to select randomly from a specified range of seconds from instead of a fixed number of seconds. That way a guest's clock can vary unpredictably from the host's and confuse correlation by network adversaries. Full Disclosure: I am from the Tor centric Whonix Project - whonix.org and this would be a very useful feature for us.

3 4

[libvirt] [PATCH REPOST 0/9] Reorganize qemu_command.c in smaller piles
by John Ferlan 14 Mar '16

14 Mar '16

Rather than hope for a review of 25 patches or creating some remote place to place a branch - I'll repost the original: http://www.redhat.com/archives/libvir-list/2016-February/msg00975.html in smaller chunks. No differences in these patches other than a rebase to top of tree a short while ago (commit id 'cf091094a'). There were also no conflicts from changes since initial posting. John Ferlan (9): qemu: Introduce qemuBuildClockCommandLine qemu: Introduce qemuBuildPMCommandLine qemu: Introduce qemuBuildBootCommandLine qemu: Introduce qemuBuildGlobalControllerCommandLine qemu: Introduce qemuBuildControllerDevCommandLine qemu: Introduce qemuBuildHubCommandLine qemu: Introduce qemuBuildDiskDriveCommandLine qemu: Introduce qemuBuildFSDevCommandLine qemu: Introduce qemuBuildNetCommandLine src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 8 +- src/qemu/qemu_command.c | 5488 +++++++++++++++++++++------------------- src/qemu/qemu_command.h | 15 +- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_domain_address.h | 2 +- 6 files changed, 2843 insertions(+), 2686 deletions(-) -- 2.5.0

3 20

[libvirt] [PATCH 0/2] Fix building with clang (again)
by Martin Kletzander 14 Mar '16

14 Mar '16

*** SOME VERY RANDOM BLURB HERE *** Martin Kletzander (2): Skip pdwtags-related tests when compiling with clang Fix build with clang src/Makefile.am | 4 +++- tests/qemuxml2argvmock.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) -- 2.7.3

2 5

[libvirt] any better way to treat device-detach timeout ?
by Zhangbo (Oscar) 14 Mar '16

14 Mar '16

Hi,all: I find that we remove devices only after DEVICE_DELETED event.(patch:3fbf78bd). And it treats TIMEOUT as success. The detailed codes are shown as below: rc = qemuDomainWaitForDeviceRemoval(vm); if (rc == 0 || rc == 1) ret = qemuDomainRemoveDiskDevice(driver, vm, detach); else ret = 0; Here comes the problem: If 1. We pass flags=3(VIR_DOMAIN_AFFECT_LIVE|VIR_DOMAIN_AFFECT_CONFIG) to virDomainDetachDeviceFlags, 2. It timed out to receive DEVICE_DELETED event, virDomainDetachDeviceFlags api will return 0(succeed). Please be aware that: vm->newdef(persistent) removes the device while vm->def(transient) keeps it untouched. 3. Then we try to attach the same device with flag 3, because it differs in newDef and def, the API virDomainDetachDeviceFlags() returns ERROR. Consequent attach/detach jobs all fail after then. So, shall we make it return FAIL when it fails in qemuDomainWaitForDeviceRemoval()? Or just remove the device in def after we get the DEVICE_DELETED event? Any ideas, thanks!

2 5

[libvirt] [PATCH REPOST 0/8] Reorganize qemu_command.c in smaller piles (round 2)
by John Ferlan 11 Mar '16

11 Mar '16

Rather than hope for a review of 25 patches or creating some remote place to place a branch - I'll repost the original: http://www.redhat.com/archives/libvir-list/2016-February/msg00975.html in smaller chunks. Differences in this set of patches vs. original series includes handling merge conflicts for logManager series plus a few minor edits/tweaks for better formatting/flow. This series was based off of git head commit 'ef2ab8fdc' which is the round 1 of the split: http://www.redhat.com/archives/libvir-list/2016-March/msg00288.html John Ferlan (8): qemu: Introduce qemuBuildSmartcardCommandLine qemu: Introduce qemuBuildSerialCommandLine qemu: Introduce qemuBuildParallelsCommandLine qemu: Introduce qemuBuildChannelsCommandLine qemu: Introduce qemuBuildConsoleCommandLine qemu: Modify qemuBuildTPMCommandLine qemu: Introduce qemuBuildInputCommandLine qemu: Introduce qemuBuildVideoCommandLine src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 1410 +++++++++++++++++++++++------------------- src/qemu/qemu_command.h | 6 +- 4 files changed, 760 insertions(+), 660 deletions(-) -- 2.5.0

2 16

[libvirt] [PATCH] Added qt-virt-manager to Application docs.
by F1ash 11 Mar '16

11 Mar '16

*** BLURB HERE *** F1ash (1): added qt-virt-manager to Application docs; docs/apps.html.in | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.2

1 1

[libvirt] [libvirt-glib v2 0/9] gconfig: Add hostdev support
by Christophe Fergeau 11 Mar '16

11 Mar '16

Hey, While reviewing Zeeshan's libvirt-gconfig hostdev series, I fixed up a few things, and added a few additional helpers/getters in order to simplify the code/make the test case more complete. This series contains this new code. The changes I made to Zeeshan's initial patches are in separate fixup! commits to make reviewing them easier (for you Zeeshan ;). I expect these to be squashed in the main commits before being pushed. Zeeshan's commits are unchanged from v1. Christophe

2 14

[libvirt] [libvirt-glib v3 1/5] gconfig: Add gvir_config_object_has_child
by Christophe Fergeau 11 Mar '16

11 Mar '16

--- libvirt-gconfig/libvirt-gconfig-object-private.h | 2 ++ libvirt-gconfig/libvirt-gconfig-object.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index e91c4ef..7a0d21f 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -117,6 +117,8 @@ GVirConfigObject *gvir_config_object_get_child(GVirConfigObject *object, GVirConfigObject *gvir_config_object_get_child_with_type(GVirConfigObject *object, const gchar *child_name, GType child_type); +gboolean gvir_config_object_has_child(GVirConfigObject *object, + const gchar *child_name); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index bf328f3..6225de2 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -970,3 +970,16 @@ gvir_config_object_get_child(GVirConfigObject *object, child_name, GVIR_CONFIG_TYPE_OBJECT); } + +G_GNUC_INTERNAL gboolean +gvir_config_object_has_child(GVirConfigObject *object, const gchar *child_name) +{ + xmlNodePtr node; + + g_return_val_if_fail(GVIR_CONFIG_IS_OBJECT(object), FALSE); + g_return_val_if_fail(child_name != NULL, FALSE); + + node = gvir_config_xml_get_element(object->priv->node, child_name, NULL); + + return (node != NULL); +} -- 2.5.0

1 4

Re: [libvirt] dist-git build problem on epel-6-x86_64 chroot
by Jean-Marc LIGER 11 Mar '16

11 Mar '16

Le 19/02/2016 11:40, Miroslav Suchý a écrit : > Dne 19.1.2016 v 17:01 Jean-Marc LIGER napsal(a): >> Hy, >> >> I'm facing the problem below on epel-6-x86_64 chroot for both from URL and upload SRPM : >> >> [2016-01-19 15:16:26,790][ INFO][PID:3241] Setting up builder: 172.25.94.167 >> [2016-01-19 15:16:27,991][ INFO][PID:3241] marking build dir with build_id, >> [2016-01-19 15:16:27,992][ INFO][PID:3241] Start build: BuildJob<id: 154509, owner: jmliger, project: virt6-upstream, >> git branch: el6, git_hash: acef5efd6153aa8f9ea760f468333e65c9b46a4e, status: 3 > >> [2016-01-19 15:16:27,993][ INFO][PID:3241] putting into minimal buildroot of epel-6-x86_64 >> [2016-01-19 15:16:28,902][ INFO][PID:3241] Cloning Dist Git repo jmliger/virt6-upstream/libvirt, branch >> acef5efd6153aa8f9ea760f468333e65c9b46a4e, hash el6 >> [2016-01-19 15:16:30,906][ ERROR][PID:3241] Failed to obtain srpm from dist-git >> Traceback (most recent call last): >> File "/usr/share/copr/backend/mockremote/builder.py", line 209, in download_job_pkg_to_builder >> self.remote_pkg_path = list(results["contacted"].values())[0][u"stdout"].split("Wrote: ")[1] >> IndexError: list index out of range >> [2016-01-19 15:16:30,911][ ERROR][PID:3241] builder.build error building pkg `libvirt`: BuildError: Failed to obtain >> srpm from dist-git: ansible results {'dark': {}, 'contacted': {'172.25.94.167': {'cmd': 'rm -rf /tmp/build_package_repo >> && mkdir /tmp/build_package_repo && cd /tmp/build_package_repo && git clone >> http://copr-dist-git.fedorainfracloud.org/git/jmliger/virt6-upstream/libvir… && cd libvirt && git checkout >> acef5efd6153aa8f9ea760f468333e65c9b46a4e && fedpkg-copr --dist el6 srpm', 'end': '2016-01-19 15:16:30.308282', 'stdout': >> 'Downloading libvirt-1.3.1.tar.gz\n\r >> 0.0%\r >> 100.0%\r######################################################################## 100.0%', 'changed': True, 'start': >> '2016-01-19 15:16:28.758321', 'delta': '0:00:01.549961', 'stderr': "Cloning into 'libvirt'...\nNote: checking out >> 'acef5efd6153aa8f9ea760f468333e65c9b46a4e'.\n\nYou are in 'detached HEAD' state. You can look around, make >> experimental\nchanges and commit them, and you can discard any commits you make in this\nstate without impacting any >> branches by performing another checkout.\n\nIf you want to create a new branch to retain commits you create, you may\ndo >> so (now or later) by using -b with the checkout command again. Example:\n\n git checkout -b <new-branch-name>\n\nHEAD >> is now at acef5ef... import_srpm\nerror: line 1800: Trigger fired by the same package is already defined in spec file: >> %post daemon-config-network\n\nerror: query of specfile /tmp/build_package_repo/libvirt/libvirt.spec failed, can't >> parse\n\nCould not execute srpm: Could not get n-v-r-e from '\\n\\n'", 'rc': 1, 'invocation': {'module_name': 'shell', >> 'module_complex_args': {}, 'module_args': u'rm -rf /tmp/build_package_repo && mkdir /tmp/build_package_repo && cd >> /tmp/build_package_repo && git clone http://copr-dist-git.fedorainfracloud.org/git/jmliger/virt6-upstream/libvir… && >> cd libvirt && git checkout acef5efd6153aa8f9ea760f468333e65c9b46a4e && fedpkg-copr --dist el6 srpm'}, 'warnings': >> ['Consider using file module with state=absent rather than running rm']}}} >> [2016-01-19 15:16:31,759][ INFO][PID:3241] End Build: BuildJob<id: 154509, owner: jmliger, project: virt6-upstream, git >> branch: el6, git_hash: acef5efd6153aa8f9ea760f468333e65c9b46a4e, status: 3 > >> >> https://copr.fedoraproject.org/coprs/jmliger/virt6-upstream/builds/ >> >> Regards, >> Jean-Marc LIGER >> >> >> _______________________________________________ >> copr-devel mailing list >> copr-devel(a)lists.fedorahosted.org >> https://lists.fedorahosted.org/admin/lists/copr-devel@lists.fedorahosted.org > It is some problem with your spec file. > You can reproduce it by installing fedpkg-copr from our Copr project and > git clone http://copr-dist-git.fedorainfracloud.org/git/jmliger/virt6-upstream/libvir… > cd libvirt > git checkout acef5efd6153aa8f9ea760f468333e65c9b46a4e > fedpkg-copr -vvv --dist el6 srpm > > Which will fails on: > > rpm --define '_sourcedir /tmp/libvirt' --define '_specdir /tmp/libvirt' --define '_builddir /tmp/libvirt' --define > '_srcrpmdir /tmp/libvirt' --define '_rpmdir /tmp/libvirt' --define 'dist .el6' --define 'rhel 6' --eval '%undefine > fedora' --define 'el6 1' --eval '%undefine fc23' -q --qf "%{NAME} %{EPOCH} %{VERSION} %{RELEASE}??" --specfile > /tmp/libvirt/libvirt.spec > > error: line 1800: Trigger fired by the same package is already defined in spec file: %post daemon-config-network > error: query of specfile /tmp/libvirt/libvirt.spec failed, can't parse > > And your spec file is so complex that I have no idea why it is failing. You may ask on RPM mailing list. > Thanks for your reply, I'm addressing this problem to the libvirt list.

1 1

[libvirt] [PATCH V3 0/2] libxl: support assignment VF to guest from a pool of SRIOV VFs
by Chunyan Liu 11 Mar '16

11 Mar '16

This patch series is to support assigning VF to guest from a pool of SRIOV VFs in libxl driver, detailed usage can be referred to: http://wiki.libvirt.org/page/Networking#Assignment_from_a_pool_of_SRIOV_VFs… Chunyan Liu (2): libxl_conf: reuse virDomainNetGetActualtype in libxlMakeNicList libxl: support assignment from a pool of SRIOV VFs src/libxl/libxl_conf.c | 3 ++- src/libxl/libxl_domain.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 12 ++++++++++++ tests/Makefile.am | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) -- 2.1.4

3 5

[libvirt] [PATCH 0/2] RFC: qemu: aarch64 virtio-pci work
by Cole Robinson 10 Mar '16

10 Mar '16

These patches apply on top of the series I just posted: [PATCH 0/9] tests: qemu: unconditionally enable QEMU_CAPS_DEVICE https://www.redhat.com/archives/libvir-list/2016-January/msg01233.html These specific changers were discussed here: https://www.redhat.com/archives/libvir-list/2015-December/msg00217.html We need a way for apps to tell libvirt 'use virtio-pci not virtio-mmio' for aarch64 -M virt. We can't really make use this by default yet since most OS don't actually support it. So we decided the best course of interaction is to allow users to pass a manual pci controller, and libvirt will interpret that to mean it's okay to use virtio-pci. Patch #1 undoes the current behavior of unconditionally adding a q35 style PCIe controller setup for mach-virt that supports it. In the future we will probably re-enable something like this, but maybe not for a year or so until the bits proliferate to distros. Patch #2 tries to implement the manual pci controller bit. Unfortunately it's not that easy get the ideal XML to work, so this isn't ready for committing. See the commit message for more details Cole Robinson (2): qemu: aarch64: Don't add PCIe controller by default HACK: qemu: aarch64: Use virtio-pci if user specifies PCI controller src/qemu/qemu_command.c | 34 ++++++++---- src/qemu/qemu_domain.c | 4 -- ...l2argv-aarch64-pci-manual-nocontroller-fail.xml | 43 ++++++++++++++++ .../qemuxml2argv-aarch64-virtio-pci-default.args | 2 - ...l2argv-aarch64-virtio-pci-manual-addresses.args | 2 - ...ml2argv-aarch64-virtio-pci-manual-addresses.xml | 1 + ...2argv-aarch64-virtio-pci-manual-controller.args | 36 +++++++++++++ ...l2argv-aarch64-virtio-pci-manual-controller.xml | 50 ++++++++++++++++++ tests/qemuxml2argvtest.c | 22 ++++++-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 10 ---- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 11 +--- ...xmlout-aarch64-virtio-pci-manual-controller.xml | 60 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 6 +++ 13 files changed, 239 insertions(+), 42 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-manual-nocontroller-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-controller.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-controller.xml -- 2.5.0

4 15

[libvirt] [PATCH v4 0/2] qemu: add debug-threads support
by Marc-André Lureau 10 Mar '16

10 Mar '16

QEMU (somewhere around 2.0) added a new sub-option to the -name flag -name debug-threads=on This causes the naming of individual QEMU threads to be helpful; e.g. 'CPU/KVM 0' or 'migration' these show up in top once the H key is pressed, and also show up in a core dump, making it easy to figure out which thread is which. The following 2 patches add a capability check and enable debug-threads if supported. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1140121 cheers v3->v4: - simplify a bit command generation - added a test v2->v3: - move -name command generation in seperate function - fix syntax-check - fix leak v1->v2: - drop the configuration, enable debug-thread automatically Marc-André Lureau (2): qemu: check for debug-threads capability qemu: enable debug threads src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 34 +++++++++++++++++----- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argv-debug-threads.args | 22 ++++++++++++++ .../qemuxml2argv-debug-threads.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml -- 2.5.0

3 4

[libvirt] [PATCH v3 0/2] qemu: add debug-threads support
by Marc-André Lureau 10 Mar '16

10 Mar '16

QEMU (somewhere around 2.0) added a new sub-option to the -name flag -name debug-threads=on This causes the naming of individual QEMU threads to be helpful; e.g. 'CPU/KVM 0' or 'migration' these show up in top once the H key is pressed, and also show up in a core dump, making it easy to figure out which thread is which. The following 2 patches add a capability check and enable debug-threads if supported. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1140121 cheers v2->v3: - move -name command generation in seperate function - fix syntax-check - fix leak v1->v2: - drop the configuration, enable debug-thread automatically Marc-André Lureau (2): qemu: check for debug-threads capability qemu: enable debug threads src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 40 ++++++++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + 7 files changed, 39 insertions(+), 8 deletions(-) -- 2.5.0

3 5

[libvirt] [PATCH v2 0/2] qemu: add debug-threads support
by Marc-André Lureau 10 Mar '16

10 Mar '16

QEMU (somewhere around 2.0) added a new sub-option to the -name flag -name debug-threads=on This causes the naming of individual QEMU threads to be helpful; e.g. 'CPU/KVM 0' or 'migration' these show up in top once the H key is pressed, and also show up in a core dump, making it easy to figure out which thread is which. The following 2 patches add a capability check and enable debug-threads if supported. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1140121 cheers v1->v2: - drop the configuration, enable debug-thread automatically Marc-André Lureau (2): qemu: check for debug-threads capability qemu: enable debug threads src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++++++---- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + 7 files changed, 16 insertions(+), 4 deletions(-) -- 2.5.0

4 8

[libvirt] [PATCH] qemuxml2argvtest: Fix monitor path in serial-file-log
by Jiri Denemark 10 Mar '16

10 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: Pushed as a build-breaker. tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args index de313e5..38cad7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -- 2.7.2

1 0

[libvirt] [PATCH 0/4] docs: website: improve readability
by Cole Robinson 10 Mar '16

10 Mar '16

Some css tweaks to improve test readability and be more consistent with other sites (I was using en.wikipedia.org as a reference) First 2 bits are cleanups, latter 2 bits are actual changes. Front before: http://i.imgur.com/zvFqBa9.png Front after: http://i.imgur.com/gsHa5Pq.png List before: http://i.imgur.com/nh6hMsy.png List after: http://i.imgur.com/WxgE4y0.png Text before: http://i.imgur.com/8bvgEYg.png Text after: http://i.imgur.com/wg0hk4r.png Cole Robinson (4): docs: website: Remove the et.redhat.com footer docs: generic.css: minor cleanups docs: generic.css: font size tweaks docs: generic.css: Indentation and spacing tweaks docs/Makefile.am | 3 --- docs/et.png | Bin 9779 -> 0 bytes docs/footer_corner.png | Bin 2359 -> 0 bytes docs/footer_pattern.png | Bin 817 -> 0 bytes docs/generic.css | 57 ++++++++++++++++++++++++------------------------ docs/libvirt.css | 34 ----------------------------- docs/page.xsl | 6 ----- 7 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 docs/et.png delete mode 100644 docs/footer_corner.png delete mode 100644 docs/footer_pattern.png -- 2.5.0

3 10

[libvirt] [PATCH 0/3] storage: fix file unlink with old uid cache
by Cole Robinson 10 Mar '16

10 Mar '16

There's been several reports of issues deleting storage volumes after creating a VM with virt-manager/virt-install. These patches fix the reports, see patch descriptions for details. Patch #1 is the main fix IMO Patch #2 is a related cleanup that clarifies some remove logic Patch #3 is optional and may not be exhaustive, it's mostly for discussion Pavel's original patches and discussions: https://www.redhat.com/archives/libvir-list/2016-February/msg01224.html https://bugzilla.redhat.com/show_bug.cgi?id=1289327 https://bugzilla.redhat.com/show_bug.cgi?id=1293804 Cole Robinson (3): storage: refresh volume before deletion util: virfile: Clarify setuid usage for virFileRemove util: virfile: Only setuid for virFileRemove if on NFS src/storage/storage_driver.c | 10 ++++++++++ src/util/virfile.c | 39 +++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 6 deletions(-) -- 2.5.0

4 13

[libvirt] [PATCH v2 0/8] Use virtlogd for chardevs & support logging
by Daniel P. Berrange 10 Mar '16

10 Mar '16

This series of patches does two things * Converts the type=file chardev over to use virtlogd (assuming use of virtlogd is enabled in qemu.conf) * Adds a <log file="..."/> element to all chardev sources, allowing data to be captured to a logfile Both of these are important features wanted by openstack. The first thing fixes a long standing security issue that a guest OS can trivially exhuast host disk space by outputing lots of data to its serial port. The second thing allows OpenStack to record boot up messages for a guest's serial console, while still allowing interactive serial console ussage. ie the serial port will be configured with type=tcp, and the new <log> element used to record the data. Both these thing required changes in QEMU, which have been merged for the forthcoming QEMU 2.6 release. Changed in v2: * Split patch 4 up into 4 separate patches * Fix memory leaks * Use common function for building log manager cli args * Add missing XML docs Daniel P. Berrange (8): logging: allow inode/offset params to be NULL conf: allow use of a logfile with chardev backends qemu: add support for logging chardev output to a file qemu: don't append -chardev arg until after value is formatted qemu: move functions for handling FD passing logging: support truncation of logfiles when opening qemu: use virtlogd for character device log files qemu: support use of virtlogd with file based chardevs docs/formatdomain.html.in | 14 + docs/schemas/domaincommon.rng | 12 + src/conf/domain_conf.c | 30 +++ src/conf/domain_conf.h | 2 + src/logging/log_daemon_dispatch.c | 3 +- src/logging/log_handler.c | 6 +- src/logging/log_handler.h | 2 +- src/logging/log_manager.c | 6 +- src/logging/log_manager.h | 2 + src/logging/log_protocol.x | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 282 ++++++++++++++------- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 6 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 4 +- .../qemuxml2argv-serial-file-log.args | 25 ++ .../qemuxml2argv-serial-file-log.xml | 39 +++ tests/qemuxml2argvtest.c | 4 +- 21 files changed, 353 insertions(+), 105 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml -- 2.5.0

2 13

[libvirt] [PATCH 0/3] vcpu refactoring fixes
by Peter Krempa 10 Mar '16

10 Mar '16

My recent refactros led to a few bugs. The memory leak was not caused by me, but it looked like I might have broken it so I've fixed it. Peter Krempa (3): qemu: cpu: Don't remove pinning of cold-unplugged cpu conf: Fix off-by-one in virDomainDefGetVcpu qemu: Fix memory leak in qemuGetSchedInfo src/conf/domain_conf.c | 2 +- src/qemu/qemu_driver.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) -- 2.6.2

3 6

[libvirt] [PATCH 0/2] qemu: add debug-threads support
by Marc-André Lureau 10 Mar '16

10 Mar '16

QEMU (somewhere around 2.0) added a new sub-option to the -name flag -name debug-threads=on This causes the naming of individual QEMU threads to be helpful; e.g. 'CPU/KVM 0' or 'migration' these show up in top once the H key is pressed, and also show up in a core dump, making it easy to figure out which thread is which. The following 2 patches add a capability check and a qemu-conf key to enable debug-threads. Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1140121 cheers Marc-André Lureau (2): qemu: check for debug-threads capability qemu_conf: add set_debug_threads_name configuration key src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 ++++++++++---- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + 12 files changed, 27 insertions(+), 4 deletions(-) -- 2.5.0

4 6

[libvirt] [PATCH v2 0/2] vcpu info refactors - part 3b
by Peter Krempa 10 Mar '16

10 Mar '16

Peter Krempa (2): qemu: vcpupin: Extract live vcpupin setting into a separate function qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags src/qemu/qemu_driver.c | 163 +++++++++++++++++++++++++++---------------------- 1 file changed, 89 insertions(+), 74 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 0/2] persistant live migration with specified XML
by Dmitry Andreev 10 Mar '16

10 Mar '16

Live migration has a bug: specified XML doesn't used for persistant configuration. https://bugzilla.redhat.com/show_bug.cgi?id=835300 This patch-set fixes this problem. Specified XML used for both active and inactive domain XML. Hope this is what it should be. Dmitry Andreev (2): qemuMigrationCookieAddPersistent: change argument type qemu: migration: use specified XML for active and inactive confguration src/qemu/qemu_migration.c | 55 ++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 27 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH] libxl: small fix in parsing network
by Chunyan Liu 10 Mar '16

10 Mar '16

Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5133299..48b8826 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1471,7 +1471,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); d_config->nics = x_nics; - d_config->num_nics = nnics; + d_config->num_nics = nvnics; return 0; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 632acfd..50f7eed 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -315,7 +315,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, virDomainHostdevSubsysPCIPtr pcisrc; if (dev->type == VIR_DOMAIN_DEVICE_NET) - hostdev = &(dev->data.net)->data.hostdev.def; + hostdev = &dev->data.net->data.hostdev.def; else hostdev = dev->data.hostdev; pcisrc = &hostdev->source.subsys.u.pci; -- 2.1.4

3 4

[libvirt] [PATCH 0/9] vcpu info refactors - part 3b
by Peter Krempa 09 Mar '16

09 Mar '16

Yet another continuation of the saga. In this episode we add pinning for inactive cpus. Peter Krempa (9): virsh: vcpupin: Ask for pinning info for all vCPUs conf: Extract code filling data for virDomainGetVcpuPinInfo qemu: Report pinning for all vCPUs in qemuDomainGetVcpuPinInfo conf: introduce parser feature flags conf: refactor checking for unsupported memory devices conf: extract ignoring of inactive vcpu pinning information qemu: add support for offline vcpupin qemu: vcpupin: Extract live vcpupin setting into a separate function qemu: Refactor bitmap handling in qemuDomainPinVcpuFlags src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 157 +++++++++++++++++++++++++++--- src/conf/domain_conf.h | 20 +++- src/libvirt_private.syms | 3 +- src/libxl/libxl_domain.c | 7 -- src/libxl/libxl_driver.c | 38 +------- src/lxc/lxc_domain.c | 8 -- src/openvz/openvz_driver.c | 7 -- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 234 +++++++++++++++++++-------------------------- src/test/test_driver.c | 38 +------- src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 8 +- src/vz/vz_driver.c | 6 +- src/xen/xen_driver.c | 7 -- src/xenapi/xenapi_driver.c | 7 -- tools/virsh-domain.c | 3 +- 20 files changed, 279 insertions(+), 302 deletions(-) -- 2.6.2

2 18

[libvirt] [python PATCH] Add support for JOB_COMPLETED event
by Jiri Denemark 09 Mar '16

09 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- examples/event-test.py | 3 ++ libvirt-override-virConnect.py | 9 ++++++ libvirt-override.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 615f86c..5be4978 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -533,6 +533,8 @@ def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): def myDomainEventMigrationIteration(conn, dom, iteration, opaque): print("myDomainEventMigrationIteration: Domain %s(%s) started migration iteration %d" % ( dom.name(), dom.ID(), iteration)) +def myDomainEventJobCompletedCallback(conn, dom, params, opaque): + print("myDomainEventJobCompletedCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) ########################################################################## # Network events @@ -646,6 +648,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 4231195..396a6ed 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -225,6 +225,15 @@ cb(self, virDomain(self, _obj=dom), iteration, opaque) return 0 + def _dispatchDomainEventJobCompletedCallback(self, dom, params, cbData): + """Dispatches event to python user domain job completed callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), params, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index 2308802..ce36280 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6835,6 +6835,65 @@ libvirt_virConnectDomainEventMigrationIterationCallback(virConnectPtr conn ATTRI } #endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ +#ifdef VIR_DOMAIN_EVENT_ID_JOB_COMPLETED +static int +libvirt_virConnectDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + virTypedParameterPtr params, + int nparams, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + PyObject *pyobj_dict = NULL; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + pyobj_dict = getPyVirTypedParameter(params, nparams); + if (!pyobj_dict) + goto cleanup; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventJobCompletedCallback", + (char*)"OOO", + pyobj_dom, pyobj_dict, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + Py_XDECREF(pyobj_dict); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} +#endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -6940,6 +6999,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventMigrationIterationCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ +#ifdef VIR_DOMAIN_EVENT_ID_JOB_COMPLETED + case VIR_DOMAIN_EVENT_ID_JOB_COMPLETED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventJobCompletedCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.7.2

2 1

[libvirt] sVirt shouldn't let Nova do stupid things
by Matthew Booth 08 Mar '16

08 Mar '16

Nova just released a fix for this critical CVE: https://bugs.launchpad.net/nova/+bug/1548450 To summarise, it's a qcow2 backing file exploit. The user writes a malicious qcow2 header to the top of a raw disk, then triggers a bug in Nova which causes it to do format detection. If you read the bug and comments, you'll see that when I initially reported it I was fairly dismissive of its impact because it's only exploitable through libvirt, and the instance is going to be confined by SELinux. But then Dan B points out that sVirt is going to trust whatever Nova tells it to do and label it appropriately. Cue rapid ramping of severity, and it turns out this allows an unprivileged user to read anything on the host, including all raw block devices. I'm not sure exactly where, but something in this stack has failed us. Let's be clear a couple of things, though: 1. This is an egregious, stupid bug in Nova, and Nova shouldn't have egregious, stupid bugs. 2. SELinux should prevent obviously bad things from happening, even in the presence of egregious, stupid bugs. I point that out to head off: 'Well Nova shouldn't do that'. Of course it shouldn't. However, it might, and when it does, I'd like to think that SELinux has its back. It doesn't, though. As I understand it, sVirt is the mechanism libvirt uses for controlling SELinux. I wonder if the current sVirt model is enough to cover the use case where the thing connecting to libvirt is large enough to have its own serious bugs. Is there any way we could define a sane set of operations independent of Nova? Matt -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK)

2 1

[libvirt] [PATCH v4 0/8] NSS module for libvirt
by Michal Privoznik 08 Mar '16

08 Mar '16

v4 of: https://www.redhat.com/archives/libvir-list/2016-February/msg00693.html diff to v3: - Introduced yet another test to catch linkage problems - Extended nsstest to test multiple addresses - Reworked src/libvirt_nss.la CFLAGS/LDFLAGS - dropped some dependencies - Dropped checking for lease timestamp from nss plugin implementation as it's already done by lease parsing function Michal Privoznik (8): Export virLease* functions for leases file handling virjson: Resolve const correctness Initial support for NSS plugin skeleton libvirt.spec.in: Introduce libvirt-nss package nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test tests: Introduce nsslinktest cfg.mk | 2 +- config-post.h | 24 +++ configure.ac | 2 + libvirt.spec.in | 21 ++ m4/virt-nss.m4 | 51 +++++ po/POTFILES.in | 1 + src/Makefile.am | 60 ++++++ src/libvirt_private.syms | 6 + src/network/leaseshelper.c | 271 +------------------------- src/util/virfile.c | 2 +- src/util/virjson.c | 58 +++--- src/util/virjson.h | 54 +++--- src/util/virlease.c | 304 +++++++++++++++++++++++++++++ src/util/virlease.h | 44 +++++ tests/Makefile.am | 31 ++- tests/nssdata/virbr0.status | 20 ++ tests/nssdata/virbr1.status | 14 ++ tests/nsslinktest.c | 39 ++++ tests/nssmock.c | 140 ++++++++++++++ tests/nsstest.c | 195 +++++++++++++++++++ tools/Makefile.am | 44 +++++ tools/nss/libvirt_nss.c | 463 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 +++++ tools/nss/libvirt_nss.syms | 12 ++ 24 files changed, 1580 insertions(+), 330 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssdata/virbr1.status create mode 100644 tests/nsslinktest.c create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

2 14

[libvirt] GSoC 2016
by Tahir Ramzan 08 Mar '16

08 Mar '16

Respected Sir, I am a MS CS scholar of Virtual University of Pakistan, I want to participate in GSoC 2016 for Libvirt. Data Science, Networks, Information security, digital forensics and ethical hacking are my core areas of interest. Currently, I am working on a research project on live forensics of GPU and volatile memories like RAMs and Caches. I am looking forward your guidance to start my contribution for Libvirt, thanks in anticipation. Regards Tahir Ramzan

4 4

[libvirt] ruby-libvirt mixed storage migration
by Tim Förster - Hetzner Online AG 07 Mar '16

07 Mar '16

Heyho guys, is there any reason why mixed storage migration is restriced. I am unable to serve parameter "migrate_disks" through #migrate_to_uri3. It looks like there is a missing macro here. http://libvirt.org/git/?p=ruby-libvirt.git;a=blob;f=ext/libvirt/domain.c#l3…. Could you please verify this? regrads, tim

2 3

[libvirt] [PATCH] ruby-libvirt: Don't crash in leases_wrap() by passing NULLs to rb_str_new2()
by Dan Williams 07 Mar '16

07 Mar '16

Not all lease values are mandatory, and when they aren't supplied by the libvirt driver they get set to NULL. That makes rb_str_new2() bail out. Signed-off-by: Dan Williams <dcbw(a)redhat.com> --- For example using the qemu driver we don't get 'iaid', and that makes ruby unhappy: [{"iface"=>"virbr1", "expirytime"=>1452189569, "type"=>0, "mac"=>"52:54:00:05:2b:6f", "ipaddr"=>"192.168.121.49", "prefix"=>24, "hostname"=>"openshiftdev", "clientid"=>"ff:00:05:2b:6f:00:01:00:01:1e:21:55:ed:52:54:00:05:2b:6f"}] ext/libvirt/network.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ext/libvirt/network.c b/ext/libvirt/network.c index 7c77d73..c250d7d 100644 --- a/ext/libvirt/network.c +++ b/ext/libvirt/network.c @@ -269,14 +269,20 @@ static VALUE leases_wrap(VALUE arg) rb_hash_aset(hash, rb_str_new2("expirytime"), LL2NUM(lease->expirytime)); rb_hash_aset(hash, rb_str_new2("type"), INT2NUM(lease->type)); - rb_hash_aset(hash, rb_str_new2("mac"), rb_str_new2(lease->mac)); - rb_hash_aset(hash, rb_str_new2("iaid"), rb_str_new2(lease->iaid)); + if (lease->mac) + rb_hash_aset(hash, rb_str_new2("mac"), rb_str_new2(lease->mac)); + if (lease->iaid) + rb_hash_aset(hash, rb_str_new2("iaid"), rb_str_new2(lease->iaid)); rb_hash_aset(hash, rb_str_new2("ipaddr"), rb_str_new2(lease->ipaddr)); rb_hash_aset(hash, rb_str_new2("prefix"), UINT2NUM(lease->prefix)); - rb_hash_aset(hash, rb_str_new2("hostname"), - rb_str_new2(lease->hostname)); - rb_hash_aset(hash, rb_str_new2("clientid"), - rb_str_new2(lease->clientid)); + if (lease->hostname) { + rb_hash_aset(hash, rb_str_new2("hostname"), + rb_str_new2(lease->hostname)); + } + if (lease->clientid) { + rb_hash_aset(hash, rb_str_new2("clientid"), + rb_str_new2(lease->clientid)); + } rb_ary_store(result, i, hash); } -- 2.4.3

3 6

[libvirt] [PATCH] Fix minor typos in messages
by Yuri Chornoivan 07 Mar '16

07 Mar '16

Hi, Attached is a patch to fix minor typos in libvirt messages. Thanks for fixing them in the repo. By the way, libvirt template has not been updated for almost 1 year on Zanata. Are the translation moved into some new location? Thanks in advance for your answers. Best regards, Yuri

2 1

[libvirt] [PATCH v2 0/7] Fix and enhance statistics of a completed job
by Jiri Denemark 07 Mar '16

07 Mar '16

Jiri Denemark (7): qemu: Store completed stats at the very end of migration qemu: Properly update completed migration stats qemu: Don't explicitly stop CPUs after migration qemu: Fix a race when computing migration downtime qemu: Do not report completed stats until the job finishes Introduce job completed event qemu: Add support for job completed event daemon/remote.c | 38 ++++++++++++++++++ include/libvirt/libvirt-domain.h | 24 ++++++++++++ src/conf/domain_event.c | 85 +++++++++++++++++++++++++++++++++++++++- src/conf/domain_event.h | 10 +++++ src/libvirt-domain.c | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 24 ++++++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_migration.c | 74 ++++++++++++++++++++++------------ src/qemu/qemu_process.c | 20 +++++++--- src/remote/remote_driver.c | 42 ++++++++++++++++++++ src/remote/remote_protocol.x | 14 ++++++- src/remote_protocol-structs | 9 +++++ tools/virsh-domain.c | 25 ++++++++++++ 15 files changed, 344 insertions(+), 35 deletions(-) -- 2.7.2

2 16

[libvirt] "opertaions" typo on wiki.
by Dennis 07 Mar '16

07 Mar '16

Hi, I tried to edit http://wiki.libvirt.org/page/Main_Page to fix a typo of the word 'operations,' (see email subject) but could not figure out how to create an account. I read on the contact page that if I am not subscribed to the mailing list I am mailing this small insignificant task won't be emailed to a large group of people and will be moderated appropriately. Thanks, Dennis O.

2 1

[libvirt] [libvirt-glib] gconfig: Fix next API version number
by Fabiano Fidêncio 07 Mar '16

07 Mar '16

Commit 01e01f2 introduced a wrong next API version number in libvirt-gconfig.sym Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig.sym | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index f11f97a..5bc2e24 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -733,7 +733,7 @@ global: gvir_config_domain_video_set_vgamem; } LIBVIRT_GCONFIG_0.2.1; -LIBVIRT_GCONFIG_0.2.4 { +LIBVIRT_GCONFIG_0.2.3 { gvir_config_domain_graphics_spice_set_gl; gvir_config_domain_video_set_accel3d; } LIBVIRT_GCONFIG_0.2.2; -- 2.5.0

2 1

[libvirt] [PATCH 00/25] Final pile of qemu_command.c changes
by John Ferlan 07 Mar '16

07 Mar '16

Finishing the adventure - certainly qemuBuildCommandLine looks much cleaner now and is much shorter (~2100 lines down to ~250 lines). The downside is plowing though the changes and the reviews. John Ferlan (25): qemu: Introduce qemuBuildClockCommandLine qemu: Introduce qemuBuildPMCommandLine qemu: Introduce qemuBuildBootCommandLine qemu: Introduce qemuBuildGlobalControllerCommandLine qemu: Introduce qemuBuildControllerDevCommandLine qemu: Introduce qemuBuildHubCommandLine qemu: Introduce qemuBuildDiskDriveCommandLine qemu: Introduce qemuBuildFSDevCommandLine qemu: Introduce qemuBuildNetCommandLine qemu: Introduce qemuBuildSmartcardCommandLine qemu: Introduce qemuBuildSerialCommandLine qemu: Introduce qemuBuildParallelsCommandLine qemu: Introduce qemuBuildChannelsCommandLine qemu: Introduce qemuBuildConsoleCommandLine qemu: Modify qemuBuildTPMCommandLine qemu: Introduce qemuBuildInputCommandLine qemu: Introduce qemuBuildVideoCommandLine qemu: Introduce qemuBuildSoundCommandLine qemu: Introduce qemuBuildWatchdogCommandLine qemu: Introduce qemuBuildRedirdevCommandLine qemu: Introduce qemuBuildHostdevCommandLine qemu: Introduce qemuBuildMemballoonCommandLine qemu: Introduce qemuBuildRNGCommandLine qemu: Introduce qemuBuildNVRAMCommandLine qemu: Introduce qemuBuildPanicCommandLine src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 8 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7703 +++++++++++++++++++++------------------- src/qemu/qemu_command.h | 46 +- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_domain_address.h | 2 +- 8 files changed, 4073 insertions(+), 3706 deletions(-) -- 2.5.0

2 27

[libvirt] [PATCH] locking: Use bit shift for flag values not constant values.
by John Ferlan 07 Mar '16

07 Mar '16

So far it hasn't bitten us, but if the next value wasn't 4, then the logic used to check flag bits would have issues. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Noted this while reviewing danpb's virtlogd as chardev series. src/locking/lock_driver_lockd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_lockd.h b/src/locking/lock_driver_lockd.h index baf346a..6931fe7 100644 --- a/src/locking/lock_driver_lockd.h +++ b/src/locking/lock_driver_lockd.h @@ -23,8 +23,8 @@ # define __VIR_LOCK_DRIVER_LOCKD_H__ enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = (1 << 0), + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = (1 << 1), }; #endif /* __VIR_LOCK_DRIVER_LOCKD_H__ */ -- 2.5.0

2 1

[libvirt] [PATCH] _virtualboxCreateMachine: Avoid unbound stack
by Michal Privoznik 07 Mar '16

07 Mar '16

If the stars are in the right position and you're building with VBox >= 4.2.0 it will happen that compiler thinks an array allocated on the stack may be unbound: In file included from vbox/vbox_V4_2.c:13:0: vbox/vbox_tmpl.c: In function '_virtualboxCreateMachine': vbox/vbox_tmpl.c:2811:1: error: stack usage might be unbounded [-Werror=stack-usage=] _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **machine, char *uuidstr ATTRIBUTE_UNUSED) ^ Well, given how the variable is declared, I had some hard time seeing it is actually bounded. Surprisingly compiler does not complain because of -Wframe-larger-than. This is because variable length arrays do not count into that warning. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/vbox/vbox_tmpl.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 0fbd5b3..7a8205d 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2812,7 +2812,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m { vboxIID iid = VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 = NULL; - nsresult rc; + nsresult rc = -1; VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); @@ -2843,18 +2843,12 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m override, machine); #else /* VBOX_API_VERSION >= 4002000 */ - const char *flagsUUIDPrefix = "UUID="; - const char *flagsForceOverwrite = "forceOverwrite=0"; - const char *flagsSeparator = ","; - char createFlags[strlen(flagsUUIDPrefix) + VIR_UUID_STRING_BUFLEN + strlen(flagsSeparator) + strlen(flagsForceOverwrite) + 1]; + char *createFlags = NULL; PRUnichar *createFlagsUtf16 = NULL; - snprintf(createFlags, sizeof(createFlags), "%s%s%s%s", - flagsUUIDPrefix, - uuidstr, - flagsSeparator, - flagsForceOverwrite - ); + if (virAsprintf(&createFlags, + "UUID=%s,forceOverwrite=0", uuidstr) < 0) + goto cleanup; VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, @@ -2864,6 +2858,8 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m nsnull, createFlagsUtf16, machine); + cleanup: + VIR_FREE(createFlags); #endif /* VBOX_API_VERSION >= 4002000 */ } VBOX_UTF16_FREE(machineNameUtf16); -- 2.4.10

2 1

[libvirt] [PATCH] qemu: improve the error when try to undefine transient network
by Shanzhi Yu 07 Mar '16

07 Mar '16

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/network/bridge_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7ab9e29..b62fdff 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3222,6 +3222,12 @@ networkUndefine(virNetworkPtr net) if (virNetworkObjIsActive(network)) active = true; + if (!network->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("can't undefine transient network")); + goto cleanup; + } + /* remove autostart link */ if (virNetworkDeleteConfig(driver->networkConfigDir, driver->networkAutostartDir, -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: rename: Forbid renaming domains with managed save image
by Peter Krempa 07 Mar '16

07 Mar '16

The code does not handle renaming of the save state file. In addition to that the resuming code would need to be tweaked to handle the name change since the XML is extracted from the save image. The easies option is to make the rename API even less useful by forbiding this. --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 102fade..4020364 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19994,6 +19994,12 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } + if (vm->hasManagedSave) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain with a managed saved state can't be renamed")); + goto endjob; + } + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_SHUTOFF) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain has to be shutoff before renaming")); -- 2.6.2

2 1

[libvirt] [PATCH v3] Use correct pci addresses during interface-detach
by Nitesh Konkar 07 Mar '16

07 Mar '16

From: Nitesh_Konkar <niteshkonkar.libvirt(a)gmail.com> --- tools/virsh-domain.c | 103 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 979f115..a15ef40 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c -static bool -cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +static bool +vshDomainDetachInterface(char *doc, unsigned int flags, virDomainPtr dom, vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom = NULL; xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL, matchNode = NULL; - char *detach_xml = NULL; const char *mac = NULL, *type = NULL; - char *doc = NULL; + char *detach_xml = NULL; + bool current = vshCommandOptBool(cmd, "current"); char buf[64]; int diff_mac; size_t i; int ret; bool functionReturn = false; - unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - bool current = vshCommandOptBool(cmd, "current"); - bool config = vshCommandOptBool(cmd, "config"); - bool live = vshCommandOptBool(cmd, "live"); - bool persistent = vshCommandOptBool(cmd, "persistent"); - - VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); - - VSH_EXCLUSIVE_OPTIONS_VAR(current, live); - VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - - if (config || persistent) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) goto cleanup; @@ -10859,15 +10823,6 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) goto cleanup; - if (persistent && - virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); - else - doc = virDomainGetXMLDesc(dom, 0); - if (!doc) goto cleanup; @@ -10935,20 +10890,72 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else ret = virDomainDetachDevice(dom, detach_xml); - if (ret != 0) { - vshError(ctl, "%s", _("Failed to detach interface")); - } else { - vshPrint(ctl, "%s", _("Interface detached successfully\n")); + if (ret == 0) functionReturn = true; - } cleanup: - VIR_FREE(doc); VIR_FREE(detach_xml); - virDomainFree(dom); + xmlFreeDoc(xml); xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); + return functionReturn; +} + +static bool +cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + char *doc_live = NULL, *doc_config = NULL; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + bool functionReturn = false; + + VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); + + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config || persistent) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + doc_config = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + if (!(functionReturn = vshDomainDetachInterface(doc_config, flags, dom, ctl, cmd))) + goto cleanup; + } + + if (live || (!live && !config)) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + doc_live = virDomainGetXMLDesc(dom, 0); + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + flags &= (~VIR_DOMAIN_AFFECT_CONFIG); + + functionReturn = vshDomainDetachInterface(doc_live, flags, dom, ctl, cmd); + } + + cleanup: + if (functionReturn == false) { + vshError(ctl, "%s", _("Failed to detach interface")); + } else { + vshPrint(ctl, "%s", _("Interface detached successfully\n")); + functionReturn = true; + } + VIR_FREE(doc_live); + VIR_FREE(doc_config); + virDomainFree(dom); return functionReturn; }

1 0

[libvirt] [PATCH] Use correct pci addresses during interface-detach[v2]
by Nitesh Konkar 07 Mar '16

07 Mar '16

The virsh attach virsh detach interface command fails when both live and config are set and when the interface gets attached to different pci slots on live and config xml respectively. When we attach an interface with both --live and --config, the first time they get the same PCI slots, but the second time onwards it differs and hence the virsh detach-interface --live --config command fails. This patch makes sure that when both --live --config are set , qemuDomainDetachDeviceFlags is called twice, once with config xml and once with live xml. Steps to see the issue: virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config Signed-off-by:nitkon12@linux.vnet.ibm.com --- tools/virsh-domain.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..43c8436 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10815,7 +10815,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) char buf[64]; int diff_mac; size_t i; - int ret; + int ret, flag_live_config_both = 0; bool functionReturn = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); @@ -10830,7 +10830,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (config || persistent) flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) + if (!(config || persistent) && live) // Only Live flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -10851,6 +10851,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else doc = virDomainGetXMLDesc(dom, 0); + forlivexml: + if (!doc) goto cleanup; @@ -10921,6 +10923,14 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (ret != 0) { vshError(ctl, "%s", _("Failed to detach interface")); } else { + if ((config || persistent) && live && flag_live_config_both == 0) {//executed only when live config both in cmd. + doc = virDomainGetXMLDesc(dom, 0); + flag_live_config_both=1; //Need to execute this code only once + flags |= VIR_DOMAIN_AFFECT_LIVE; //set live flag + flags &= (~VIR_DOMAIN_AFFECT_CONFIG ); // need to unset config flag as config xml detach is already done. + mac=NULL; + goto forlivexml; + } vshPrint(ctl, "%s", _("Interface detached successfully\n")); functionReturn = true; } -- 1.8.3.1

2 2

[libvirt] [PATCH v3] Use correct pci addresses during interface-detach
by Nitesh Konkar 07 Mar '16

07 Mar '16

From: Nitesh_Konkar <niteshkonkar.libvirt(a)gmail.com> --- tools/virsh-domain.c | 103 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 979f115..a15ef40 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c -static bool -cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +static bool +vshDomainDetachInterface(char *doc, unsigned int flags, virDomainPtr dom, vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom = NULL; xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr cur = NULL, matchNode = NULL; - char *detach_xml = NULL; const char *mac = NULL, *type = NULL; - char *doc = NULL; + char *detach_xml = NULL; + bool current = vshCommandOptBool(cmd, "current"); char buf[64]; int diff_mac; size_t i; int ret; bool functionReturn = false; - unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; - bool current = vshCommandOptBool(cmd, "current"); - bool config = vshCommandOptBool(cmd, "config"); - bool live = vshCommandOptBool(cmd, "live"); - bool persistent = vshCommandOptBool(cmd, "persistent"); - - VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); - - VSH_EXCLUSIVE_OPTIONS_VAR(current, live); - VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - - if (config || persistent) - flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) goto cleanup; @@ -10859,15 +10823,6 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) goto cleanup; - if (persistent && - virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); - else - doc = virDomainGetXMLDesc(dom, 0); - if (!doc) goto cleanup; @@ -10935,20 +10890,72 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else ret = virDomainDetachDevice(dom, detach_xml); - if (ret != 0) { - vshError(ctl, "%s", _("Failed to detach interface")); - } else { - vshPrint(ctl, "%s", _("Interface detached successfully\n")); + if (ret == 0) functionReturn = true; - } cleanup: - VIR_FREE(doc); VIR_FREE(detach_xml); - virDomainFree(dom); + xmlFreeDoc(xml); xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); + return functionReturn; +} + +static bool +cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + char *doc_live = NULL, *doc_config = NULL; + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool persistent = vshCommandOptBool(cmd, "persistent"); + bool functionReturn = false; + + VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); + + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + + if (config || persistent) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + doc_config = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE); + if (!(functionReturn = vshDomainDetachInterface(doc_config, flags, dom, ctl, cmd))) + goto cleanup; + } + + if (live || (!live && !config)) + flags |= VIR_DOMAIN_AFFECT_LIVE; + + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + doc_live = virDomainGetXMLDesc(dom, 0); + + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + flags &= (~VIR_DOMAIN_AFFECT_CONFIG); + + functionReturn = vshDomainDetachInterface(doc_live, flags, dom, ctl, cmd); + } + + cleanup: + if (functionReturn == false) { + vshError(ctl, "%s", _("Failed to detach interface")); + } else { + vshPrint(ctl, "%s", _("Interface detached successfully\n")); + functionReturn = true; + } + VIR_FREE(doc_live); + VIR_FREE(doc_config); + virDomainFree(dom); return functionReturn; }

1 0

[libvirt] Ext transport mode libvirt
by nidhi d 06 Mar '16

06 Mar '16

How do i create a new mode of communication between source and destination using ext mode of transport?

1 0

[libvirt] [PATCH] qemu: Support to detach redirdev device
by Osier Yang 05 Mar '16

05 Mar '16

Attaching redirdev device has been supported for a while, but detaching is not never implemented. Simple procedure to test: % lsusb Bus 001 Device 014: ID 0781:5567 SanDisk Corp. Cruzer Blade % usbredirserver -p 4000 0781:5567 % virsh attach-device test usb.xml % cat usb.xml <redirdev bus='usb' type='tcp'> <source mode='connect' host='192.168.84.6' service='4000'/> </redirdev> % virsh detach-device test usb.xml % virsh qemu-monitor-command test --pretty '{"execute": "query-chardev"}' | grep 4000 On success, the chardev should not seen in output of above command. --- src/conf/domain_conf.c | 67 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/libvirt_private.syms | 3 ++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 3 ++ 6 files changed, 176 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3b15cb4..d304232 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13825,6 +13825,73 @@ virDomainMemoryRemove(virDomainDefPtr def, return ret; } +ssize_t +virDomainRedirdevFind(virDomainDefPtr def, + virDomainRedirdevDefPtr redirdev) +{ + size_t i; + + for (i = 0; i < def->nredirdevs; i++) { + virDomainRedirdevDefPtr tmp = def->redirdevs[i]; + + if (redirdev->bus != tmp->bus) + continue; + + virDomainChrSourceDef source_chr = redirdev->source.chr; + virDomainChrSourceDef tmp_chr = tmp->source.chr; + + if (source_chr.type != tmp_chr.type) + continue; + + switch (source_chr.type) { + case VIR_DOMAIN_CHR_TYPE_TCP: + if (STRNEQ_NULLABLE(source_chr.data.tcp.host, + tmp_chr.data.tcp.host)) + continue; + if (STRNEQ_NULLABLE(source_chr.data.tcp.service, + tmp_chr.data.tcp.service)) + continue; + if (source_chr.data.tcp.listen != tmp_chr.data.tcp.listen) + continue; + if (source_chr.data.tcp.protocol != tmp_chr.data.tcp.protocol) + continue; + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + if (source_chr.data.spicevmc != tmp_chr.data.spicevmc) + continue; + break; + + default: + /* Unlikely, currently redirdev only supports character device of + * type "tcp" and "spicevmc". + */ + break; + } + + if (redirdev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&redirdev->info, &tmp->info)) + continue; + + break; + } + + if (i < def->nredirdevs) + return i; + + return -1; +} + +virDomainRedirdevDefPtr +virDomainRedirdevRemove(virDomainDefPtr def, + size_t idx) +{ + virDomainRedirdevDefPtr ret = def->redirdevs[idx]; + + VIR_DELETE_ELEMENT(def->redirdevs, idx, def->nredirdevs); + + return ret; +} char * virDomainDefGetDefaultEmulator(virDomainDefPtr def, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1de3be3..03c0155 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2538,6 +2538,10 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def); void virDomainHostdevDefFree(virDomainHostdevDefPtr def); void virDomainHubDefFree(virDomainHubDefPtr def); void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def); +ssize_t virDomainRedirdevFind(virDomainDefPtr def, + virDomainRedirdevDefPtr redirdev); +virDomainRedirdevDefPtr virDomainRedirdevRemove(virDomainDefPtr def, + size_t idx); void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def); void virDomainShmemDefFree(virDomainShmemDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4b40612..ad7d82c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -423,6 +423,9 @@ virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeToString; virDomainRedirdevBusTypeFromString; virDomainRedirdevBusTypeToString; +virDomainRedirdevDefFree; +virDomainRedirdevFind; +virDomainRedirdevRemove; virDomainRNGBackendTypeToString; virDomainRNGDefFree; virDomainRNGFind; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45ff3c0..8905af6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7736,6 +7736,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_MEMORY: ret = qemuDomainDetachMemoryDevice(driver, vm, dev->data.memory); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev); + break; case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -7748,7 +7751,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_SHMEM: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index dc76268..bbe8aa7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3287,6 +3287,49 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, } +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event; + char *charAlias = NULL; + ssize_t idx; + int rc; + int ret = -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + redirdev->info.alias, vm, vm->def->name); + + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) + return -1; + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorDetachCharDev(priv->mon, charAlias); + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, redirdev, "detach", rc == 0); + + if (rc < 0) + goto cleanup; + + event = virDomainEventDeviceRemovedNewFromObj(vm, redirdev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx = virDomainRedirdevFind(vm->def, redirdev)) >= 0) + virDomainRedirdevRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + virDomainRedirdevDefFree(redirdev); + + ret = 0; + + cleanup: + VIR_FREE(charAlias); + return ret; +} + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3318,6 +3361,10 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveMemoryDevice(driver, vm, dev->data.memory); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainRemoveRedirdevDevice(driver, vm, dev->data.redirdev); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: @@ -3327,7 +3374,6 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: @@ -4318,3 +4364,52 @@ qemuDomainDetachMemoryDevice(virQEMUDriverPtr driver, qemuDomainResetDeviceRemoval(vm); return ret; } + +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainRedirdevDefPtr tmp; + ssize_t idx; + int rc; + int ret = -1; + + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("qemu does not support -device")); + return -1; + } + + if ((idx = virDomainRedirdevFind(vm->def, redirdev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device not present in domain configuration")); + return -1; + } + + tmp = vm->def->redirdevs[idx]; + + if (!tmp->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmp->info); + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorDelDevice(priv->mon, tmp->info.alias); + if (qemuDomainObjExitMonitor(driver, vm) || rc < 0) + goto cleanup; + + rc = qemuDomainWaitForDeviceRemoval(vm); + if (rc == 0 || rc == 1) + ret = qemuDomainRemoveRedirdevDevice(driver, vm, tmp); + else + ret = 0; + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 4140da3..4ef42e9 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -51,6 +51,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainRedirdevDefPtr hostdev); +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev); int qemuDomainAttachHostDevice(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.1.4

2 2

[libvirt] patch doc/apps.html.in
by Alex Roithman 05 Mar '16

05 Mar '16

Follow to http://libvirt.org/apps.html#add send the patch.

1 0

[libvirt] [PATCH 0/3] vz: disk format support
by Mikhail Feoktistov 04 Mar '16

04 Mar '16

Mikhail Feoktistov (3): vz: add vzInitVersion function vz: add virStorageFileFormat to connection structure vz: check supported disk format src/vz/vz_driver.c | 52 +++++++----------------------------------- src/vz/vz_sdk.c | 28 ++++++++++++++++------- src/vz/vz_sdk.h | 2 +- src/vz/vz_utils.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_utils.h | 10 +++++++++ 5 files changed, 105 insertions(+), 53 deletions(-) -- 1.8.3.1

1 4

[libvirt] [PATCH] virLXCProcessMonitorInitNotify: Initialize @inode
by Michal Privoznik 04 Mar '16

04 Mar '16

This is an error message I've just seen. Fix it by initializing @inode. CC lxc/libvirt_driver_lxc_impl_la-lxc_process.lo lxc/lxc_process.c: In function 'virLXCProcessMonitorInitNotify': lxc/lxc_process.c:767:23: error: 'inode' may be used uninitialized in this function [-Werror=maybe-uninitialized] virDomainAuditInit(vm, initpid, inode); ^ Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/lxc/lxc_process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 50bee48..5e0bbe2 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -749,7 +749,7 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED virLXCDriverPtr driver = lxc_driver; virLXCDomainObjPrivatePtr priv; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); - ino_t inode; + ino_t inode = 0; virObjectLock(vm); @@ -762,7 +762,6 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED (unsigned long long)initpid, err && err->message ? err->message : "<unknown>"); virResetLastError(); - inode = 0; } virDomainAuditInit(vm, initpid, inode); -- 2.4.10

1 0

[libvirt] [PATCH v3 0/2] cleanup resolving persistent/running/current flags
by Nikolay Shirokovskiy 04 Mar '16

04 Mar '16

Changes from version2 ===================== 1. Already ACKed or PUSHed patches are dropped. 2. Patch of reusing virDomainObjUpdateModificationImpact is splitted into lxc and libxl and compilation is fixed. Nikolay Shirokovskiy (2): lxc: reuse virDomainObjUpdateModificationImpact libxl: reuse virDomainObjUpdateModificationImpact src/libxl/libxl_driver.c | 63 ++++------------------------------------ src/lxc/lxc_driver.c | 75 ++++-------------------------------------------- 2 files changed, 12 insertions(+), 126 deletions(-) -- 1.8.3.1

3 4

[libvirt] [PATCH] tools: do not leak uri in disconnect handler
by Ján Tomko 04 Mar '16

04 Mar '16

Commit 035947e introduced a call to virConnectGetURI without a matching free() in virshCatchDisconnect. Also fix vshAdmCatchDisconnect where it was copied by commit 6dd7e42. https://bugzilla.redhat.com/show_bug.cgi?id=1303891 --- tools/virsh.c | 1 + tools/virt-admin.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 72446be..57b4ff3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -124,6 +124,7 @@ virshCatchDisconnect(virConnectPtr conn, break; } vshError(ctl, _(str), NULLSTR(uri)); + VIR_FREE(uri); if (error) { virSetError(error); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 3c818a3..c470536 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -92,6 +92,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, } vshError(ctl, _(str), NULLSTR(uri)); + VIR_FREE(uri); if (error) { virSetError(error); -- 2.4.10

2 1

[libvirt] [PATCH v2 0/4] cleanup resolving persistent/running/current flags
by Nikolay Shirokovskiy 03 Mar '16

03 Mar '16

Original name of series was: Subject: [PATCH 0/3] make virDomainObjGetPersistentDef return only persistent definition Changes from version1 ===================== Original motivation of the series was fixing virDomainObjGetPersistentDef so that it would not return configs other than persistent. However the final patch that does it in the first version is absent in current version. I think the fix should be done another way and in different series. Thus this version has only misc cleanups which are better splitted into patches in this version. A few words why I leave patch for virDomainObjGetPersistentDef. First I should not return NULL from the function as this value already has different meaning - memory allocation error and there is code that checks for this error. This code calls virDomainObjGetPersistentDef unconditionally but later use the return value only for persistent domains, thus it could get NULL pointer on function call and treat it as an allocation error. I think the proper way would be chaning virDomainObjGetPersistentDef so it could not fail that is not call virDomainObjSetDefTransient. Looks like this is already true because drivers that distiguish between running/persistent config call virDomainObjSetDefTransient ealy in the domain start process (and even two times) so that later calls for virDomainObjSetDefTransient are unnecessary. Nikolay Shirokovskiy (4): virDomainObjUpdateModificationImpact: reduce nesting libxlDomainSetMemoryFlags : reuse virDomainLiveConfigHelperMethod lxc, libxl: reuse virDomainObjUpdateModificationImpact libxlDomainPinVcpuFlags: remove check duplicates src/conf/domain_conf.c | 12 +++--- src/libxl/libxl_driver.c | 103 ++++------------------------------------------- src/lxc/lxc_driver.c | 75 +++------------------------------- 3 files changed, 19 insertions(+), 171 deletions(-) -- 1.8.3.1

3 14

[libvirt] [PATCH] Use correct LDFLAGS for leaseshelper
by Jiri Denemark 03 Mar '16

03 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index a316b4d..d57d303 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2810,6 +2810,10 @@ libvirt_iohelper_CFLAGS = \ if WITH_NETWORK libexec_PROGRAMS += libvirt_leaseshelper libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) libvirt_leaseshelper_LDADD = \ libvirt_util.la \ ../gnulib/lib/libgnu.la -- 2.7.2

2 1

[libvirt] [PATCH] qemu: Check if domain is active in GetControlInfo
by Jiri Denemark 03 Mar '16

03 Mar '16

Reporting status of a control connection makes no sense for an inactive domain. https://bugzilla.redhat.com/show_bug.cgi?id=1281706 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bd4071..9fd4c57 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2763,6 +2763,12 @@ qemuDomainGetControlInfo(virDomainPtr dom, if (virDomainGetControlInfoEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + priv = vm->privateData; memset(info, 0, sizeof(*info)); -- 2.7.2

2 1

[libvirt] [PATCH] qemu: forbid renaming domain which has managedsave file
by Shanzhi Yu 03 Mar '16

03 Mar '16

after rename a domain which has managedsave file, the new name domain can't boot up from the state it saved, and the managedsave file will exist with the original name. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bd4071..036a367 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20000,6 +20000,12 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } + if (vm->hasManagedSave) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("can't rename a domain has managedsave file")); + goto endjob; + } + if (virDomainObjListRename(driver->domains, vm, new_name, flags, qemuDomainRenameCallback, driver) < 0) goto endjob; -- 2.5.0

1 0

[libvirt] [PATCH 0/7] Couple of -Os fixes
by Michal Privoznik 03 Mar '16

03 Mar '16

So while trying to bring down the size of my nss module, one of the things I've tried was compiling with -Os instead of -O3. Interesting errors pop up. Here are the fixes. If you think I should squash some patches together, I will gladly do that. Michal Privoznik (7): virCommandAddEnv: Drop inline virDomainNumatuneNodeSpecified: Drop inline virDomainChrRemove: Initialize @ret vbox: Initialize @rc qemuDomainBlockCommit: Initialize @baseSource virNetworkDefForwardIf: drop inline virStorageBackendLogicalMatchPoolSource: Initialize @thisSource src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 8 ++++++++ src/conf/network_conf.h | 8 +------- src/conf/numa_conf.c | 2 +- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/util/vircommand.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- 10 files changed, 17 insertions(+), 14 deletions(-) -- 2.4.10

2 9

[libvirt] [PATCH] daemon: fixup refcounting in close callback handling
by Nikolay Shirokovskiy 03 Mar '16

03 Mar '16

remoteDispatchConnectCloseCallbackRegister introduced in f484310add53ebdc26a6fdcb88bc398750325b7e has problems. It refcounts network client object and in case of NOOP driver operations for close callback registering/unregistering (any driveres besides vz) nobody will unref it later. As a result client connection will not be disposed and driver connection will not be closed. The fix is easy. We don't need to refcount at all. We don't get dangling pointer because in remoteClientFreeFunc which is called upon disposing this network client object we unregistering close callback. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- daemon/remote.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 04d8ada..17783fa 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3382,11 +3382,9 @@ remoteDispatchConnectCloseCallbackRegister(virNetServerPtr server ATTRIBUTE_UNUS goto cleanup; } - // on behalf of close callback - virObjectRef(client); if (virConnectRegisterCloseCallback(priv->conn, remoteRelayConnectionClosedEvent, - client, virObjectFreeCallback) < 0) + client, NULL) < 0) goto cleanup; priv->closeRegistered = true; -- 1.8.3.1

2 1

[libvirt] [PATCH] Reject migration with both --live and --offline when migration requested from other clients/API.
by Nitesh Konkar 03 Mar '16

03 Mar '16

--- src/libvirt-domain.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 9491845..6a5034e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3616,6 +3616,13 @@ virDomainMigrate(virDomainPtr domain, VIR_MIGRATE_NON_SHARED_INC, error); + if ((flags & VIR_MIGRATE_OFFLINE) && (flags & VIR_MIGRATE_LIVE)) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Options --live and --offline are " + "mutually exclusive")); + goto error; + } + if (flags & VIR_MIGRATE_OFFLINE) { if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { @@ -3840,6 +3847,13 @@ virDomainMigrate2(virDomainPtr domain, VIR_MIGRATE_NON_SHARED_INC, error); + if ((flags & VIR_MIGRATE_OFFLINE) && (flags & VIR_MIGRATE_LIVE)) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Options --live and --offline are " + "mutually exclusive")); + goto error; + } + if (flags & VIR_MIGRATE_OFFLINE) { if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { @@ -4014,6 +4028,13 @@ virDomainMigrate3(virDomainPtr domain, VIR_MIGRATE_NON_SHARED_INC, error); + if ((flags & VIR_MIGRATE_OFFLINE) && (flags & VIR_MIGRATE_LIVE)) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Options --live and --offline are " + "mutually exclusive")); + goto error; + } + if (flags & VIR_MIGRATE_PEER2PEER) { virReportInvalidArg(flags, "%s", _("use virDomainMigrateToURI3 for peer-to-peer " -- 1.8.3.1

2 1

[libvirt] [PATCH v3] This patch gives an error when migration is attempted with both --live and --offline options.
by Nitesh Konkar 03 Mar '16

03 Mar '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 43c8436..b9f678f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9838,6 +9838,8 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) bool live_flag = false; virshCtrlData data = { .dconn = NULL }; + VSH_EXCLUSIVE_OPTIONS("live", "offline"); + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.8.3.1

3 3

[libvirt] [PATCH] util: Cleanup error path for virPolkitAgentCreate
by John Ferlan 02 Mar '16

02 Mar '16

More fallout from changing to using virPolkitAgent and handling error paths. Needed to clear the 'cmd' once stored and of course add the virCommandFree(cmd) in the error: label. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Found by coverity... Pushed as trivial... src/util/virpolkit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 44f2328..2038744 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -182,6 +182,7 @@ virPolkitAgentCreate(void) if (VIR_ALLOC(agent) < 0) goto error; agent->cmd = cmd; + cmd = NULL; virCommandAddArgFormat(cmd, "%lld", (long long int) getpid()); virCommandAddArg(cmd, "--notify-fd"); @@ -206,6 +207,7 @@ virPolkitAgentCreate(void) VIR_FORCE_CLOSE(pipe_fd[0]); VIR_FORCE_CLOSE(pipe_fd[1]); virPolkitAgentDestroy(agent); + virCommandFree(cmd); return NULL; } -- 2.5.0

1 0

[libvirt] [PATCH] datatypes.c: Replace 'close' with 'closeData'
by Michal Privoznik 02 Mar '16

02 Mar '16

Older compilers fail to see that 'close' is not used a function rather than a variable and produce the following error: cc1: warnings being treated as errors ../../src/datatypes.c: In function 'virConnectCloseCallbackDataReset': ../../src/datatypes.c:149: error: declaration of 'close' shadows a global declaration [-Wshadow] Replace all the 'close' occurrences with 'closeData' to resolve this. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/datatypes.c | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 163db39..696e8c0 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -145,16 +145,16 @@ virConnectDispose(void *obj) } -static -void virConnectCloseCallbackDataReset(virConnectCloseCallbackDataPtr close) +static void +virConnectCloseCallbackDataReset(virConnectCloseCallbackDataPtr closeData) { - if (close->freeCallback) - close->freeCallback(close->opaque); + if (closeData->freeCallback) + closeData->freeCallback(closeData->opaque); - close->freeCallback = NULL; - close->opaque = NULL; - virObjectUnref(close->conn); - close->conn = NULL; + closeData->freeCallback = NULL; + closeData->opaque = NULL; + virObjectUnref(closeData->conn); + closeData->conn = NULL; } /** @@ -178,77 +178,77 @@ virNewConnectCloseCallbackData(void) return virObjectLockableNew(virConnectCloseCallbackDataClass); } -void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr close, +void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr closeData, virConnectPtr conn, virConnectCloseFunc cb, void *opaque, virFreeCallback freecb) { - virObjectLock(close); + virObjectLock(closeData); - if (close->callback != NULL) { + if (closeData->callback != NULL) { VIR_WARN("Attempt to register callback on armed" - " close callback object %p", close); + " close callback object %p", closeData); goto cleanup; return; } - close->conn = conn; - virObjectRef(close->conn); - close->callback = cb; - close->opaque = opaque; - close->freeCallback = freecb; + closeData->conn = conn; + virObjectRef(closeData->conn); + closeData->callback = cb; + closeData->opaque = opaque; + closeData->freeCallback = freecb; cleanup: - virObjectUnlock(close); + virObjectUnlock(closeData); } -void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackDataPtr close, +void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackDataPtr closeData, virConnectCloseFunc cb) { - virObjectLock(close); + virObjectLock(closeData); - if (close->callback != cb) { + if (closeData->callback != cb) { VIR_WARN("Attempt to unregister different callback on " - " close callback object %p", close); + " close callback object %p", closeData); goto cleanup; } - virConnectCloseCallbackDataReset(close); - close->callback = NULL; + virConnectCloseCallbackDataReset(closeData); + closeData->callback = NULL; cleanup: - virObjectUnlock(close); + virObjectUnlock(closeData); } -void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr close, +void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr closeData, int reason) { - virObjectLock(close); + virObjectLock(closeData); - if (!close->conn) + if (!closeData->conn) goto exit; VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p", - close->callback, reason, close->opaque); - close->callback(close->conn, reason, close->opaque); + closeData->callback, reason, closeData->opaque); + closeData->callback(closeData->conn, reason, closeData->opaque); - virConnectCloseCallbackDataReset(close); + virConnectCloseCallbackDataReset(closeData); exit: - virObjectUnlock(close); + virObjectUnlock(closeData); } virConnectCloseFunc -virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackDataPtr close) +virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackDataPtr closeData) { virConnectCloseFunc cb; - virObjectLock(close); - cb = close->callback; - virObjectUnlock(close); + virObjectLock(closeData); + cb = closeData->callback; + virObjectUnlock(closeData); return cb; } -- 2.4.10

1 1

[libvirt] after update to libvirt >= 1.2.9.3 no connection to libvirtd (time out) - bug 1308736
by Florian Hubold 02 Mar '16

02 Mar '16

Hi all, I've reported https://bugzilla.redhat.com/show_bug.cgi?id=1308736 two weeks ago, including the results of a git bisect. It would be greatly appreciated if someone could take a look, otherwise we can't push an update for CVE-2015-5313 for our stable distribution. Kind regards and thanks in advance

1 0

[libvirt] [PATCH] util: Fix missing initializer for agent
by John Ferlan 02 Mar '16

02 Mar '16

In virPolkitAgentCreate neglected to initialize agent to NULL. If there was an error in the pipe, then we jump to error and would have an issue. Found by coverity. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing as trivial src/util/virpolkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 3d2be61..44f2328 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -166,7 +166,7 @@ virPolkitAgentDestroy(virPolkitAgentPtr agent) virPolkitAgentPtr virPolkitAgentCreate(void) { - virPolkitAgentPtr agent; + virPolkitAgentPtr agent = NULL; virCommandPtr cmd = virCommandNewArgList(PKTTYAGENT, "--process", NULL); int pipe_fd[2] = {-1, -1}; struct pollfd pollfd; -- 2.5.0

1 0

[libvirt] Libvirt accepted to GSoC
by Michal Privoznik 01 Mar '16

01 Mar '16

Dear community, let me announce great news: Libvirt applied for this year's Google Summer of Code and got accepted [1]! You may recall that in previous years we created a joint organisation with QEMU/KVM folks and participated that way. However, since the number of libvirt students was growing and usually exceeded number of QEMU or KVM students combined it started to become more and more obvious that libvirt should no longer misuse hospitality of QEMU/KVM volunteers and try on its own. And it worked. In addition, QEMU/KVM organisation has been accepted too - join me in congratulating them and saying big thank you for all of the work that they have done for us in those previous years! The idea of splitting has been discussed here too [2]. What to do next? You can still propose ideas, and ideally add them to the list [3]. Or if you don't feel confident enough, drop me an e-mail and I'll take care of that. It's until 14th March that students are able to start filling in their proposals. And this is where this year differs from the previous ones - the deadline for proposals is 25th March. Without proposal no student can be accepted to the program. So you may help by spreading the word too. Happy coding! Michal 1: https://summerofcode.withgoogle.com/organizations/5982501017223168/ 2: https://www.redhat.com/archives/libvir-list/2016-January/msg01076.html 3: http://wiki.libvirt.org/page/Google_Summer_of_Code_2016

1 0

[libvirt] [PATCH] Libvirt: Add missing default value for config option max_queued_clients
by Jason J. Herne 01 Mar '16

01 Mar '16

Commit 1199edb1d4e3 added config option max_queued_clients and documented the default value as 1000 but never actually set that value. This patch sets the default value. This addresses an issue whereby the following error message is reported if too many migrations are started simultaneously: error: End of file while reading data: Ncat: Invalid argument.: Input/output error The problem is that too many ncat processes are spawned on the destination system. They all attempt to connect to the libvirt socket. Because the destination libvirtd cannot respond to the connect requests quickly enough we overrun the socket's pending connections queue. Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- daemon/libvirtd-config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index c31c8b2..7a448f9 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -280,6 +280,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->min_workers = 5; data->max_workers = 20; data->max_clients = 5000; + data->max_queued_clients = 1000; data->max_anonymous_clients = 20; data->prio_workers = 5; -- 1.9.1

2 1

[libvirt] [PATCH] docs: Clarify interface/target/@dev docs
by Jiri Denemark 01 Mar '16

01 Mar '16

https://bugzilla.redhat.com/show_bug.cgi?id=1313314 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c54b308..df8c06c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4507,10 +4507,10 @@ qemu-kvm -net nic,model=? /dev/null If no target is specified, certain hypervisors will automatically generate a name for the created tun device. This - name can be manually specified, however the name must not + name can be manually specified, however the name should not start with either 'vnet' or 'vif', which are prefixes reserved by libvirt and certain hypervisors. Manually specified - targets using these prefixes will be ignored. + targets using these prefixes may be ignored. -- 2.7.2

3 3

[libvirt] [PATCH v7 0/6] Global domain cpu.cfs_period_us and cpu.cfs_quota_us setup
by Alexander Burluka 01 Mar '16

01 Mar '16

This patchset implements an ability to specify values for domain top level cpu.cfs_period_us and cpu.cfs_quota_us cgroups. These parameters are opt-in and named "global_period" and "global_quota". Introduction of these settings gives management applications further choice of controlling CPU usage. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Changes in v5: rebase to version 1.3.1 Changes in v6: remove unnecessary check Changes in v7: rebase to current master Alexander Burluka (6): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 +++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 49 +++++++++++ src/qemu/qemu_cgroup.h | 1 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 97 +++++++++++++++++++++- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 2 + 11 files changed, 236 insertions(+), 3 deletions(-) -- 1.8.3.1

2 16

[libvirt] [PATCH] qemu: Don't always wait for SPICE to finish migration
by Jiri Denemark 01 Mar '16

01 Mar '16

When SPICE graphics is configured for a domain but we did not ask the client to switch to the destination, we should not wait for SPICE_MIGRATE_COMPLETED event (which will never come). https://bugzilla.redhat.com/show_bug.cgi?id=1151723 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_migration.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8359b1a..0144792 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -137,6 +137,8 @@ struct qemuDomainJobObj { qemuDomainJobInfoPtr current; /* async job progress data */ qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */ bool abortJob; /* abort of the job requested */ + bool spiceMigration; /* we asked for spice migration and we + * should wait for it to finish */ bool spiceMigrated; /* spice migration completed */ }; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 704e182..64cbffa 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2415,7 +2415,8 @@ qemuMigrationWaitForSpice(virDomainObjPtr vm) bool wait_for_spice = false; size_t i = 0; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION) || + !priv->job.spiceMigration) return 0; for (i = 0; i < vm->def->ngraphics; i++) { @@ -2789,6 +2790,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); + priv->job.spiceMigration = !ret; if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; } -- 2.7.2

2 2

[libvirt] [PATCH] qemu: Don't try to fetch migration stats on destination
by Jiri Denemark 01 Mar '16

01 Mar '16

Migration statistics are not available on the destination host and starting a query job during incoming migration is not allowed. Trying to do that would result in Timed out during operation: cannot acquire state change lock (held by remoteDispatchDomainMigratePrepare3Params) error. We should not even try to start the job. https://bugzilla.redhat.com/show_bug.cgi?id=1278727 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45ff3c0..241de67 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12901,9 +12901,16 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver, if (!priv->job.current || !priv->job.current->stats.status) fetch = false; - if (fetch && - qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) - return -1; + if (fetch) { + if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("migration statistics are available only on " + "the source host")); + return -1; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + return -1; + } if (!completed && !virDomainObjIsActive(vm)) { -- 2.7.2

2 2

[libvirt] [PATCH] Fix formatting in remote_protocol-structs
by Jiri Denemark 01 Mar '16

01 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote_protocol-structs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 11048b7..6c1cf5d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2503,7 +2503,7 @@ struct remote_domain_event_callback_device_added_msg { remote_nonnull_string devAlias; }; struct remote_connect_event_connection_closed_msg { - int reason; + int reason; }; struct remote_connect_get_cpu_model_names_args { remote_nonnull_string arch; -- 2.7.2

1 1

[libvirt] [PATCH] util: Fix build without polkit
by Jiri Denemark 01 Mar '16

01 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virpolkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 3bb60a5..3d2be61 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -329,13 +329,13 @@ int virPolkitCheckAuth(const char *actionid ATTRIBUTE_UNUSED, void -virPolkitAgentDestroy(virCommandPtr cmd ATTRIBUTE_UNUSED) +virPolkitAgentDestroy(virPolkitAgentPtr agent ATTRIBUTE_UNUSED) { return; /* do nothing */ } -virCommandPtr +virPolkitAgentPtr virPolkitAgentCreate(void) { virReportError(VIR_ERR_AUTH_FAILED, "%s", -- 2.7.2

1 1

[libvirt] [PATCH] qemu: enalbe hotplugging of macvtap device with multiqueue
by Shanzhi Yu 01 Mar '16

01 Mar '16

in commit 81a110, multiqueue for macvtap is enabled but forget to support hotplugging enabled Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index dc76268..b580283 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -892,10 +892,11 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } - /* Currently nothing besides TAP devices supports multiqueue. */ + /* Currently only TAP/macvtap devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_DIRECT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); -- 1.8.3.1

2 1

[libvirt] Wiki account
by Christophe Fergeau 01 Mar '16

01 Mar '16

Hey, I thought I already had a wiki account, but after a few failures to login or retrieve a password, it seems I don't, so I would like to get one for username 'teuf' Thanks, Christophe

2 1

[libvirt] [RFC] [libvirt-gconfig] Suggestion about (maybe) re-factoring GVirtConfigDomainGraphics
by Fabiano Fidêncio 01 Mar '16

01 Mar '16

Howdy! I've been trying to use libvirt-gobject and libvirt-gconfig, on virt-viewer, for accessing VMs and looking at their config, instead of using libvrit and parsing XML directly and turns out, that libvirt-gconfig is not exactly handful for a "read-only" use case (as virt-viewer's one). Let me try to explain pointing to some code as example and then I'll give my suggestions. For example, let's take a look on https://git.fedorahosted.org/cgit/virt-viewer.git/tree/src/virt-viewer.c#n4… In this function, the first thing done is to get the type of the graphic device (SPICE or VNC) and here is the first problem. There is no straightforward way for doing this on libvirt-gconfig (or is there?). Seems easier to continue getting the type using libxml and then use the specific spice/vnc functions for getting the properties. And here is the second problem, because I'll always need to have an if/else statement for getting the properties. Something like: if (g_str_equal(type, "vnc")) port = gvir_config_domain_graphics_vnc_get_port(domain); else if (g_str_equal(type, "spice")) port = gvir_config_domain_graphics_spice_get_port(domain); This kind of usage makes me think that libvirt-gconfig is missing some abstraction class, parent of GVirConfigDomainGraphics{Spice,Vnc,...) which could provide virtual functions like: gtype = gvir_config_domain_graphics_get_gtype(domain); port = gvir_config_domain_graphics_get_port(domain); Thinking a bit about it and taking a look in the GVirConfigDomainGraphics code, is possible to see a possibility for 2 new classes: GVirConfigDomainGraphicsLocal and GVirConfigDomainGraphicsRemote. Then we could have something like: GVirtConfigDomainGraphics |_ | GVirtConfigDomainGraphicsLocal | |_ | | GVirtConfigDomainGraphicsLocalDesktop | |_ | GVirtConfigDomainGraphicsLocalSdl |_ GVirtConfigDomainGraphicsRemote |_ | GVirtConfigDomainGraphicsRemoteSpice |_ | GVirtConfigDomainGraphicsRemoteVnc |_ GVirtConfigDomainGraphicsRemoteRdp I do know that Local and Remote are not exactly accurate names, but is the best that I could come up with. So, would be acceptable to introduce these two new classes and then have the specific graphics classes inheriting from those? Does this make sense for you, people? I'm more than happy in provide the code for this, but not before we discuss and set a decision about the approach. :-) I'm looking forward for some feedback. -- Fabiano Fidêncio

3 2

[libvirt] [PATCH v5 0/10] add close callback for drivers with persistent connection
by Nikolay Shirokovskiy 01 Mar '16

01 Mar '16

Currently close callback API can only inform us of closing the connection between remote driver and daemon. But what if a driver running in the daemon itself can have another persistent connection? In this case we want to be informed of that connection changes state too. This patch series extends meaning of current close callback API so that now it notifies of closing of any internal persistent connection. The overall approach is to move close callback support to drivers. Changes from v4: ================ 1. New patch "remote: factor out feature checks on connection open" to get rid of code dups. 2. "daemon: add connection close rpc" now checks if peer supports rpc for close callbacks. If it is not then we handle only disconnections to peer as before. Changes from v3: ================ Add patch [3] "close callback: make unregister clean after connect close event." Make register/unregister methods of connection close callback object return void. This solves the problem of patch [8] "daemon: add connection close rpc" ([7] in previous version) of consistent unregistering. All checks are moved outside of the methods. I hesitate whether to add or not means that track connection close callback object consinstency and finally decided to add (checks and warnings inside methods). The reason is that without these checks we get memory leaks which are rather difficult to find out. Unfortunately this change touch a number of patches as the first change is done in the first patch of the series. Changes from v2: ================ Split patches further to make it more comprehensible. Nikolay Shirokovskiy (10): factor out virConnectCloseCallbackDataPtr methods virConnectCloseCallbackData: fix connection object refcount close callback: make unregister clean after connect close event virConnectCloseCallbackData: factor out callback disarming close callback API: remove unnecessary locks virConnectCloseCallbackDataDispose: remove unnecessary locks close callback: move it to driver remote: factor out feature checks on connection open daemon: add connection close rpc vz: implement connection close notification daemon/libvirtd.h | 1 + daemon/remote.c | 85 ++++++++++++++++++++++ src/datatypes.c | 118 +++++++++++++++++++++++------- src/datatypes.h | 16 ++++- src/driver-hypervisor.h | 12 ++++ src/libvirt-host.c | 46 ++---------- src/libvirt_internal.h | 5 ++ src/remote/remote_driver.c | 167 ++++++++++++++++++++++++++++++++----------- src/remote/remote_protocol.x | 24 ++++++- src/remote_protocol-structs | 6 ++ src/vz/vz_driver.c | 59 +++++++++++++++ src/vz/vz_sdk.c | 4 ++ src/vz/vz_utils.h | 3 + 13 files changed, 433 insertions(+), 113 deletions(-) -- 1.8.3.1

2 23

[libvirt] [PATCHv2 0/3] reorder qemu cgroups operations
by Henning Schild 01 Mar '16

01 Mar '16

This is a much shorter series focusing on the key point, the second patch. The first patch is somehing that was found when looking at the code and is just a cosmetic change. The third patch just cleans up. They where both already ACKed. Patch 2 was also already ACKed but conflicted with another pending change. It should be reviewed in its new context. Note the new order with the "manual" affinity setting code. @Peter: qemuProcessInitCpuAffinity and qemuProcessSetupEmulator have a lot in in common. I guess there is potential for further simplification. The series is based on 92ec2e5e9b79b7df4d575040224bd606ab0b6dd8 with these two patches on top: http://www.redhat.com/archives/libvir-list/2016-February/msg01211.html Henning Schild (3): vircgroup: one central point for adding tasks to cgroups qemu_cgroup: put qemu right into emulator sub-cgroup qemu_cgroup: use virCgroupAddTask instead of virCgroupMoveTask src/libvirt_private.syms | 1 - src/qemu/qemu_process.c | 10 ++--- src/util/vircgroup.c | 105 +---------------------------------------------- src/util/vircgroup.h | 3 -- 4 files changed, 6 insertions(+), 113 deletions(-) -- 2.4.10

3 9

[libvirt] [PATCH 0/2] Remove old buggy check when pinning iothreads/emulators
by Peter Krempa 01 Mar '16

01 Mar '16

Peter Krempa (2): qemu: process: Move emulator thread setting code into one function qemu: Allow setting pinning of emulator/iohtread with automatic placement src/qemu/qemu_cgroup.c | 66 ----------------------------------------- src/qemu/qemu_cgroup.h | 1 - src/qemu/qemu_driver.c | 14 --------- src/qemu/qemu_process.c | 78 +++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 62 insertions(+), 97 deletions(-) -- 2.6.2

2 6

[libvirt] [PATCH v3 0/7] NSS module for libvirt
by Michal Privoznik 01 Mar '16

01 Mar '16

v3 of: https://www.redhat.com/archives/libvir-list/2016-February/msg00693.html diff to v2: - don't link against libvirt.la rather than create a separate small lib to link with - teach nsstest to check multiple addresses Note that patches 1..4 have been ACKed already, but I'm sending them anyway for completeness. Michal Privoznik (7): Export virLease* functions for leases file handling virjson: Resolve const correctness Initial support for NSS plugin skeleton libvirt.spec.in: Introduce libvirt-nss package nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test cfg.mk | 2 +- config-post.h | 21 ++ configure.ac | 2 + libvirt.spec.in | 21 ++ m4/virt-nss.m4 | 51 +++++ po/POTFILES.in | 1 + src/Makefile.am | 67 +++++++ src/libvirt_private.syms | 6 + src/network/leaseshelper.c | 271 +------------------------ src/util/virfile.c | 2 +- src/util/virjson.c | 58 +++--- src/util/virjson.h | 54 ++--- src/util/virlease.c | 304 ++++++++++++++++++++++++++++ src/util/virlease.h | 44 ++++ tests/Makefile.am | 20 +- tests/nssdata/virbr0.status | 20 ++ tests/nssmock.c | 140 +++++++++++++ tests/nsstest.c | 188 +++++++++++++++++ tools/Makefile.am | 44 ++++ tools/nss/libvirt_nss.c | 476 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 +++++ tools/nss/libvirt_nss.syms | 12 ++ 22 files changed, 1527 insertions(+), 329 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

1 7

[libvirt] [PATCH v2 0/2] qemu: add spice opengl support
by Marc-André Lureau 01 Mar '16

01 Mar '16

Hi, The following patches allow to enable OpenGl support with spice/qemu server. Qemu should support this option starting from 2.6 (patches still under review). v1->v2: - move gl attribute as a sub-element - update documentation - comment TristateSwitch vs TristateBool usage - fix caps test location - fix syntax-check Marc-André Lureau (2): util: TristateBool and TristateSwitch are interchangeable qemu: add spice opengl support docs/formatdomain.html.in | 8 ++++ docs/schemas/domaincommon.rng | 8 ++++ src/conf/domain_conf.c | 26 ++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++++ src/util/virutil.h | 7 +++- tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 4 ++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 24 ++++++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 38 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 45 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml -- 2.5.0

6 12

[libvirt] Release of libvirt-1.3.2
by Daniel Veillard 01 Mar '16

01 Mar '16

So as planned I pushed the release earlier today, it is tagged in git and signed tarball and rpms are at the usual place: ftp://libvirt.org/libvirt/ I also built a libvirt-python 1.3.2 release which can be found at ftp://libvirt.org/libvirt/python This is a relatively big release with around 375 commits done in the last month and a half. There are user visible improvement listed as features and a lot more improvements and refactoring under the hood. Of course this also carries a large set of bug fixes, including serious ones but none labelled as security, upgrade is still recommended ! Features: - Various improvements for the Xen libxl driver (Joao Martins and Jim Fehlig) - virt-admin improvement (Erik Skultety) - Various improvements for the RDB volumes (Wido den Hollander) Documentation: - docs: mention ZFS on Linux support (Roman Bogorodskiy) - docs: formatdomain: Document "spice" as a valid value for <graphics type=..> (Richard W.M. Jones) - docs: Try harder to uninstall (Michal Privoznik) - tests: Fix typo oaque -> opaque (Andrea Bolognani) - docs: List possible GIC versions (Andrea Bolognani) - Spell VMware with a lowercase w (Ján Tomko) - leaseshelper: move comment about adding IPv6 leases (Ján Tomko) Portability: - build: accomodate selinux 2.5 header API change (Eric Blake) - rbd: fix 32-bit build (Eric Blake) - util: Use virBitmapIsBitSet in freebsd impl of virProcessSetAffinity (Peter Krempa) - domsuspend: Fix warning on mingw build (Andrea Bolognani) - virportallocatortest: Run on linux only (Michal Privoznik) - Revert "tests: Don't link mock libraries against libvirt and gnulib" (Andrea Bolognani) - tests: Don't link mock libraries against libvirt and gnulib (Andrea Bolognani) - virDomainFormatSchedDef: Initialize @priority (Michal Privoznik) - Fix '-pie' build with clang (Martin Kletzander) - include: Handle case when builddir == srcdir (Michal Privoznik) - tests: avoid realpath in test-lib.sh (Eric Blake) - includes: Install libvirt-common.h (Michal Privoznik) - docs: fix generation of docs from VPATH build (Daniel P. Berrange) - Fix make check with gcc version 5 (Martin Kletzander) Bug Fixes: - storage: Fix error path in storagePoolDefineXML (John Ferlan) - storage: Fix error path in virStoragePoolObjLoad (John Ferlan) - qemu: error out on missing machine type in configs (Ján Tomko) - Revert "Error out on missing machine type in machine configs" (Ján Tomko) - libxl: unref objects in error paths (Jim Fehlig) - storage: No need to check ret after VIR_APPEND_ELEMENT (John Ferlan) - zfs: Resolve RESOURCE_LEAK (John Ferlan) - netdev: Use virNetDevIsVirtualFunction() properly (Andrea Bolognani) - Fix bug of attaching redirdev device (Osier Yang) - libxl: small fix in parsing network (Chunyan Liu) - qemuBuildCommandLine: Change the condition for -nographics (Michal Privoznik) - xen: Check return value of virStringReplace (Michal Privoznik) - vbox: Avoid signed and unsigned comparison (Michal Privoznik) - qemu_process: mark auto-generated spice ports as reserved (Pavel Hrdina) - adminDaemonListServers: Don't leak @srv_names array (Michal Privoznik) - Check for active domain in virDomainObjWait (Jiri Denemark) - qemu: Avoid calling qemuProcessStop without a job (Jiri Denemark) - qemu: Process monitor EOF in a job (Jiri Denemark) - qemu: qemuDomainGetStatsVcpu: Fix output for possible sparse vCPU settings (Peter Krempa) - qemu: vcpupin: Don't overwrite errors from functions setting pinning (Peter Krempa) - admin: Fix memory leak in remoteAdminConnectClose (Erik Skultety) - esx: Avoid using vSphere SessionIsActive function (Matthias Bolte) - Error out on missing machine type in machine configs (Ján Tomko) - qemu: cgroup: fix cgroup permission logic (Bjoern Walk) - virsh: Remove <backingStore> when changing cdrom media source (Peter Krempa) - vircgroup: Update virCgroupDenyDevicePath stub (Michal Privoznik) - qemu: cgroup: Avoid reporting errors from inaccessible NFS volumes (Peter Krempa) - qemu: fix hot unplug of PCI devices with VFIO (Ludovic Beliveau) - vz: fix race condition when adding domain to domains list (Mikhail Feoktistov) - vz: fix notification subscription (Mikhail Feoktistov) - conf: snapshot: Avoid autogenerating duplicate snapshot names (Peter Krempa) - dbus: Don't unref NULL messages (Michal Privoznik) - qemu: Connect to guest agent iff needed (Michal Privoznik) - xenconfig: Properly check retval of virDomainGraphicsListenSetAddress (Michal Privoznik) - leaseshelper: swap two parameters of virLeaseNew (Ján Tomko) - vboxDumpDisplay: check return of virDomainGraphicsListenSetAddress (Ján Tomko) - Check return value of vboxDumpVideo (Ján Tomko) - qemu: vcpu: Reuse qemuProcessSetupVcpu in vcpu hotplug (Peter Krempa) - remote: enforce VIR_TYPED_PARAM_STRING_OKAY flag on client side serialization (Joao Martins) - vircgroup: Update virCgroupGetPercpuStats stump (Michal Privoznik) - conf: Don't store vcpusched orthogonally to other vcpu info (Peter Krempa) - qemu: snapshot: Avoid infinite loop if vCPUs can't be resumed (Peter Krempa) - qemu: snapshot: Don't overwrite existing errors when thawing filesystems (Peter Krempa) - util: Fix virCgroupNewMachine ATTRIBUTE_NONNULL args (John Ferlan) - bhyve: Fix the build (Michal Privoznik) - virSystemdGetMachineNameByPID: Initialize @reply (Michal Privoznik) - virnetdevbandwidth: Compute quantum value (Michal Privoznik) - systemd: Modernize machine naming (Martin Kletzander) - bhyve: fix build (Roman Bogorodskiy) - Fix build after recent patches (Peter Krempa) - qemu: qemuDomainRename and virDomainObjListNumOfDomains ABBA deadlock fix (Nikolay Shirokovskiy) - Revert "systemd: Escape only needed characters for machined" (Martin Kletzander) - qemu: Don't crash when create fails early (Martin Kletzander) - virsh: ensure SIGINT action is reset on all errors (Michael Chapman) - conf: disallow empty cpusets for vcpu pinning when parsing XML (Peter Krempa) - Fix libvirtd free() segfault when migrating guest with deleted open vswitch port (Jason J. Herne) - vz: Fix invalid iteration of def->cputune.vcpupin (Peter Krempa) - qemu: process: Disallow VMs with 0 vcpus (Peter Krempa) - virt-host-validate: Fix error level for user namespace check (Michal Privoznik) - virsh: Correctly detect inserted media in change-media command (Michal Privoznik) - vmx: Adapt to emptyBackingString for cdrom-image (Michal Privoznik) - qemu: snapshot: Correctly report qemu error on 'savevm' (Peter Krempa) - lxc: fuse: Stub out Slab bits in /proc/meminfo (Cole Robinson) - lxc: fuse: Fill in MemAvailable for /proc/meminfo (Cole Robinson) - qemuDomainReboot: use fakeReboot=true only for acpi mode (Dmitry Andreev) - build: predictably generate systemtap tapsets (bz 1173641) (Cole Robinson) - leaseshelper: fix crash when no mac is specified (Ján Tomko) - virLogManagerDomainReadLogFile: Don't do dummy allocs (Michal Privoznik) - qemuProcessReadLog: Fix memmove arguments (Michal Privoznik) - rbd: Set r variable so it can be returned should an error occur (Wido den Hollander) Improvements: - virsh: reject migration with both --live and --offline (Nitesh Konkar) - tests: add parseFlags to qemuxml2argvtest (Ján Tomko) - tests: add a test for persistent LXC XML parsing (Ján Tomko) - testCompareDomXML2XMLFiles: add parseFlags parameter (Ján Tomko) - openvz: Use virStringSplitCount instead of strtok_r (John Ferlan) - hostdev: Remove temporary variable when checking for VF (Andrea Bolognani) - util: Avoid calling closedir(NULL) (Jiri Denemark) - vircgroupmock: Mock access("/sys/devices/system/cpu/present") (Michal Privoznik) - libxl: implement virDomainInterfaceStats (Joao Martins) - libxl: fix bogus indentation from commit fb2bd208 (Jim Fehlig) - libxl: add support for rbd qdisk (Jim Fehlig) - xenconfig: support xl<->xml conversion of rbd disk devices (Jim Fehlig) - xenconfig: produce key=value disk config syntax in xl formatter (Jim Fehlig) - xenconfig: replace text 'xm' with 'xl' in xlconfigtest (Jim Fehlig) - hostdev: Minor style adjustments (Andrea Bolognani) - cmdSaveImageEdit: Prefer VSH_EXCLUSIVE_OPTIONS over by hand check (Michal Privoznik) - cmdNetworkUpdate: Prefer VSH_EXCLUSIVE_OPTIONS over if-else tree (Michal Privoznik) - util: TristateBool and TristateSwitch are interchangeable (Marc-André Lureau) - Miscellaneous for-loop syntax clean-ups (Martin Kletzander) - qemu: add support for LSI SAS1068 (aka MPT Fusion) SCSI controller (Paolo Bonzini) - virDomainDefFormatInternal: Drop useless check (Michal Privoznik) - gic: Introduce VIR_GIC_VERSION_DEFAULT alias (Andrea Bolognani) - security_selinux: Fix typo in error message (Laurent Bigonville) - qemu: iothreadpin: Always set affinity when pinning iothread (Peter Krempa) - qemu: emulatorpin: Always set affinity when pinning emulator thread (Peter Krempa) - qemu: parse: drop redundant AddImplicitControllers (Cole Robinson) - qemu: parse: rename qemuCaps->caps (Cole Robinson) - domain: add implicit controllers from post parse (Cole Robinson) - qemu: Simplify error handling in qemuProcessReconnect (Jiri Denemark) - qemu: Start an async job for processGuestPanicEvent (Jiri Denemark) - qemu: Start job in qemuDomainDestroyFlags early (Jiri Denemark) - qemu: Introduce qemuProcessBeginStopJob (Jiri Denemark) - qemu: Pass async job to qemuProcessInit (Jiri Denemark) - qemu: End nested jobs properly (Jiri Denemark) - qemu: Export qemuDomainObjBeginNestedJob (Jiri Denemark) - virsh: cpupin: Extract getter code into a separate function (Peter Krempa) - qemu: vcpupin: Always set affinity even when cgroups are supported (Peter Krempa) - virsh: cmdVcpuPin: Simplify handling of API flags (Peter Krempa) - test: qemuxml2argv: Drop QEMU_CAPS_DEVICE uses (Andrea Bolognani) - vsh: use virBufferTrim in vshOutputLogFile (Ján Tomko) - qemu: Introduce qemuBuildMonitorCommandLine (John Ferlan) - qemu: Introduce qemuBuildSgaCommandLine (John Ferlan) - qemu: Introduce qemuBuildSmbiosCommandLine (John Ferlan) - qemu: Introduce qemuBuildNumaCommandLine (John Ferlan) - qemu: Introduce qemuBuildIOThreadCommandLine (John Ferlan) - qemu: Rename qemuBuildSmpArgStr to qemuBuildSmpCommandLine (John Ferlan) - qemu: Introduce qemuBuildMemCommandLine (John Ferlan) - qemu: Rename qemuBuildCpuArgStr to qemuBuildCpuCommandLine (John Ferlan) - qemu: Rename qemuBuildMachineArgStr (John Ferlan) - qemu: Make basic upfront checks before create command (John Ferlan) - qemu: Remove local emulator (John Ferlan) - qemu: Kill VIR_WRAPPER_SHELL_PREFIX (Peter Krempa) - qemu: Move PORT definitions to qemu_conf.c (Cole Robinson) - tests: Remove unused virtTestClearLineRegex (Cole Robinson) - tests: lxcconf2xml: Drop XML blanking (Cole Robinson) - tests: qemuargv2xml: Drop memory XML blanking (Cole Robinson) - tests: qemuargv2xml: hardcode disk auth usage (Cole Robinson) - tests: qemuargv2xml: Remove UUID randomness (Cole Robinson) - tests: qemuargv2xml: Remove unneeded XML blanking (Cole Robinson) - qemu: Remove unnecessary calculations in qemuDomainSaveMemory (Peter Krempa) - qemu: monitor: Remove unused qemuMonitorMigrateToFile (Peter Krempa) - Revert "storageVolCreateXMLFrom: Check if backend knows how to createVol" (Ján Tomko) - syms: add forgotten virAdmConnectClass symbol (Erik Skultety) - virt-admin: Introduce cmdSrvList (Erik Skultety) - admin: Introduce adminDaemonConnectListServers API (Erik Skultety) - admin: Introduce virAdmServer structure (Erik Skultety) - admin: Move admin_server.{h,c} to admin.{h,c} (Erik Skultety) - virnetdaemon: Store servers in a hash table (Erik Skultety) - util: Refactor virHashForEach so it returns as soon as an iterator fails (Erik Skultety) - util: Add a return value to void hash iterators (Erik Skultety) - qemu: cgroup: Setup cgroups for bios/firmware images (Peter Krempa) - qemu: cgroup: Extract guts of qemuSetupImageCgroupInternal (Peter Krempa) - qemu: cgroup: Split up qemuSetImageCgroupInternal (Peter Krempa) - qemu: cgroup: Switch to qemu(Setup|Teardown)ImageCgroup (Peter Krempa) - util: cgroup: Allow ignoring EACCES in virCgroup(Allow|Deny)DevicePath (Peter Krempa) - util: cgroup: Drop virCgroup(Allow|Deny)DeviceMajor (Peter Krempa) - util: cgroup: Instrument virCgroupDenyDevice to handle -1 device number as * (Peter Krempa) - qemu: migration: Refactor code now that we assume support for fd migration (Peter Krempa) - qemu: cgroup: Remove abandoned function qemuAddToCgroup (Peter Krempa) - conf: Use a temporary int variable to store GIC version (Andrea Bolognani) - qemu: Move qemuDomainNetVLAN (John Ferlan) - qemu: Move qemuAssign*Alias* API's into their own module (John Ferlan) - qemu: Move qemuNetworkPrepareDevices (John Ferlan) - qemu: Move and rename qemuOpenVhostNet (John Ferlan) - qemu: Move qemuDomain*Address* functions (John Ferlan) - qemu: Move qemuDomainSupports* functions (John Ferlan) - qemu: Move qemuNetworkIfaceConnect to qemu_interface.c and rename (John Ferlan) - qemu: Move qemuPhysIfaceConnect to qemu_interface.c and rename (John Ferlan) - qemu: Move qemuVirCommandGetDevSet (John Ferlan) - qemu: Move qemuBuildTPMDevStr (John Ferlan) - qemu: Move qemuVirCommandGetFDSet (John Ferlan) - qemu: Move qemuBuildTPMBackendStr (John Ferlan) - tests: Add more GIC test cases (Andrea Bolognani) - tests: Reorganize and simplify GIC test cases (Andrea Bolognani) - qemu: Always enable GIC on ARM virt machines (Andrea Bolognani) - qemu: Default to GIC v2 (Andrea Bolognani) - conf: Use virGICVersion enumeration in virDomainDef (Andrea Bolognani) - schema: List allowed GIC versions (Andrea Bolognani) - gic: Introduce virGICVersion enumeration (Andrea Bolognani) - vsh: Replace vshPrint macro with function (Peter Krempa) - vsh: Simplify bailing out on OOM conditions (Peter Krempa) - util: clean up and expand 802.1QbX negotiation logging (Laine Stump) - network: consolidated info log for all network allocate/free operations (Laine Stump) - network: consolidate connection count updates for device pool (Laine Stump) - rbd: Use RBD fast-diff for querying actual volume allocation (Wido den Hollander) - rbd: rbd_diff_iterate2() is available in librbd since 266 (Wido den Hollander) - rbd: Add volStorageBackendRBDGetFeatures() for internal calls (Wido den Hollander) - storageVolCreateXMLFrom: Check if backend knows how to createVol (Michal Privoznik) - storageVolCreateXML: Swap order of two operations (Michal Privoznik) - virsh: Teach vol-create-as to --print-xml (Michal Privoznik) - cmdVolCreateAs: Rework to follow usual func pattern (Michal Privoznik) - vz: remove unused struct field (Mikhail Feoktistov) - vz: make output arguments in prlsdkGetDomainIds as optional (Mikhail Feoktistov) - Change maintainers list (Maxim Nestratov) - tests: Rename virmockdbus -> virdbusmock for consistency (Andrea Bolognani) - tests: Don't use "lib" prefix for mock libraries (Andrea Bolognani) - tests: Allow use of close() in mock libraries (Andrea Bolognani) - tests: Split off the mock part of the port allocator test (Andrea Bolognani) - conf: snapshot: Refactor virDomainSnapshotDefAssignExternalNames (Peter Krempa) - conf: snapshot: Extract code to generate default external file names (Peter Krempa) - conf: snapshot: Rename disksorter to virDomainSnapshotCompareDiskIndex (Peter Krempa) - tests: Link mock libraries against gnulib and gnulib only (Andrea Bolognani) - tests: Use plain close() in mock code (Andrea Bolognani) - virhook: do not save the return value of virBuildPath (Ján Tomko) - Clean up usage of 'ret' variable (Ján Tomko) - Prohibit verbose strcat (Ján Tomko) - vbox: remove more extra spaces (Ján Tomko) - vbox: remove extra spaces from function headers (Ján Tomko) - vbox: remove extra spaces from assignments (Ján Tomko) - vbox: remove extra spaces from variable initializations (Ján Tomko) - vbox: remove extra spaces from macro definitions (Ján Tomko) - qemu: Split the command parsing routines into own module (John Ferlan) - qemu: Check return status for virDomainGraphicsListenSetAddress (John Ferlan) - qemu: Introduce qemuParseCommandLineVnc (John Ferlan) - libxl: keepalive messages support (Joao Martins) - libxl: add p2p migration (Joao Martins) - tests: qemu: More aarch64 virtio and pci tests (Cole Robinson) - tests: qemuxml2xml: assign device addresses (Cole Robinson) - tests: utils: Add PreFormat callback for CompareXML2XML helper (Cole Robinson) - virStringListLength: Ensure const correctness (Michal Privoznik) - tests: qemuxml2xml: specify qemuCaps in test cases (Cole Robinson) - tests: Unconditionally enable QEMU_CAPS_DEVICE (Cole Robinson) - tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases (Cole Robinson) - util: Get rid of virStringListLen() (Martin Kletzander) - tests: qemuxml2xml: Always use different output file (Cole Robinson) - vboxDumpDisplay: realign variable initializations (Ján Tomko) - vboxDumpDisplay: remove suspicious strlen (Ján Tomko) - vboxDumpDisplay: reuse the keyUtf16 variable (Ján Tomko) - vboxDumpDisplay: use VIR_APPEND_ELEMENT (Ján Tomko) - vboxDumpDisplay: clean up VIR_STRDUP usage (Ján Tomko) - vboxDumpDisplay: fill out the graphics structure earlier (Ján Tomko) - vboxDumpDisplay: allocate the graphics structure upfront (Ján Tomko) - vboxDumpDisplay: split out def->graphics allocation (Ján Tomko) - vboxDumpDisplay: remove extra virReportOOMError (Ján Tomko) - vboxDumpDisplay: add addDesktop bool (Ján Tomko) - vboxDumpDisplay: more indentation reducing (Ján Tomko) - vboxDumpDisplay: reduce indentation level (Ján Tomko) - leaseshelper: split out virLeaseNew (Ján Tomko) - qemu: iothread: Reuse qemuProcessSetupIOThread in iothread hotplug (Peter Krempa) - qemu: iothread: Aggregate code to set IOThread tuning (Peter Krempa) - qemu: vcpu: Aggregate code to set vCPU tuning (Peter Krempa) - conf: Fix how iothread scheduler info is stored (Peter Krempa) - conf: Extract code that formats <cputune> (Peter Krempa) - conf: remove unused cpu pinning helpers and data structures (Peter Krempa) - conf: Store cpu pinning data in def->vcpus (Peter Krempa) - conf: Don't copy def->cpumask into cpu pinning info (Peter Krempa) - qemu: Reuse qemuDomainDetectVcpuPids in cpu hot(un)plug (Peter Krempa) - qemu: Differentiate error codes when VM exits in qemuDomainDetectVcpuPids (Peter Krempa) - cgroup: Prepare for sparse vCPU topologies in virCgroupGetPercpuStats (Peter Krempa) - conf: Move and optimize disk target duplicity checking (Peter Krempa) - tests: Integrate startup checks to qemuxml2argvtest (Peter Krempa) - qemu: process: Extract pre-start checks into a function (Peter Krempa) - qemu: process: Reorder operations on early VM startup (Peter Krempa) - qemu: hotplug: Check duplicate disk serial/wwn on hotplug too (Peter Krempa) - conf: Extract code that checks disk serial/wwn conflict (Peter Krempa) - qemu: hotplug: Extract common code to qemuDomainAttachDeviceDiskLive (Peter Krempa) - qemu: hotplug: Use more common 'cleanup' label in qemuDomainAttachDeviceDiskLive (Peter Krempa) - qemu: hotplug: Break up if/else statement into switch (Peter Krempa) - qemu: hotplug: Remove unnecessary variable (Peter Krempa) - qemu: hotplug: Use typecasted switch (Peter Krempa) - nodedev: stub nodeDeviceSysfsGetPCIRelatedDevCaps (Roman Bogorodskiy) - bhyve: fix preprocessor indentation (Roman Bogorodskiy) - tests: qemuargv2xml: separate from qemuxml2argv data (Cole Robinson) - tests: Run test-wrap-argv with REGENERATE_OUTPUT (Cole Robinson) - rbd: Use %zu for uint64_t instead of casting to unsigned long long (Wido den Hollander) - rbd: Code styling cleanup (Wido den Hollander) - conf: Extract code for parsing thread resource scheduler info (Peter Krempa) - conf: Add helper to return a bitmap of active iothread ids (Peter Krempa) - util: bitmap: Introduce bitmap subtraction (Peter Krempa) - conf: add caps to virDomainSnapshotDefFormat (Joao Martins) - conf: add caps to virDomainObjFormat/SaveStatus (Daniel P. Berrange) - qemu migration: factor out setting migration option (Nikolay Shirokovskiy) - logical: Clarify pieces of lvs regex (John Ferlan) - libxl: set net device prefix (Joao Martins) - conf: add caps to virDomainSaveConfig (Joao Martins) - conf: add caps to virDomainDefFormat* (Joao Martins) - conf: add prefix in virDomainNetDefParseXML (Joao Martins) - conf: add net device prefix to capabilities (Joao Martins) - virsh: display if ZFS storage backend is enabled (Roman Bogorodskiy) - configure: zfs: enable on Linux (Roman Bogorodskiy) - storage: zfs: flexible use of 'volmode' option (Roman Bogorodskiy) - util: Export remoteSerializeTypedParameters internally via util (Erik Skultety) - util: Export remoteFreeTypedParameters internally via util (Erik Skultety) - util: Export remoteDeserializeTypedParameters internally via util (Erik Skultety) - util: Introduce virTypedParameterRemote datatype (Erik Skultety) - systemd: Add virSystemdGetMachineNameByPID (Martin Kletzander) - Simplify virDomainParseMemory (Ján Tomko) - conf: Split out logic to determine whether cpupin was provided (Peter Krempa) - qemu: domain: Prepare qemuDomainDetectVcpuPids for reuse (Peter Krempa) - qemu: Move and rename qemuProcessDetectVcpuPIDs to qemuDomainDetectVcpuPids (Peter Krempa) - qemu: cpu hotplug: Set vcpu state directly in the new structure (Peter Krempa) - conf: Add helper to retrieve bitmap of active vcpus for a definition (Peter Krempa) - cgroup: Clean up virCgroupGetPercpuStats (Peter Krempa) - cfg.mk: Adjust sc_prohibit_int_ijk to support 'exempt from syntax-check' (Erik Skultety) - qemuDomainResume: allow to resume domain with guest panicked (Dmitry Andreev) - qemu: return -1 on error paths in qemuDomainSaveImageStartVM (Nikolay Shirokovskiy) - logical: Clean up allocation when building regex on the fly (John Ferlan) - logical: Use 'stripes' value for mirror/raid segtype (John Ferlan) - logical: Use VIR_APPEND_ELEMENT instead of VIR_REALLOC_N (John Ferlan) - virsh: improve waiting for block job readiness (Michael Chapman) - virsh: be consistent with style of loop exit (Michael Chapman) - virsh: avoid unnecessary progress updates (Michael Chapman) - qemu: Mark some functions as static (Cole Robinson) - fdstream: Realign (Michal Privoznik) - qemu: Align dump options for watchdog and on_crash events (Boris Fiuczynski) - logical: Create helper virStorageBackendLogicalParseVolExtents (John Ferlan) - rbd: Open in Read-Only mode when refreshing a volume (Wido den Hollander) - rbd: Implement buildVolFrom using RBD cloning (Wido den Hollander) - rbd: Add support for wiping RBD volumes using TRIM. (Wido den Hollander) - storage: Add TRIM algorithm to storage volume API (Wido den Hollander) - rbd: Add support for wiping RBD volumes (Wido den Hollander) - storage: Adjust fix virStorageBackendVolWipeLocal switch (Wido den Hollander) - logical: Fix comment examples for virStorageBackendLogicalFindLVs (John Ferlan) - pci: Use bool return type for some virPCIDeviceGet*() functions (Andrea Bolognani) - gendispatch: Don't output spaces on empty line (Michal Privoznik) - pci: Add debug messages when unbinding from stub driver (Andrea Bolognani) - pci: Phase out virPCIDeviceReattachInit() (Andrea Bolognani) - qemu: don't iterate vcpus using priv->nvcpupids in qemuProcessSetSchedParams (Peter Krempa) - conf: disallow empty cpuset for emulatorpin (Peter Krempa) - qemu: Don't use priv->ncpus to iterate cgroup setting (Peter Krempa) - virnetdevopenvswitch: Don't call strlen() twice on the same string (Andrea Bolognani) - virnetdevmacvlan: Provide stubs for build without macvtap (Michal Privoznik) - util: keep/use a bitmap of in-use macvtap devices (Laine Stump) - util: increase libnl buffer size (Leno Hou) - device: cleanup input device code (Pavel Hrdina) - tests: add some missing tests to qemuxml2xmltest (Pavel Hrdina) - tests: use virtTestDifferenceFull in tests where we have output file (Pavel Hrdina) - vircgroup: Finish renaming of virCgroupIsolateMount (Michal Privoznik) - lxc: don't try to hide parent cgroups inside container (Daniel P. Berrange) - qemu: add reporting of vCPU wait time (Daniel P. Berrange) - virsh: fix cpu-stats command output format issue (Luyao Huang) - util: buffer: Sanitize comment for virBufferAddBuffer (Peter Krempa) - test: Touch up error message when attempting to pin invalid vCPU (Peter Krempa) - tests: qemuxml2xml: Order pinning information numerically (Peter Krempa) - virsh: cpu-stats: Remove unneeded flags (Peter Krempa) - virsh: cpu-stats: Extract common printing code into a function (Peter Krempa) - (qemu|lxc)DomainGetCPUStats: Clean up (Peter Krempa) - qemu: process: refactor and rename qemuValidateCpuMax to qemuValidateCpuCount (Peter Krempa) - virt-host-validate: Check those CGroups that we actually use (Michal Privoznik) - qemu: monitor: Refactor error handling for 'savevm' (Peter Krempa) - bhyve: bhyveload: respect boot dev and boot order (Roman Bogorodskiy) - conf: expose virDomainBootType(From|To)String (Roman Bogorodskiy) - util: reset MAC address of macvtap passthrough physdev after disassociate (Laine Stump) - lxc: fuse: Fix /proc/meminfo size calculation (Cole Robinson) - lxc: fuse: Unindent meminfo logic (Cole Robinson) - libxl: Support cmdline= in xl config files (Ian Campbell) - libxl: dispose libxl_dominfo after libxl_domain_info() (Joao Martins) - Xen: add XENXL to virErrorDomain enum (Jim Fehlig) - Xen: VIR_FROM_THIS cleanup (Jim Fehlig) - qemu: Add support for migration iteration event (Jiri Denemark) - Introduce migration iteration event (Jiri Denemark) - virsh: Don't fetch status for all domains in cmdList (Michal Privoznik) - docs: fix syntax-check long line error (Cole Robinson) - leaseshelper: reduce indentation level in virLeaseReadCustomLeaseFile (Ján Tomko) - leaseshelper: remove useless comparison (Ján Tomko) - leaseshelper: split out virLeasePrintLeases (Ján Tomko) - leaseshelper: split out custom leases file read (Ján Tomko) - leaseshelper: store server_duid as an allocated string (Ján Tomko) - storage: Add new flag for libvirt_parthelper (John Ferlan) - conf: Add storage pool device attribute part_separator (John Ferlan) - qemuTestDriverInit: fill driver with zeroes (Michal Privoznik) - Post-release version bump to 1.3.2 (Michal Privoznik) - NEWS: Don't prefix version numbers with 'v' (Andrea Bolognani) - NEWS: Fix whitespace issues (Andrea Bolognani) - NEWS: Move 2015 entries to a separate file (Andrea Bolognani) So thanks everybody for your contributions for this release, be it with patches, ideas, reviews, docs, etc ... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [RFC PATCH 0/2] ARM: add QMP command to query GIC version
by Peter Xu 01 Mar '16

01 Mar '16

For ARM platform, we still do not have any interface to query whether current QEMU/host support specific GIC version. This patchset is trying to add one QMP interface for that. By querying the GIC capability using the new interface, one should know exactly what GIC version(s) the platform will support. The capability bits will be decided by both QEMU and host kernel. The current patchset only provides interface for review. Its handler is a fake one which returns empty always. The command interface I am planning to add is something like this: -> { "execute": "query-gic-capability" } <- { "return": [ "gicv2", "gicv2-kvm", "gicv3-kvm" ] } Currently, all the possible supported GIC versions are: - gicv2: GIC version 2 without kernel IRQ chip - gicv2-kvm: GIC version 2 with kernel IRQ chip - gicv3: GIC version 3 without kernel IRQ chip (not supported) - gicv3-kvm: GIC version 3 with kernel IRQ chip Since "gicv3" is still not supported (to use GICv3, kernel irqchip support is required for now, which corresponds to "gicv3-kvm"), currently the maximum superset of the result should be: ["gicv2", "gicv2-kvm", "gicv3-kvm"] Please help review whether the interface suits our need, also please point out any error I have made. One question: how should I make this command "ARM only"? I see that in qmp-commands.hx, I can use something like "#if defined TARGET_ARM" to block out ARM specified commands, however how should I do the similiar thing in qapi-schema.json? Thanks! Peter Peter Xu (2): arm: gic: add GICType arm: gic: add "query-gic-capability" interface qapi-schema.json | 28 ++++++++++++++++++++++++++++ qmp-commands.hx | 25 +++++++++++++++++++++++++ qmp.c | 5 +++++ scripts/qapi.py | 1 + 4 files changed, 59 insertions(+) -- 2.4.3

10 35

[libvirt] setlocale problems / "initialization failed" in Rawhide
by Richard W.M. Jones 29 Feb '16

29 Feb '16

https://bugzilla.redhat.com/show_bug.cgi?id=1312688 When you upgrade from F23 to current Rawhide, you don't get any "language pack" installed. It turns out this breaks many things including libvirtd which no longer starts up: $ ./daemon/libvirtd --help /home/rjones/d/libvirt/daemon/.libs/lt-libvirtd: initialization failed Simply installing glibc-langpack-en is sufficient to fix this, but I was wondering if we should try to make libvirt work anyway. The failure comes from setlocale (LC_ALL, "") returning NULL. The attached test program prints: $ ./test setlocale failed, errno=No such file or directory Also attached is the strace output so you can see what files it is looking for. Seems like solutions to this include: - Make libvirt in Fedora depend on glibc-langpack-en. - Ignore the return value from setlocale. It seems unlikely that we really care if setlocale fails. I'm not even sure what it does. Note that virsh already ignores setlocale: if (!setlocale(LC_ALL, "")) { perror("setlocale"); /* failure to setup locale is not fatal */ } Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

4 5

[libvirt] [PATCH libvirt-glib 0/5] Add virgl config support
by Marc-André Lureau 29 Feb '16

29 Feb '16

A few fixes followed by spice gl and virtio-gpu config patches. (libvirt "spice gl" support is pending merge after the release) thanks Marc-André Lureau (5): build-sys: fix gir introspection warnings tests: fix potential crash config: add spice gl child config: add virtio video model config: add accel3d setter examples/config-demo.py | 4 +++- libvirt-gconfig/Makefile.am | 1 + .../libvirt-gconfig-domain-graphics-spice.c | 9 +++++++++ .../libvirt-gconfig-domain-graphics-spice.h | 3 +++ libvirt-gconfig/libvirt-gconfig-domain-video.c | 18 ++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-video.h | 5 ++++- libvirt-gconfig/libvirt-gconfig.sym | 5 +++++ libvirt-glib/Makefile.am | 1 + libvirt-gobject/Makefile.am | 1 + libvirt-gobject/libvirt-gobject-connection.c | 2 +- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-network.c | 1 - libvirt-gobject/libvirt-gobject-stream.c | 3 +-- tests/test-events.c | 8 +++++++- 14 files changed, 55 insertions(+), 8 deletions(-) -- 2.5.0

3 11

[libvirt] ANNOUNCE: Oz 0.15.0 release
by Chris Lalancette 29 Feb '16

29 Feb '16

All, I'm pleased to announce release 0.15.0 of Oz. Oz is a program for doing automated installation of guest operating systems with limited input from the user. Release 0.15.0 is a bugfix and feature release for Oz. Some of the highlights between Oz 0.14.0 and 0.15.0 are: * Make sure openssh-clients is included in CentOS builds * Add support for Fedora-23 * Add customization support for Debian * Use the ssh -i option to avoid "Too many authentication failures" with many ssh keys * Support "rawhide" as a Fedora version * Add in Ubuntu 15.10 support * Add in OpenSUSE 13.2 support * Improve Oz's free port selection A tarball and zipfile of this release is available on the Github releases page: https://github.com/clalancette/oz/releases . Packages for Fedora-22, Fedora-23, and EPEL-7 have been built in Koji and will eventually make their way to stable. Instructions on how to get and use Oz are available at http://github.com/clalancette/oz/wiki . If you have questions or comments about Oz, please feel free to contact me at clalancette at gmail.com, or open up an issue on the github page: http://github.com/clalancette/oz/issues . Thanks to everyone who contributed to this release through bug reports, patches, and suggestions for improvement. Chris Lalancette

1 0

[libvirt] [PATCH] docs: mention ZFS on Linux support
by Roman Bogorodskiy 28 Feb '16

28 Feb '16

--- docs/storage.html.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index b0efe69..f1960f9 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -755,8 +755,10 @@ <h2><a name="StorageBackendZFS">ZFS pools</a></h2> - This provides a pool based on the ZFS filesystem. It is currently - supported on FreeBSD only. + This provides a pool based on the ZFS filesystem. Initially it was developed + for FreeBSD, and since 1.3.2 experimental support + for <a href="http://zfsonlinux.org/">ZFS on Linux</a> version 0.6.4 or newer + is available. A pool could either be created manually using the <code>zpool create</code> -- 2.4.6

2 2

[libvirt] [PATCH] qemu: Shorten per-domain directory names
by Martin Kletzander 28 Feb '16

28 Feb '16

Per-domain directories were introduced in order to be able to completely separate security labels for each domain (commit f1f68ca33433825ce0deed2d96f1990200bc6618). However when the domain name is long (let's say a ridiculous 110 characters), we cannot connect to the monitor socket because on length of UNIX socket address is limited. In order to get around this, let's shorten it in similar fashion and in order to avoid conflicts, throw in an ID there as well. Also save that into the status XML and load the old status XMLs properly (to clean up after older domains). That way we can change it in the future. The shortening can be seen in qemuxml2argv tests, for example in the hugepages-pages2 case. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- It would be nice to have this in this release, but the problem exists since 1.2.19, so it's not a hard requirement. src/qemu/qemu_command.c | 21 +++--- src/qemu/qemu_command.h | 11 ++-- src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 8 +++ src/qemu/qemu_driver.c | 16 ++++- src/qemu/qemu_process.c | 46 ++++++------- src/qemu/qemu_process.h | 5 +- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 2 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 2 +- .../qemuxml2argv-aarch64-gic-host.args | 2 +- .../qemuxml2argv-aarch64-gic-v2.args | 2 +- .../qemuxml2argv-aarch64-gic-v3.args | 2 +- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 2 +- .../qemuxml2argv-aarch64-virt-default-nic.args | 2 +- .../qemuxml2argv-aarch64-virt-virtio.args | 2 +- .../qemuxml2argv-aarch64-virtio-pci-default.args | 2 +- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 2 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 2 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 2 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 2 +- .../qemuxml2argv-arm-virt-virtio.args | 2 +- .../qemuxml2argv-balloon-ccw-deflate.args | 2 +- .../qemuxml2argv-balloon-device-auto.args | 2 +- .../qemuxml2argv-balloon-device-deflate-off.args | 2 +- .../qemuxml2argv-balloon-device-deflate.args | 2 +- .../qemuxml2argv-balloon-device-period.args | 2 +- .../qemuxml2argv-balloon-device.args | 2 +- .../qemuxml2argv-balloon-mmio-deflate.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune-max.args | 2 +- .../qemuxml2argv-blkdeviotune.args | 2 +- .../qemuxml2argv-blkiotune-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argv-boot-floppy-q35.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 2 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 2 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +- .../qemuxml2argv-boot-network.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +- .../qemuxml2argv-bootindex-floppy-q35.args | 2 +- .../qemuxml2argv-channel-guestfwd.args | 3 +- .../qemuxml2argv-channel-spicevmc-old.args | 2 +- .../qemuxml2argv-channel-spicevmc.args | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 3 +- .../qemuxml2argv-channel-virtio-autoadd.args | 3 +- .../qemuxml2argv-channel-virtio-autoassign.args | 3 +- .../qemuxml2argv-channel-virtio-default.args | 3 +- .../qemuxml2argv-channel-virtio-state.args | 3 +- .../qemuxml2argv-channel-virtio-unix.args | 15 +++-- .../qemuxml2argv-channel-virtio.args | 3 +- .../qemuxml2argv-clock-catchup.args | 2 +- .../qemuxml2argv-clock-france.args | 2 +- .../qemuxml2argv-clock-hpet-off.args | 2 +- ...muxml2argv-clock-localtime-basis-localtime.args | 2 +- .../qemuxml2argv-clock-localtime.args | 2 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 2 +- .../qemuxml2argv-clock-variable.args | 2 +- .../qemuxml2argv-console-compat-auto.args | 2 +- .../qemuxml2argv-console-compat-chardev.args | 3 +- .../qemuxml2argv-console-compat.args | 2 +- .../qemuxml2argv-console-sclp.args | 3 +- .../qemuxml2argv-console-virtio-ccw.args | 3 +- .../qemuxml2argv-console-virtio-many.args | 3 +- .../qemuxml2argv-console-virtio-s390.args | 3 +- .../qemuxml2argv-console-virtio.args | 3 +- .../qemuxml2argv-controller-order.args | 3 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 2 +- .../qemuxml2argv-cpu-Haswell2.args | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- .../qemuxml2argv-cpu-eoi-disabled.args | 2 +- .../qemuxml2argv-cpu-eoi-enabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-vendor.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 2 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 2 +- .../qemuxml2argv-cpu-minimum1.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argv-cpu-numa-disjoint.args | 2 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 +- .../qemuxml2argv-cpu-topology1.args | 2 +- .../qemuxml2argv-cpu-topology2.args | 2 +- .../qemuxml2argv-cpu-topology3.args | 2 +- .../qemuxml2argv-cputune-numatune.args | 2 +- .../qemuxml2argv-cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 2 +- .../qemuxml2argv-default-kvm-host-arch.args | 2 +- .../qemuxml2argv-default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 2 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 2 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 2 +- .../qemuxml2argv-disk-drive-fat.args | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-network-gluster.args | 2 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 2 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 2 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 2 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 2 +- .../qemuxml2argv-disk-geometry.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 2 +- .../qemuxml2argv-disk-sata-device.args | 2 +- .../qemuxml2argv-disk-scsi-device-auto.args | 2 +- .../qemuxml2argv-disk-scsi-device.args | 2 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 2 +- .../qemuxml2argv-disk-scsi-megasas.args | 2 +- .../qemuxml2argv-disk-scsi-mptsas1068.args | 2 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 2 +- .../qemuxml2argv-disk-scsi-vscsi.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- .../qemuxml2argv-disk-snapshot.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-usb-device-removable.args | 2 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 2 +- .../qemuxml2argv-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 2 +- .../qemuxml2argv-eoi-disabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-fips-enabled.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 2 +- .../qemuxml2argv-graphics-sdl.args | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 2 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 3 +- .../qemuxml2argv-graphics-spice.args | 2 +- .../qemuxml2argv-graphics-vnc-policy.args | 2 +- .../qemuxml2argv-graphics-vnc-sasl.args | 2 +- .../qemuxml2argv-graphics-vnc-socket.args | 2 +- .../qemuxml2argv-graphics-vnc-tls.args | 2 +- .../qemuxml2argv-graphics-vnc-websocket.args | 2 +- .../qemuxml2argv-graphics-vnc.args | 2 +- .../qemuxml2argv-hostdev-pci-address-device.args | 2 +- .../qemuxml2argv-hostdev-pci-address.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 2 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-hostdev-vfio.args | 2 +- .../qemuxml2argv-hotplug-base.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-hugepages-pages.args | 2 +- .../qemuxml2argv-hugepages-pages2.args | 2 +- .../qemuxml2argv-hugepages-pages3.args | 2 +- .../qemuxml2argv-hugepages-pages5.args | 2 +- .../qemuxml2argv-hugepages-pages6.args | 3 +- .../qemuxml2argv-hugepages-shared.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 2 +- .../qemuxml2argv-hyperv-panic.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 2 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-iothreads-disk.args | 2 +- .../qemuxml2argv-iothreads-ids-partial.args | 2 +- .../qemuxml2argv-iothreads-ids.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 2 +- .../qemuxml2argv-kvm-features-off.args | 2 +- .../qemuxml2argv-kvm-features.args | 2 +- .../qemuxml2argv-kvm-pit-delay.args | 2 +- .../qemuxml2argv-kvm-pit-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 2 +- .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none.args | 2 +- .../qemuxml2argv-machine-usb-opt.args | 2 +- .../qemuxml2argv-machine-vmport-opt.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm.args | 2 +- .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 2 +- .../qemuxml2argv-memory-hotplug.args | 2 +- .../qemuxml2argv-memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 2 +- .../qemuxml2argv-migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 2 +- .../qemuxml2argv-minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 2 +- .../qemuxml2argv-misc-disable-s3.args | 2 +- .../qemuxml2argv-misc-disable-suspends.args | 2 +- .../qemuxml2argv-misc-enable-s4.args | 2 +- .../qemuxml2argv-misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 3 +- .../qemuxml2argv-multifunction-pci-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 2 +- .../qemuxml2argv-net-eth-ifname.args | 2 +- .../qemuxml2argv-net-eth-names.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 2 +- .../qemuxml2argv-net-hostdev-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 2 +- .../qemuxml2argv-net-vhostuser.args | 2 +- .../qemuxml2argv-net-virtio-ccw.args | 2 +- .../qemuxml2argv-net-virtio-device.args | 2 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 2 +- .../qemuxml2argv-net-virtio-netdev.args | 2 +- .../qemuxml2argv-net-virtio-s390.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 3 +- .../qemuxml2argv-nographics-vga.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 2 +- .../qemuxml2argv-nosharepages.args | 2 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 2 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 2 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 2 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 2 +- .../qemuxml2argv-numatune-auto-prefer.args | 2 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 2 +- .../qemuxml2argv-numatune-memnode.args | 2 +- .../qemuxml2argv-numatune-memory.args | 2 +- .../qemuxml2argv-panic-double.args | 2 +- .../qemuxml2argv-panic-no-address.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 2 +- .../qemuxml2argv-parallel-parport-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 2 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 3 +- .../qemuxml2argv-pcie-root-port.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 2 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 +- .../qemuxml2argv-pmu-feature-off.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 2 +- .../qemuxml2argv-ppc64-usb-controller.args | 2 +- .../qemuxml2argv-ppce500-serial.args | 3 +- .../qemuxml2argv-pseries-basic.args | 3 +- .../qemuxml2argv-pseries-cpu-compat.args | 3 +- .../qemuxml2argv-pseries-cpu-exact.args | 3 +- .../qemuxml2argv-pseries-cpu-le.args | 3 +- .../qemuxml2argv-pseries-nvram.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 3 +- .../qemuxml2argv-pseries-panic-no-address.args | 3 +- .../qemuxml2argv-pseries-usb-default.args | 3 +- .../qemuxml2argv-pseries-usb-kbd.args | 3 +- .../qemuxml2argv-pseries-usb-multi.args | 3 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 3 +- .../qemuxml2argv-pv-spinlock-disabled.args | 2 +- .../qemuxml2argv-pv-spinlock-enabled.args | 2 +- .../qemuxml2argv-q35-pm-disable-fallback.args | 2 +- .../qemuxml2argv-q35-pm-disable.args | 2 +- .../qemuxml2argv-q35-usb2-multi.args | 2 +- .../qemuxml2argv-q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 2 +- .../qemuxml2argv-qemu-ns-commandline.args | 2 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 2 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 2 +- .../qemuxml2argv-reboot-timeout-disabled.args | 2 +- .../qemuxml2argv-reboot-timeout-enabled.args | 2 +- .../qemuxml2argv-restore-v2-fd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 2 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 3 +- .../qemuxml2argv-s390-allow-bogus-usb-none.args | 3 +- .../qemuxml2argv-seclabel-dac-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 2 +- .../qemuxml2argv-seclabel-dynamic-override.args | 2 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic.args | 2 +- .../qemuxml2argv-seclabel-none.args | 2 +- .../qemuxml2argv-seclabel-static-labelskip.args | 2 +- .../qemuxml2argv-seclabel-static-relabel.args | 2 +- .../qemuxml2argv-seclabel-static.args | 2 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 3 +- .../qemuxml2argv-serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 2 +- .../qemuxml2argv-serial-file-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 2 +- .../qemuxml2argv-serial-many-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 2 +- .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 2 +- .../qemuxml2argv-serial-spiceport-nospice.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 3 +- .../qemuxml2argv-serial-tcp-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 2 +- .../qemuxml2argv-serial-udp-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 2 +- .../qemuxml2argv-serial-unix-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 2 +- .../qemuxml2argv-serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 3 +- .../qemuxml2argv-smartcard-host-certificates.args | 3 +- .../qemuxml2argv-smartcard-host.args | 3 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 3 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller-default-q35.args | 2 +- .../qemuxml2argv-usb-controller-explicit-q35.args | 2 +- .../qemuxml2argv-usb-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 3 +- .../qemuxml2argv-usb-ich9-companion.args | 3 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 3 +- .../qemuxml2argv-usb-piix3-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 3 +- .../qemuxml2argv-usb-redir-boot.args | 3 +- .../qemuxml2argv-usb-redir-filter-version.args | 3 +- .../qemuxml2argv-usb-redir-filter.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 3 +- .../qemuxml2argv-video-device-pciaddr-default.args | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-device.args | 2 +- .../qemuxml2argv-video-qxl-nodevice.args | 2 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-sec-device.args | 2 +- .../qemuxml2argv-video-vga-device-vgamem.args | 2 +- .../qemuxml2argv-video-vga-device.args | 2 +- .../qemuxml2argv-video-vga-nodevice.args | 2 +- .../qemuxml2argv-video-virtio-gpu-device.args | 2 +- .../qemuxml2argv-video-virtio-gpu-virgl.args | 2 +- .../qemuxml2argv-virtio-input-passthrough.args | 2 +- .../qemuxml2argv-virtio-input.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 3 +- .../qemuxml2argv-virtio-rng-default.args | 2 +- .../qemuxml2argv-virtio-rng-egd.args | 2 +- .../qemuxml2argv-virtio-rng-multiple.args | 2 +- .../qemuxml2argv-virtio-rng-random.args | 2 +- .../qemuxml2argv-watchdog-device.args | 2 +- .../qemuxml2argv-watchdog-diag288.args | 3 +- .../qemuxml2argv-watchdog-dump.args | 2 +- .../qemuxml2argv-watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 2 +- tests/qemuxml2argvtest.c | 17 +++-- tests/qemuxml2xmltest.c | 4 +- 463 files changed, 682 insertions(+), 507 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 854e51c60b60..d08e78fea04f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5711,9 +5711,9 @@ qemuBuildNumaCommandLine(virCommandPtr cmd, static int qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virCommandPtr cmd, - virDomainDefPtr def, virQEMUCapsPtr qemuCaps, - virDomainGraphicsDefPtr graphics) + virDomainGraphicsDefPtr graphics, + const char *domainLibDir) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *listenNetwork; @@ -5731,7 +5731,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, if (graphics->data.vnc.socket || cfg->vncAutoUnixSocket) { if (!graphics->data.vnc.socket && virAsprintf(&graphics->data.vnc.socket, - "%s/domain-%s/vnc.sock", cfg->libDir, def->name) == -1) + "%s/vnc.sock", domainLibDir) == -1) goto error; virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket); @@ -6080,7 +6080,8 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, virCommandPtr cmd, virDomainDefPtr def, virQEMUCapsPtr qemuCaps, - virDomainGraphicsDefPtr graphics) + virDomainGraphicsDefPtr graphics, + const char *domainLibDir) { switch ((virDomainGraphicsType) graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: @@ -6112,7 +6113,8 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - return qemuBuildGraphicsVNCCommandLine(cfg, cmd, def, qemuCaps, graphics); + return qemuBuildGraphicsVNCCommandLine(cfg, cmd, qemuCaps, + graphics, domainLibDir); case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: return qemuBuildGraphicsSPICECommandLine(cfg, cmd, qemuCaps, graphics); @@ -7013,7 +7015,9 @@ qemuBuildCommandLine(virConnectPtr conn, bool enableFips, virBitmapPtr nodeset, size_t *nnicindexes, - int **nicindexes) + int **nicindexes, + const char *domainLibDir, + const char *domainChannelTargetDir) { virErrorPtr originalError = NULL; size_t i, j; @@ -8055,8 +8059,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (channel->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && !channel->source.data.nix.path) { if (virAsprintf(&channel->source.data.nix.path, - "%s/domain-%s/%s", - cfg->channelTargetDir, def->name, + "%s/%s", domainChannelTargetDir, channel->target.name ? channel->target.name : "unknown.sock") < 0) goto error; @@ -8188,7 +8191,7 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0; i < def->ngraphics; ++i) { if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps, - def->graphics[i]) < 0) + def->graphics[i], domainLibDir) < 0) goto error; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index fb684d0a069b..c63c7bc9ee71 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -64,15 +64,18 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, bool monitor_json, virQEMUCapsPtr qemuCaps, const char *migrateURI, - virDomainSnapshotObjPtr current_snapshot, + virDomainSnapshotObjPtr snapshot, virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, - bool forXMLToArgv, + bool standalone, bool enableFips, virBitmapPtr nodeset, size_t *nnicindexes, - int **nicindexes) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(10); + int **nicindexes, + const char *domainLibDir, + const char *domainChannelTargetDir) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(10) + ATTRIBUTE_NONNULL(16) ATTRIBUTE_NONNULL(17); /* Generate '-device' string for chardev device */ int diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3fc15130833f..5b7b38e29776 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -472,6 +472,63 @@ qemuDomainDiskPrivateNew(void) } +/* This is the old way of setting up per-domain directories */ +static int +qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int ret = -1; + + if (!priv->libDir && + virAsprintf(&priv->libDir, "%s/domain-%s", + cfg->libDir, vm->def->name) < 0) + goto error; + + if (!priv->channelTargetDir && + virAsprintf(&priv->channelTargetDir, "%s/domain-%s", + cfg->channelTargetDir, vm->def->name) < 0) + goto error; + + ret = 0; + error: + virObjectUnref(cfg); + return ret; +} + + +/* + * The newer version uses a magic number for one reason. The thing is + * that we need a bit shorter name in order to be able to connect to + * it using UNIX sockets which have path length limitation. Since the + * length is not guaranteed to be constant and similarly the lib + * directory is configurable and so on, we need to rather choose an + * arbitrary maximum length of the domain name that will be used. + * Thanks to the fact that we are now saving it in the status XML, we + * can change it later on whenever we feel like so. + */ +int +qemuDomainSetPrivatePaths(char **domainLibDir, char **domainChannelTargetDir, + const char *confLibDir, const char *confChannelDir, + const char *domainName, int domainId) +{ + const int dommaxlen = 20; + + if (!*domainLibDir && + virAsprintf(domainLibDir, "%s/domain-%d-%.*s", + confLibDir, domainId, dommaxlen, domainName) < 0) + return -1; + + if (!*domainChannelTargetDir && + virAsprintf(domainChannelTargetDir, "%s/domain-%d-%.*s", + confChannelDir, domainId, dommaxlen, domainName) < 0) + return -1; + + return 0; +} + + static void * qemuDomainObjPrivateAlloc(void) { @@ -534,6 +591,10 @@ qemuDomainObjPrivateFree(void *data) VIR_FREE(priv->cleanupCallbacks); virBitmapFree(priv->autoNodeset); virBitmapFree(priv->autoCpuset); + + VIR_FREE(priv->libDir); + VIR_FREE(priv->channelTargetDir); + VIR_FREE(priv); } @@ -655,6 +716,11 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, VIR_FREE(nodeset); } + /* Various per-domain paths */ + virBufferEscapeString(buf, "<libDir path='%s'/>\n", priv->libDir); + virBufferEscapeString(buf, "<channelTargetDir path='%s'/>\n", + priv->channelTargetDir); + return 0; } @@ -859,6 +925,15 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virObjectUnref(caps); VIR_FREE(tmp); + if ((tmp = virXPathString("string(./libDir/@path)", ctxt))) + priv->libDir = tmp; + if ((tmp = virXPathString("string(./channelTargetDir/@path)", ctxt))) + priv->channelTargetDir = tmp; + tmp = NULL; + + if (qemuDomainSetPrivatePathsOld(driver, vm) < 0) + goto error; + return 0; error: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8359b1afd08c..fe890a7f8660 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -204,6 +204,8 @@ struct _qemuDomainObjPrivate { bool signalIOError; /* true if the domain condition should be signalled on I/O error */ char *machineName; + char *libDir; /* base path for per-domain files */ + char *channelTargetDir; /* base path for per-domain channel targets */ }; # define QEMU_DOMAIN_DISK_PRIVATE(disk) \ @@ -528,4 +530,10 @@ bool qemuDomainSupportsNetdev(virDomainDefPtr def, int qemuDomainNetVLAN(virDomainNetDefPtr def); +int qemuDomainSetPrivatePaths(char **domainLibDir, + char **domainChannelTargetDir, + const char *confLibDir, + const char *confChannelDir, + const char *domainName, + int domainId); #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45ff3c0a6618..75f447dede58 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7019,6 +7019,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, size_t i; virQEMUDriverConfigPtr cfg; virCapsPtr caps = NULL; + char *domainLibDir = NULL; + char *domainChannelTargetDir = NULL; virCheckFlags(0, NULL); @@ -7048,6 +7050,12 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuProcessStartValidate(def, qemuCaps, false, false) < 0) goto cleanup; + /* Generate per-domain paths because we don't have the domain object */ + if (qemuDomainSetPrivatePaths(&domainLibDir, &domainChannelTargetDir, + cfg->libDir, cfg->channelTargetDir, + def->name, -1) < 0) + goto cleanup; + /* Since we're just exporting args, we can't do bridge/network/direct * setups, since libvirt will normally create TAP/macvtap devices * directly. We convert those configs into generic 'ethernet' @@ -7138,7 +7146,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, monitor_json = virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON); - if (qemuProcessPrepareMonitorChr(cfg, &monConfig, def->name) < 0) + if (qemuProcessPrepareMonitorChr(&monConfig, def->name) < 0) goto cleanup; if (qemuAssignDeviceAliases(def, qemuCaps) < 0) @@ -7166,7 +7174,9 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, &buildCommandLineCallbacks, true, qemuCheckFips(), - NULL, NULL, NULL))) + NULL, NULL, NULL, + domainLibDir, + domainChannelTargetDir))) goto cleanup; ret = virCommandToString(cmd); @@ -7177,6 +7187,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, virDomainDefFree(def); virObjectUnref(caps); virObjectUnref(cfg); + VIR_FREE(domainLibDir); + VIR_FREE(domainChannelTargetDir); return ret; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e76018243897..7d8cf9d3cd44 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2855,15 +2855,14 @@ static int qemuProcessHook(void *data) } int -qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, - virDomainChrSourceDefPtr monConfig, - const char *vm) +qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig, + const char *domainDir) { monConfig->type = VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen = true; - if (virAsprintf(&monConfig->data.nix.path, "%s/domain-%s/monitor.sock", - cfg->libDir, vm) < 0) + if (virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", + domainDir) < 0) return -1; return 0; } @@ -4263,14 +4262,10 @@ qemuProcessSetupBalloon(virQEMUDriverPtr driver, static int qemuProcessMakeDir(virQEMUDriverPtr driver, virDomainObjPtr vm, - const char *parentDir) + const char *path) { - char *path = NULL; int ret = -1; - if (virAsprintf(&path, "%s/domain-%s", parentDir, vm->def->name) < 0) - goto cleanup; - if (virFileMakePathWithMode(path, 0750) < 0) { virReportSystemError(errno, _("Cannot create directory '%s'"), path); goto cleanup; @@ -4283,7 +4278,6 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, ret = 0; cleanup: - VIR_FREE(path); return ret; } @@ -4908,11 +4902,19 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; } + if (qemuDomainSetPrivatePaths(&priv->libDir, + &priv->channelTargetDir, + cfg->libDir, + cfg->channelTargetDir, + vm->def->name, + vm->def->id) < 0) + goto cleanup; + if (VIR_ALLOC(priv->monConfig) < 0) goto cleanup; VIR_DEBUG("Preparing monitor state"); - if (qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0) + if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0) goto cleanup; priv->monJSON = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON); @@ -5000,7 +5002,9 @@ qemuProcessLaunch(virConnectPtr conn, &buildCommandLineCallbacks, false, qemuCheckFips(), priv->autoNodeset, - &nnicindexes, &nicindexes))) + &nnicindexes, &nicindexes, + priv->libDir, + priv->channelTargetDir))) goto cleanup; if (incoming && incoming->fd != -1) @@ -5010,8 +5014,8 @@ qemuProcessLaunch(virConnectPtr conn, * Create all per-domain directories in order to make sure domain * with any possible seclabels can access it. */ - if (qemuProcessMakeDir(driver, vm, cfg->libDir) < 0 || - qemuProcessMakeDir(driver, vm, cfg->channelTargetDir) < 0) + if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || + qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) goto cleanup; /* now that we know it is about to start call the hook if present */ @@ -5456,7 +5460,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virNetDevVPortProfilePtr vport = NULL; size_t i; char *timestamp; - char *tmppath = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainLogContextPtr logCtxt = NULL; @@ -5542,15 +5545,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, priv->monConfig = NULL; } - ignore_value(virAsprintf(&tmppath, "%s/domain-%s", - cfg->libDir, vm->def->name)); - virFileDeleteTree(tmppath); - VIR_FREE(tmppath); - - ignore_value(virAsprintf(&tmppath, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name)); - virFileDeleteTree(tmppath); - VIR_FREE(tmppath); + virFileDeleteTree(priv->libDir); + virFileDeleteTree(priv->channelTargetDir); ignore_value(virDomainChrDefForeach(vm->def, false, diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index eb37863feb7b..c21ed1c81567 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -25,9 +25,8 @@ # include "qemu_conf.h" # include "qemu_domain.h" -int qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, - virDomainChrSourceDefPtr monConfig, - const char *vm); +int qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig, + const char *domainDir); int qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index 4190683f377f..3f05dfb5e1a3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 4207f1029372..4ae3923de702 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args index 56adc72b05b9..61ee5af884c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args index d30f4493b2b5..d3ac955fa009 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args index 9cd86acc6710..27fa1f593fe7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index f0be6802548d..23bb517cb10b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args index 460a351ab2cd..06a4733c3fa5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index f879560ed6a1..566bee2c87be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args index a49bc82b0f1a..a7a996e2b0b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args index 142fd5b8e464..e3e962badb07 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args index adaa6fc9f601..37884a709c3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args index 78e9338ecf57..c7c748799263 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args index eb807b499c40..e6dc00a7e1e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args index 0e90630549d1..c736f6049fd3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args index 8dfced6b69f2..a6668761c035 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a,deflate-on-oom=on diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args index 37e99885eef6..390cc9d58ae6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args index 86f6336393c8..203fc858cab4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args index 9a0332f734cb..a11257937a8b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args index 333d0aebb2d9..1289d4420781 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args index 333d0aebb2d9..1289d4420781 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args index bb70bf850603..0fd910746fb0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args index 718f34bb7b5f..fe4e4194605b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test-bios/monitor.sock,server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index 650e3031c0de..012af854baec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefaults \ -device sga \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test-bios/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args index e3c6a0b0f28d..3efa2acdf14e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args index 7aca75902453..f69f9169a13c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args index c5173696b1a9..44dbdf50aecf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot d \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args index 5784aa0b84ab..cfc4ffcb4922 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -usb \ -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args index 10fffbe3f84e..7913f515d85b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot dnca \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args index eefbdff7fee8..4915ae552ceb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot a \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args index 902adeeec820..6666e3b3d2fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot a \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args index 63d5e5ea7570..3114b549152f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot menu=off \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args index 384c69456ec9..6bc5cef18a41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=d,menu=off \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args index 384c69456ec9..6bc5cef18a41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=d,menu=off \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args index 9879657becc3..0c0bd05b5db4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=d,menu=on,splash-time=3000 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args index 77646698ec0c..09765e9c00de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=d,menu=on \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args index 5c970f4c3c1f..542efaa910af 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=dcna,menu=on \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args index 958cb688d8cc..8e8c4da3694f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args index 94d70f789330..65dddf03dead 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args index 6b8216307f9a..f17358bc9c76 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot strict=on \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args index 2c736a5376ef..26ae88641afb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index 36faf6ff1180..ee213ab6ab53 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args index 4146d1a076dc..23c5df52cba3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args index 39a2c049f7ae..b633e65aef34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args index c517651ce600..c01dfad45977 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args index e8e3d64e2d28..f087d18ba987 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args index ff8be5f99db5..b5e1e77b0d49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index 857785da8570..ad2981b11e5d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args index b041bbebf373..2e4f96010c88 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 6a0b1f373603..b56ced5ee378 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ @@ -24,16 +25,18 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charchannel0,\ -path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ +path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.qemu.guest_agent.0 \ --chardev socket,id=charchannel1,path=/tmp/domain-QEMUGuest1/unknown.sock,server,\ -nowait \ +-chardev socket,id=charchannel1,\ +path=/tmp/channel/domain--1-QEMUGuest1/unknown.sock,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ id=channel1 \ --chardev socket,id=charchannel2,path=/tmp/domain-QEMUGuest1/ble,server,nowait \ +-chardev socket,id=charchannel2,path=/tmp/channel/domain--1-QEMUGuest1/ble,\ +server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,\ id=channel2,name=ble \ --chardev socket,id=charchannel3,path=/tmp/domain-QEMUGuest1/fdsa,server,nowait \ +-chardev socket,id=charchannel3,path=/tmp/channel/domain--1-QEMUGuest1/fdsa,\ +server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,\ id=channel3,name=fdsa diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args index 203f510e596a..b21bf67cd680 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args index 954e6dd86c3d..f08a28c7794a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -rtc base=utc,driftfix=slew \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args index 4359b994c97b..69925591b990 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -14,7 +14,7 @@ TZ=Europe/Paris \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -rtc base=localtime \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args index ef33879b829d..a0c61457c7fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -rtc base=utc,driftfix=slew \ -no-kvm-pit-reinjection \ -no-hpet \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args index e004eec32173..080c29c34c7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -rtc base=2009-02-14T00:01:30 \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args index 18c36a8c3d12..e5a746e05816 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -localtime \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args index 615abee5bc18..4fa116377288 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args index 122d0c8c2f71..ee120faa10bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args index aebddf123fd0..4f02c406a439 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -rtc base=2009-02-15T09:49:06 \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index 480d5878c528..a192a0a3d504 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args index 23d5cc345a3e..e071b3f91ad9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index 1e146218b7b7..9fea57f630ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args index e0c1e66c5a8c..73b6b08d2cda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 1b2a658fb9ea..cae909aa895b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args index fd9e1e85b876..d765334a4bc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args index 4b61b1304ddb..3ec1109f1f64 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args index 020c68a2fc2b..0dd75aafaeee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args index d4605253ac11..89c7fd8c4d7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=spice \ -smp 4 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr/monitor.sock,server,\ +nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -boot order=cna,menu=off \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args index 386934148b26..57e6e0769243 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args index e3746196838b..d00a6193013a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args index 6ad47ee04e4e..3f55ffb76bec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args index e3746196838b..d00a6193013a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args index 9557a35fa6b9..d518c70c31f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args index 2a80d2f4dcad..b21a13cef268 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args index 0772f3de8d8c..9c9f53a07756 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args index f282568154da..2bc03ca020fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args index f282568154da..2bc03ca020fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args index 207627d339d8..6b9dc82e169c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args index cae06e963c66..a7fea66f48bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args index cbdbc3dafbef..07a85041d735 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args index 43af66d7518c..4a8cf90860e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args index d52618572c82..b8dd2d446eaa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args index 9f3802a6c55b..5a722a8f1072 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args index e751a60ec399..e3d13a28f72c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args index 2d909d1248c3..23dcc91478b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args index 12a991e02223..849d94545822 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args index 3ab065faaf22..0de55abad6c1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args index 0673bde9b761..5b112c6add0b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args index ac3dd3010cbf..2613649a8b3f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args index b79f29bbcc4d..bc8c54c0b738 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args index ac3dd3010cbf..2613649a8b3f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args index 00a000ea686f..c0b420f36b1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args index 9563bb81a07c..eb001c1e2185 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args index b09b1f69b746..53764ff1120e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args index 191fd809675f..351023462e0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args index bde6338d9f5d..90c2555ce161 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-dummy2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args index d28c7522bf81..872f78296681 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-kvm/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args index 28e1ce140c10..4c2019a2ae72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-qemu-host/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args index 18a5bd3853f2..b2e303922b72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index 58f7a6988690..72cd866ecf8b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args index 0651412c06ac..5b53f52ce216 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args index afc5f553bd74..f50ada49447d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot d \ -usb \ -drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,media=cdrom,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args index c2069db610f3..b052fc7514d5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot d \ -usb \ -drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args index 0aa4fcee4061..f0366c89a48b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot d \ -usb \ -drive file=http://host.name:80/url/path/file.iso,format=raw,if=none,media=cdrom,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args index ceca49e7a47d..6a50f5529b13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot d \ -usb \ -drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args index 9ea4a3758d8e..998651ddf866 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot d \ -usb \ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,media=cdrom,\ 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 2cf2166ce2d6..eb3c97bdce7a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args index 571d65de112c..90da2887c7a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ -no-acpi \ -boot dc \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args index 3d1a15f4f62d..034d4b3f5ad9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index ba9ec0d776d6..0d1b59ac4149 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,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 d796e5314b7c..fe013af6cb5a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot d \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args index 1c0a2bd7f4e6..1a830a603df7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args index c73988e28e05..72442cc1cd3f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args index dff806a1745a..25b14db912ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args index 4f23ce8842fd..14dfa3a720b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args index c0b4e9d2b30a..f5712da338f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args index a0d0eb4e37af..036f1d5b818a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args index a9b8d86c743e..377cb708bd09 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index bfa3a7ef96a3..5c377dc48540 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ -no-acpi \ -boot dc \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args index 84c42721d179..713a897729fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/test-monitor,server,nowait \ +-monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args index 6abe972daa77..eaf4aaa26aac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/test-monitor,server,nowait \ +-monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ 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 68c63f994dd3..96620ab37156 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/test-monitor,server,nowait \ +-monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args index 6df0fac17139..7e48e2182dbe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args index 0c7497533daa..740fb5e53405 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args index 7cb1a48c7a20..7851dee74c49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args index 282a56aac2b5..735a0aec5e29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args index a0ef17c74445..270f3c3d3eda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args index f409c8f9fbe1..c22d3d854949 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args index 83323da590d0..2c98291349d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ 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 c93c05290c64..8a6e7e038fb9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args index c3db486619fc..5d8448a263f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args index 09d2592bbfd3..9d02919d4d9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args index 135e77976cbe..8ca8e84f4f28 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index 6f0c42e44269..c7912a6ecc78 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args index d54b9b06af2a..4f54e24bd79e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args index 35f936637be9..53bacedbbdee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args index fa07301be727..72780a7d59d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args index 2a9ac69bdbeb..3c98b2eb71f5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args index 0fa299ebb30f..9a35d7b49a89 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args index 0fa299ebb30f..9a35d7b49a89 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args index 9a2d50bed7a3..e8f47e22d7c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ 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 60b57e267195..cb494123703d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args index 60b57e267195..cb494123703d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args index 985804641f33..872078123c65 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args index 67686f04ff2f..e7fbd0a5f445 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args index 29ea5e63d47d..9c13f53763d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args index e8969a46971d..8b5ca32c6f29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args index ee695583d8f7..a28741ac753a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,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-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args index 6119f5a2b666..66f1c7c40334 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args index ee7b353876aa..86e13953c991 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args index 8f5fabd0e77b..327e2993a2dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args index 359d7583ca8b..b83bfc7cc294 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device ahci,id=sata0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args index 693905b2b2eb..f729b881209d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args index 693905b2b2eb..f729b881209d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args index e3aad6a30a41..aaad74ed4bb9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 9f36a72cb0ba..df118e3bef38 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 251772134e90..1eed2676b1ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 d9f07eddc32f..9a851d1542fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 17071faece70..fce7b27df519 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device megasas,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args index bdfc1afcba8a..f53a3987c748 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args index 38abc11aee74..be3017130e4b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args index e79ba4bd386b..d532bcf670cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index d97fa45c9372..91875bbb1411 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args index e47f173298c4..2fbcf591813b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args index 71f15a719b36..304a6c80438c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index 8188762bea8c..298a964a2a52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args index 24a016521457..63e2bb20edb7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args index b9edf18e57ad..5d1ea98c9e56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args index 95ec44157bff..c2358f2adf59 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,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 2b58f210972a..7dc8a64fda94 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,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 c4ce46351b7a..8f080851000f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,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 81533d5cdf26..b53ce8c03a5c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args index 59501500d5e6..9561965e5a37 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args index 704a91c798b0..b37885d3a24c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args index 7e3406fbd3c0..7a802078ee48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args index 8c2a737b8409..339f78ebe0cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 3ab8c43d7224..faa3474d7c49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args index 8bd9dbd27955..04b9be6ca3f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args index 9557a35fa6b9..d518c70c31f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args index 2a80d2f4dcad..b21a13cef268 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args index 2f031eb13bf0..bec49c6f08f3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ -no-acpi \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args index 8c4191cfb355..27d888ece414 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args index 8a50b77845db..b1d4d530335e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot a \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args index 19409c965726..fbe864c561a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args index 09508f2dcb1a..4944032cfdee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args index a835b134956b..53e9288fbb0e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -13,7 +13,7 @@ DISPLAY=:0.1 \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args index 18b10e92427b..64a3186f8c3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -13,7 +13,7 @@ DISPLAY=:0.1 \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args index 95c7b44dbd7a..2ad3f684559a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=spice \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args index e4f75c4d9345..efe1c56a00ff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 268fb6b6047b..275a88b0d45d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=spice \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index 1739404cf520..2517237a092d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=spice \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args index 8c9207d4a3f0..e21d69923363 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=spice \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 376793fdb48f..7ca17ae10835 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \ -smp 2 \ -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-f14/monitor.sock,server,nowait \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args index 24e5c345bbdb..fa248b30d16a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 5e63e5ee367e..d6c582042293 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=spice \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index fc8888f55e8b..eeca740c37f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args index 56b297d6786c..4c0f84e8b339 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args index 5d21dc2a58fc..2464867b3144 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args index ce7f934740b2..4100fb7e816e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args index b4e0d58deb2c..49697470a401 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index faa07ef56e4b..f374cff7a0ec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args index 8405851581d7..47ecc2f9db13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args index cd45740fd798..4719a7d5a003 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 271d1f649140..2bd98e558a86 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args index 1dcb8b52ca41..5d03d5247148 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args index 759d84026056..f605618c5c4d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args index 7f10bd3626c0..13af7d3500d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 449bc4a166b1..624be9457e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args index 3fc5295eb30a..d50fb3c14b9e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args index cd44e37ac064..542c42e6e1f9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args index f9f8a89f3295..8c000555a192 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args index 71a17c232c6b..b5e6834bd85e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args index 2830d5cc12ef..bb5d55a60332 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args index cb7fdb76232b..0027f411d058 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args index 8de439bf8260..a71ebe8bd536 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args index 777d06bcf6b2..79aa2709676c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-hotplug/monitor.sock,server,nowait \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index fbe1159a9ee9..56956a30f198 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -19,7 +19,7 @@ policy=bind \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-fedora/monitor.sock,server,nowait \ -rtc base=utc,driftfix=slew \ -no-kvm-pit-reinjection \ -global PIIX4_PM.disable_s3=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args index ed9cfaff68d1..5431709e0eaa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args @@ -28,7 +28,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args index c060b0e21334..b5bcb81eac7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -19,7 +19,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args index f9f239ad0ac4..3a9d1d058921 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -18,7 +18,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args index 2bcbbeb759c2..eb06e2a698e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args index 932da989c7ae..69f6ad08bd45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,\ +nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args index 47f6905255a5..416a96200a6a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args @@ -28,7 +28,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index 11a150a957fb..edb01d6cfaa5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args index e71f67b26518..37a2af78cdb8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args index 9d517ea8676d..d6207927c165 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args @@ -14,6 +14,6 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args index 45bfdcfe5f89..141844a4b7f5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args @@ -14,6 +14,6 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args index 46dedc0bcd49..68147a427ab5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args index edc6241857fb..bd0e5c696087 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args index d2cd2e4c0366..294515f1c1b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args index 9e89682593b8..58168b9f0fee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args index c725de5653a5..df4a2998fd75 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args index 386588e98531..49dbfbaa7169 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args index 661a6c61536a..be89828254ea 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args index 24a7c8d6723f..b24ec1eee6c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args index e71f67b26518..37a2af78cdb8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args index 3a60c4fcfef7..7d768fd3ac6b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args @@ -14,6 +14,6 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args index 24fcdb0e4501..1d7be2b3bdab 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-kvm-pit-reinjection \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args index 6857b66a136c..5f043083a939 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -global kvm-pit.lost_tick_policy=discard \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args index 4cead08d1da0..033c7593a6ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-kvm/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args index 896bfb382ab4..756c8a984ff6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args index 57384dfa0bd5..954fbaaf64b3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args index d1a78216595a..15593bf3ebd7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args index d1a78216595a..15593bf3ebd7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args index 6dcf4c525bb6..c148fab9e051 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args index 6dcf4c525bb6..c148fab9e051 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index f4d3e402cd83..be730de8935d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args index 0d32914a65ef..c2ac8bb0924b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args index 4ebbcdc43283..0610c2c8015a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args index efd7956d00eb..c62ca65b2baf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args index 2d8e51643a0b..7fdb827ae1b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args index 2d8e51643a0b..7fdb827ae1b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args index 0df1b7d56070..63f6fd96465b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args index 0df1b7d56070..63f6fd96465b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args index ae45867a2492..652eca2f6c3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args index ae45867a2492..652eca2f6c3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args index 48a3b214445b..68078c699837 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args index 9c040da7194f..1f817cbc17fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args index 4888ee8b6c1b..603bae2b752b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -17,7 +17,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args index f85ed88e3888..a8a55277485c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -19,7 +19,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args index 8b6bf3e29aff..bb29cfdd215a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -kernel /media/ram/uImage \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args index c57ef0c75b38..c4831ec2133b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args index ac83c2003a49..1c43ba29caae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args @@ -22,7 +22,7 @@ host-nodes=5,host-nodes=7,policy=bind \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args index 951ef92cd034..97d3684649be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args index a8d37e359c6b..b43c4e6d7bb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args index 9ae2dd898f36..0386a12a4f3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args index ba46f45c7b4e..4222202a180c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args index 07db5205a923..92d1b4a1e165 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args index fd4a72d9c279..db25fa9e27b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -global PIIX4_PM.disable_s4=0 \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args index 6ec110158996..0f5e504c2495 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-reboot \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args index 9ae2dd898f36..0386a12a4f3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args index c759d0f331c0..6564cf3bf8c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args index 7e42cc80f5ae..b0b11e8feed4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args index aa6eed754e2c..5de9ecb4c9c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args index 9211263b59ce..3411b268e54a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args index 51ebef2fb16d..13889274350e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 992d242998c5..ef5301e02fc5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index 44df050e2e07..22d6dd0b72fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args index 3e470df82656..0704178e9314 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index 26c9898f4d49..b69cf52a3fc1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args index 911290d363e8..458eac421c1f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args index ad97c4d1f80a..99240dc1926c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args index 827c099f096b..bbeb05707697 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args index 296621b01173..9cc8c27a5bdc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args index 2c90f676d567..98ad8cfa9ee7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args index 9454f022ab89..b0df20fc70fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args index 638a0d2eb3c4..e5b1514bd1fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args index acbd4a2319c3..7a6605b53e4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index 1b2a66aca7a3..322903493541 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index 86313a56d9ff..a9989b868473 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args index db25cdf1b4a8..4cec6b1d76e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 ff953d116b48..ac72cbf244ee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index 8260aa5accf4..1123b486acb2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args index 5bbeb1ffc013..cd17800bd9c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args index c3a0b20ce71b..3d95fe180027 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,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 c700b9c18107..a3893fc46255 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args index 39f52a896433..7f55f19d5e44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -no-shutdown \ -no-acpi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args index a5f585a88c4e..1d6c7e928432 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args index 06a067d84738..62d09c98bea1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ 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 00683a6bb3e4..23d4b2a10ed8 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 @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args index 7728c1312ac3..71d8105f29d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args index b9dfe2cd1bf2..bd1616eab5da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args @@ -18,7 +18,7 @@ policy=preferred \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args index fa763a5a90b1..08d672d983ac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args @@ -22,7 +22,7 @@ host-nodes=5,host-nodes=7,policy=bind \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args index 00683a6bb3e4..23d4b2a10ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args index 0d3a38591614..574e696aad73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device pvpanic,ioport=1285 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args index 02ecbe9b96fd..c5345d08c3b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args index 03f1507ddac9..bf82d3acdf86 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args index 2cefae95a7a7..1917dd00cd73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args index d5ef7dd8656a..29aa5d037985 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args index 932117cbd0ab..f40708d25e3e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args index 85a125c663f0..c02d88020698 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args index 30214aa9cab5..3a8e2cb8e917 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ -boot c \ -device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args index ce5df078f4e8..1b3f0a4b8a5f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-lots-of-disks/monitor.sock,server,nowait \ -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args index 3908504c7173..685319aa69a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ -boot c \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args index 1adf6b7c8455..94d313546b6e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args index 84e1a829ae15..908a6868f758 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args index 10fc47b980fc..7fd84f17ad2b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args index 5efe042ae320..230d13cfe207 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args index a53dd00dac99..9d55621cfacc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args index e577ae6ea8a0..d8aa44b227a8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index 1e1cc0b19a9b..b6ccda233b94 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -global q35-pcihost.pci-hole64-size=1048576K \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args index 88701e084486..0d5ad06e7eed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -global i440FX-pcihost.pci-hole64-size=1048576K \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args index 0e36ecdc7834..92f05decab22 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args @@ -14,6 +14,6 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args index 9ce170d860b5..2af536cf0a36 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args @@ -14,6 +14,6 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args index a5d096aa862f..31a675c83659 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -kernel /media/ram/uImage \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args index 7d301f32bec7..aafa6216c691 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot c \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args index f17a377dfd6f..071194042e65 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot c \ -device pci-ohci,id=usb,bus=pci,addr=0x1 \ -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args index 23c2a8f6d59f..3f067874bf6f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args index b4373162c1d4..aac325fd4755 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args index 0d2848e99a3e..fdd81013b814 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args @@ -15,7 +15,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args index 440729d871b8..b459e12f1539 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args @@ -15,7 +15,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args index b4373162c1d4..aac325fd4755 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args index a5ea0bf44228..9cc8914a59fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args index b4373162c1d4..aac325fd4755 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args index b4373162c1d4..aac325fd4755 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index d8e4d2112eb2..4d0af3ff9a11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args index e2296cb95c0f..25c16cb64808 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args index 37f8738868ba..46e8b02b8732 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args index 44c6ab0df62c..cc85a1552867 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args index eeebe502f06e..ba000a9e3f0b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args index 1e9edddd1303..8f5f209d6e72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args index e325096678d5..66b816a50c1b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args index bab2b68e3ef0..e439b499c363 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35/monitor.sock,server,nowait \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args index dbf1119df115..73cf9678b2e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35/monitor.sock,server,nowait \ -no-acpi \ -global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s4=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args index 6ee64fcbe177..26c4d3c34d21 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args index 4855dee5d7dc..ba0e7fa841ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args index 4867eac040d3..98287e62a649 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index 4867eac040d3..98287e62a649 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args index 72b580bb2489..21d2d837e8cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args index ded764f7ee81..a26fb612156b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index b34b3b64fb98..7b4dbdf2138c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -15,7 +15,7 @@ BAR='' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args index 9f15b3450d2b..d9750556cc34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=n,reboot-timeout=-1 \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args index 48029791ce71..d7d4dd461f47 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot order=n,reboot-timeout=128 \ -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args index b19f0d9d5d94..8b57976acd27 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args index 421d03d80126..9cbe45b04301 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args index a5c35cc2a4a6..261c8429fbaf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server,\ +nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args index a5c35cc2a4a6..261c8429fbaf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,server,\ +nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args index 7d1a00548ac1..074db7ebb607 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args index 61d957e2e7b6..ec234893c181 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args index 559eb97c86d0..bca3a3bd446d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args index e3f6112c93cb..02adc23709fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args index 860994f3ef98..b0e7907c693b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args index 5ae9f0674421..30f6e68defdc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args index fb1fce4d372c..1dc50ff2a8a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args index f83d5fa09547..e27aae6bfe3e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index 23d5cc345a3e..e071b3f91ad9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args index 1e146218b7b7..9fea57f630ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args index 28dd4efed0bb..60969e444e15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args index 8041f0bfae65..246e854b963e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args index b415573c3700..4f23b43ece99 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args index ae564ab8acaf..89532176fa4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args index 40976dfce0be..84de29d2208a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args index 490a6ecdb134..982639ec11c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args index f8e3487a5326..ef8c89c937de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args index 4c9cf07ffd3d..236c2d12de3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args index 9d28dc6acada..057cf79a5402 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args index cf9bdebe5726..cd60b07f2016 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args index 98f10218d3a5..ec31a07f3798 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args index 5b09ad46c6d5..797f45fe12b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args index 37b1b813e844..807bed39818c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args index 3e652425b0e6..d3135c2d6e95 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args index 786f91133607..09ef26cacc25 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args index 3e652425b0e6..d3135c2d6e95 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args index e73ac2bcb486..b61850777399 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args index 4c022248d009..e0fcb49c6759 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index abdf3c8b5048..d32f0650c75c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -19,7 +19,7 @@ uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \ serial=CZC1065993,asset=CZC1065993,location=Upside down' \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args index 51750105822a..06fc81153551 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index ab6e0da1e17d..8d846a07dae4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index 46928d5c1b68..d7303103f9bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args index f33120f24621..4fdede1c984a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-TPM-VM/monitor.sock,server,nowait \ -boot c \ -usb \ -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args index a746d376d94f..8cfa37105d32 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args index 6fd058ccb67a..020f1590ac17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args index 716fe924c203..fa04c25aa960 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args index 593d4856e871..57019c154497 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args index 027d3381b577..b8de839ce33b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 4b29d62190fb..3e1d137ce09c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 5296f3822291..13ce78300ee6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 722087a29c0c..297a36f3961e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 af1e388867fd..6bf68fb58d92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args index 41cb5147f587..53b9040c7e88 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args index 3f8be5a8a114..cf7a952fc2eb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args index a8cb81a7a0f2..f191f354da30 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 e0de506bb12f..08e8f3e9a4ef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +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 3fdfbd6e7907..b2d14892afe9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 573bc9f81613..c85c550129ec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args index 96e3a58edbb3..e4c456f0ae5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args index 495d8075b042..cd893df0f4b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args index 55436dd824cf..cf096d7624e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args index 5d04de06f321..45bd1702dcfa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args index f4e966690aff..b1fa2e38c263 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args index 5a7e27ff6e56..6206dc0bf57f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args index 336a5decc27f..4a03a12256e1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args index 0e33345646c5..4b82419e0833 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args index ac3efc52632f..d1c7e24b1e37 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args index c15a35307d90..bd9fdc8005d3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args index 4be1ef5e4613..aceb04adc34f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args index 12dfdeb65c00..8f6e4fc8f8ab 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args index 3bc28bf5d88c..11430c939353 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,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 da31a746fce2..bf39fb11bf95 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 4ccd9c569090..505d8cc97b40 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args index b191c3e4f98b..2a3d19676368 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args index 223a951e3b65..d68b32a24a3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args index 6d136c5dd233..ba97c1e8ee5a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args index 265b61669cfd..efc63c003086 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args index 44a6a03efe51..b48c8264151b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args index 4dfda2da7185..dbc0929fa26e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args index e8c8fe00fe1d..0004807e79be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args index ab6b13a3a819..49bfc38c02c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ff12077c8e31..f843b16ce5f3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -266,6 +266,8 @@ static int testCompareXMLToArgvFiles(const char *xml, size_t i; virBitmapPtr nodeset = NULL; bool testFailed = false; + char *domainLibDir = NULL; + char *domainChannelTargetDir = NULL; if (!(conn = virGetConnect())) goto out; @@ -291,10 +293,14 @@ static int testCompareXMLToArgvFiles(const char *xml, vmdef->id = -1; + if (qemuDomainSetPrivatePaths(&domainLibDir, &domainChannelTargetDir, + "/tmp/lib", "/tmp/channel", + vmdef->name, vmdef->id) < 0) + goto out; + memset(&monitor_chr, 0, sizeof(monitor_chr)); - monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX; - monitor_chr.data.nix.path = (char *)"/tmp/test-monitor"; - monitor_chr.data.nix.listen = true; + if (qemuProcessPrepareMonitorChr(&monitor_chr, domainLibDir) < 0) + goto out; virQEMUCapsSetList(extraFlags, QEMU_CAPS_NO_ACPI, @@ -353,7 +359,8 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &testCallbacks, false, (flags & FLAG_FIPS), - nodeset, NULL, NULL))) + nodeset, NULL, NULL, + domainLibDir, domainChannelTargetDir))) testFailed = true; if (testFailed) { @@ -400,6 +407,8 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefFree(vmdef); virObjectUnref(conn); virBitmapFree(nodeset); + VIR_FREE(domainLibDir); + VIR_FREE(domainChannelTargetDir); return ret; } diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 80c80f663e30..77da37cba46e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -89,7 +89,9 @@ static const char testStatusXMLPrefix[] = " <device alias='net0'/>\n" " <device alias='usb'/>\n" " </devices>\n" -" <numad nodeset='0-2'/>\n"; +" <numad nodeset='0-2'/>\n" +" <libDir path='/tmp'/>\n" +" <channelTargetDir path='/tmp/channel'/>\n"; static const char testStatusXMLSuffix[] = "</domstatus>\n"; -- 2.7.2

2 2

[libvirt] Entering freeze for libvirt-1.3.2
by Daniel Veillard 27 Feb '16

27 Feb '16

So as planned I tagged the rc1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This seems to work for me with my minimal testing, but please give it a try especially for different architecture and systems. Next step would be to push rc2 on Friday and if all goes well push the final release on Monday or Tuesday next week. Please give it a try, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 00/14] Secret driver updates
by John Ferlan 26 Feb '16

26 Feb '16

This started as a 'simple' change to use virFileRewrite instead of replaceFile (as pointed out by jtomko in his reply to my review comments of the safewrite_str series:) http://www.redhat.com/archives/libvir-list/2016-February/msg01141.html However, as I was looking at the code I thought - well rather than using forward linked lists to store secrets, this code should use the "more normal" VIR_{APPEND|DELETE}_ELEMENT in order to manage the secret list. So I jumped into the rabbit hole and wound my way through the code to get it to a point where it'll look a whole lot like other drivers. FWIW: Not for *this* release, but hopefully the "next" release! John Ferlan (14): secret: Various formatting cleanups secret: Use virFileRewrite instead of replaceFile secret: Rename virSecretEntry secret: Remove local virSecretPtr 'secret' secret: Rename virSecretObjPtr 'entry' to 'secret' secret: Use 'secret' instead of 's' for variable name secret: Rename directory to configDir secret: Adjust logic to build file path in secretLoad secret: Create a 'configFile' in virSecretObj secret: Create a 'base64File' in virSecretObj secret: Introduce listUnlinkSecret secret: Introduce secretAssignDef secret: Rename loadSecrets secret: Introduce virSecretObjList src/secret/secret_driver.c | 640 ++++++++++++++++++++++----------------------- 1 file changed, 315 insertions(+), 325 deletions(-) -- 2.5.0

2 30

[libvirt] libvirt 1.2.9.3 - test for vircgrouptest fails
by Florian Hubold 26 Feb '16

26 Feb '16

Hi, one of the seems to fail on our build system, vircgrouptest fails with Unexpected: nodeGetCPUCount() yields: -1 The test runs fine locally. Here are the contents from testsuite.log with VIR_TEST_DEBUG=1 enabled. See tests/test-suite.log Please report to libvir-list(a)redhat.com ============================================================================ [...] + cat test-suite.log =========================================== libvirt 1.2.9.3: tests/test-suite.log =========================================== # TOTAL: 126 # PASS: 123 # SKIP: 2 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: vircgrouptest =================== TEST: vircgrouptest 1) New cgroup for self ... OK 2) New cgroup for partition ... libvirt: Cgroup error : At least one cgroup controller is required: No such device or address OK 3) New cgroup for partition nested ... libvirt: Cgroup error : Failed to create controller cpu for group: No such file or directory OK 4) New cgroup for partition nested deeply ... libvirt: Cgroup error : Failed to create controller cpu for group: No such file or directory OK 5) New cgroup for domain partition ... OK 6) New cgroup for domain partition escaped ... OK 7) Cgroup available ... OK 8) virCgroupGetBlkioIoServiced works ... OK 9) virCgroupGetBlkioIoDeviceServiced works ... OK 10) virCgroupGetMemoryUsage works ... OK 11) virCgroupGetPercpuStats works ... Unexpected: nodeGetCPUCount() yields: -1 libvirt: error : this function is not supported by the connection driver: host cpu counting not supported on this node FAILED 12) New cgroup for self (allinone) ... OK 13) Cgroup available ... OK 14) New cgroup for self (logind) ... OK 15) Cgroup available ... OK FAIL vircgrouptest (exit status: 1) [...] error: Bad exit status from /home/iurt/rpmbuild/tmp/rpm-tmp.7lQ0Fz (%check) Kind regards

3 7

[libvirt] [PATCH v2 0/7] NSS module for libvirt
by Michal Privoznik 26 Feb '16

26 Feb '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-February/msg00693.html diff to v1: - Rework to return multiple IPs instead of the first one found - Move the module into libvirt-nss rpm package - Fix linking (drop libvirt_util.la from LDADD) Michal Privoznik (7): Export virLease* functions for leases file handling virjson: Resolve const correctness Initial support for NSS plugin skeleton libvirt.spec.in: Introduce libvirt-nss package nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test cfg.mk | 2 +- configure.ac | 2 + libvirt.spec.in | 21 ++ m4/virt-nss.m4 | 51 +++++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 + src/network/leaseshelper.c | 271 +------------------------ src/util/virjson.c | 58 +++--- src/util/virjson.h | 54 ++--- src/util/virlease.c | 304 ++++++++++++++++++++++++++++ src/util/virlease.h | 44 ++++ tests/Makefile.am | 18 ++ tests/nssdata/virbr0.status | 14 ++ tests/nssmock.c | 140 +++++++++++++ tests/nsstest.c | 184 +++++++++++++++++ tools/Makefile.am | 44 ++++ tools/nss/libvirt_nss.c | 476 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 +++++ tools/nss/libvirt_nss.syms | 12 ++ 20 files changed, 1428 insertions(+), 327 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

2 12

[libvirt] [PATCH 0/7] Fix and enhance statistics of a completed job
by Jiri Denemark 26 Feb '16

26 Feb '16

Jiri Denemark (7): qemu: Store completed stats at the very end of migration qemu: Properly update completed migration stats qemu: Don't explicitly stop CPUs after migration qemu: Fix a race when computing migration downtime qemu: Do not report completed stats until the job finishes Introduce job completed event qemu: Add support for job completed event daemon/remote.c | 40 ++++++++++++++++++ include/libvirt/libvirt-domain.h | 26 ++++++++++++ src/conf/domain_event.c | 91 +++++++++++++++++++++++++++++++++++++++- src/conf/domain_event.h | 12 ++++++ src/libvirt-domain.c | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 25 +++++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_migration.c | 74 ++++++++++++++++++++------------ src/qemu/qemu_process.c | 20 ++++++--- src/remote/remote_driver.c | 43 +++++++++++++++++++ src/remote/remote_protocol.x | 15 ++++++- src/remote_protocol-structs | 10 +++++ tools/virsh-domain.c | 28 +++++++++++++ 15 files changed, 363 insertions(+), 35 deletions(-) -- 2.7.2

1 9

[libvirt] [PATCH 0/4] libxl: support qemu's network-based block backends
by Jim Fehlig 26 Feb '16

26 Feb '16

xl/libxl already supports qemu's network-based block backends such as nbd and rbd. libvirt has supported configuring network disks for long time too. This series marries the two in the libxl driver and in the xl<->xml converter. Only rbd supported is added in this series. Support for other backends such as nbd and iscsi can be added as a follow-up improvement. Patch 1 is super trivial and contains no functional changes. Patch 2 changes the xl disk configuration produced by the xml->xl converter to use the formal key=value syntax described in xl-disk-configuration.txt. Patch 3 adds support for converting rbd info between xl and xml config formats. Patch 4 adds support for rbd disks in the libxl driver. Jim Fehlig (4): xenconfig: replace text 'xm' with 'xl' in xlconfigtest xenconfig: produce key=value disk config syntax in xl formatter xenconfig: support xl<->xml conversion of rbd disk devices libxl: add support for rbd qdisk src/libxl/libxl_conf.c | 192 ++++++++++++++++++++- src/xenconfig/xen_xl.c | 168 ++++++++++++++++-- .../test-disk-positional-parms-full.cfg | 26 +++ .../test-disk-positional-parms-full.xml | 54 ++++++ .../test-disk-positional-parms-partial.cfg | 26 +++ .../test-disk-positional-parms-partial.xml | 54 ++++++ .../test-fullvirt-direct-kernel-boot.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-paravirt-cmdline.cfg | 2 +- tests/xlconfigdata/test-paravirt-maxvcpus.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 26 +++ tests/xlconfigdata/test-rbd-multihost-noauth.xml | 51 ++++++ tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigtest.c | 37 ++-- 17 files changed, 610 insertions(+), 40 deletions(-) create mode 100644 tests/xlconfigdata/test-disk-positional-parms-full.cfg create mode 100644 tests/xlconfigdata/test-disk-positional-parms-full.xml create mode 100644 tests/xlconfigdata/test-disk-positional-parms-partial.cfg create mode 100644 tests/xlconfigdata/test-disk-positional-parms-partial.xml create mode 100644 tests/xlconfigdata/test-rbd-multihost-noauth.cfg create mode 100644 tests/xlconfigdata/test-rbd-multihost-noauth.xml -- 2.6.1

3 10

[libvirt] [PATCH 0/5] Use virtlogd for chardevs & support logging
by Daniel P. Berrange 26 Feb '16

26 Feb '16

This series of patches does two things * Converts the type=file chardev over to use virtlogd (assuming use of virtlogd is enabled in qemu.conf) * Adds a <log file="..."/> element to all chardev sources, allowing data to be captured to a logfile Both of these are important features wanted by openstack. The first thing fixes a long standing security issue that a guest OS can trivially exhuast host disk space by outputing lots of data to its serial port. The second thing allows OpenStack to record boot up messages for a guest's serial console, while still allowing interactive serial console ussage. ie the serial port will be configured with type=tcp, and the new <log> element used to record the data. Both these thing required changes in QEMU, which have been merged for the forthcoming QEMU 2.6 release. Daniel P. Berrange (5): logging: allow inode/offset params to be NULL conf: allow use of a logfile with chardev backends qemu: add support for logging chardev output to a file qemu: use virtlogd for character device log files qemu: support use of virtlogd with file based chardevs docs/schemas/domaincommon.rng | 12 + src/conf/domain_conf.c | 28 ++ src/conf/domain_conf.h | 2 + src/logging/log_daemon_dispatch.c | 3 +- src/logging/log_handler.c | 6 +- src/logging/log_handler.h | 2 +- src/logging/log_manager.c | 6 +- src/logging/log_manager.h | 2 + src/logging/log_protocol.x | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 295 ++++++++++++++------- src/qemu/qemu_command.h | 7 +- src/qemu/qemu_domain.c | 6 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 4 +- .../qemuxml2argv-serial-file-log.args | 25 ++ .../qemuxml2argv-serial-file-log.xml | 39 +++ tests/qemuxml2argvtest.c | 4 +- 20 files changed, 350 insertions(+), 103 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.xml -- 2.5.0

2 12

[libvirt] [PATCH 0/9] fix thread related controllers in cgroups
by Henning Schild 26 Feb '16

26 Feb '16

This series picks up the cgroups work i started earlier. My initial patches got in and later reverted before 1.3.1. The problem the series is solving is about qemu-threads becoming runnable on pcpus outside the pinning masks configured for the machine. That only happens for a short time before the thread is moved to its final cpuset. But it can disturb other load on the system or can lead to qemu never starting. (qemu main thread ends up on a pcpu with busy high prio rt-task). The problem in the original series was the lack of understanding that one virCgroup can cover all controllers. Instead of just touching cpusets the patches had side effects on all the other controllers (memory, blkio etc.) Again the general idea is to put all threads right into the correct cgroups and to not move them around. But this series touches only the cpu, cpuset, and cpuacct controllers. That are the ones relevant to threads and that are the controllers the threading sub-groups have mounted. Patches 1, 2, and 9 deal with asserting correct behaviour. They are optional. But given the complexity of the "bringup" and the importance of getting that right, i think they should go in as well! The tricky bits are in patches 5 and 8, i kept them as simple as possible. The series is based on v1.3.1. Henning Schild (9): vircgroup: one central point for adding tasks to cgroups vircgroup: add assertion to allow cgroup controllers to stay empty vircgroup: introduce controller mask for threads util: cgroups do not implicitly add task to new machine cgroup qemu_cgroup: put qemu right into emulator sub-cgroup qemu_cgroup: use virCgroupAddTask instead of virCgroupMoveTask vircgroup: add controller mask to virCgroupAddTask qemu_cgroup: dont put qemu main thread into wrong cgroup qemu_cgroup: assert threading cgroup layout for machine cgroup src/libvirt_private.syms | 3 +- src/lxc/lxc_cgroup.c | 11 ++++ src/lxc/lxc_controller.c | 4 +- src/qemu/qemu_cgroup.c | 30 +++++++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 8 +-- src/util/vircgroup.c | 155 ++++++++--------------------------------------- src/util/vircgroup.h | 13 +++- src/util/vircgrouppriv.h | 1 + 9 files changed, 81 insertions(+), 146 deletions(-) -- 2.4.10

4 45

[libvirt] [PATCH 0/2] Fix some issues in storage driver error paths
by John Ferlan 26 Feb '16

26 Feb '16

While working through the pool driver, I found a couple of issues in error paths for the storage driver. John Ferlan (2): storage: Fix error path in virStoragePoolObjLoad storage: Fix error path in storagePoolDefineXML src/conf/storage_conf.c | 4 ++-- src/storage/storage_driver.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.5.0

2 3

[libvirt] [PATCH] docs: formatdomain: Document "spice" as a valid value for <graphics type=..>
by Richard W.M. Jones 26 Feb '16

26 Feb '16

Trivial documentation fix. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- docs/formatdomain.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a524c17..5016772 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4891,7 +4891,8 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>graphics</code></dt> <dd>The <code>graphics</code> element has a mandatory <code>type</code> - attribute which takes the value "sdl", "vnc", "rdp" or "desktop": + attribute which takes the value "sdl", "vnc", "spice", "rdp" or + "desktop": <dl> <dt><code>"sdl"</code></dt> <dd> -- 2.5.0

2 3

[libvirt] [PATCHv2 0/5] Fix machine type parsing regressions
by Ján Tomko 25 Feb '16

25 Feb '16

Patch 2/5 is the important one, fixing persistent non-QEMU domains. Ján Tomko (5): testCompareDomXML2XMLFiles: add parseFlags parameter Revert "Error out on missing machine type in machine configs" tests: add a test for persistent LXC XML parsing tests: add parseFlags to qemuxml2argvtest qemu: error out on missing machine type in configs src/conf/domain_conf.c | 6 --- src/qemu/qemu_domain.c | 6 +++ tests/bhyvexml2xmltest.c | 2 +- tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 14 ++++--- .../qemuxml2argv-missing-machine.xml | 30 +++++++++++++++ tests/qemuxml2argvtest.c | 43 ++++++++++++++-------- tests/qemuxml2xmltest.c | 4 +- tests/testutils.c | 5 ++- tests/testutils.h | 3 +- 10 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-missing-machine.xml -- 2.4.10

3 7

[libvirt] [PATCH] virfile: properly detect NFS storage
by Pavel Hrdina 25 Feb '16

25 Feb '16

Commit 35847860 introduced virFileUnlink() to fix an issue with deleting volumes on NFS root-squashed environment. This patch replace the uid and gid magic by virFileIsSharedFSType() to correctly detect that the volume is on NFS storage. This fixes the referenced bug. To reproduce this bug follow those steps on a domain with local storage: virsh start $domain virsh pool-refresh $pool virsh destroy $domain virsh vol-delete $volume $pool The thing is, that the pool-refresh will store qemu:qemu as uid:gid for that volume and after destroy the volume is relabeled back to root:root. Then you run vol-delete and the virFileRemove() function will try to unlink the file as a qemu:qemu process based on the uid and gid magic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1260356 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virfile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index f45e18f..f9c5bb1 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2334,13 +2334,16 @@ virFileRemove(const char *path, int status = 0, ret = 0; gid_t *groups; int ngroups; + int rc; /* If not running as root or if a non explicit uid/gid was being used for * the file/volume or the explicit uid/gid matches, then use unlink directly */ - if ((geteuid() != 0) || - ((uid == (uid_t) -1) && (gid == (gid_t) -1)) || - (uid == geteuid() && gid == getegid())) { + rc = virFileIsSharedFSType(path, VIR_FILE_SHFS_NFS); + if (rc < 0) + return -EINVAL; + + if (rc == 0) { if (virFileIsDir(path)) return rmdir(path); else -- 2.7.1

3 3