qemu: Shorten per-domain directory names

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@redhat.com>

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",
+                                "%s/%s", domainChannelTargetDir,
-                                cfg->channelTargetDir, def->name,
                                 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;
     }
 

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)
+                                   int **nicindexes,
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(10);
+                                   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

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 cleanup;
+
+    if (!priv->channelTargetDir &&
+        virAsprintf(&priv->channelTargetDir, "%s/domain-%s",
+                    cfg->channelTargetDir, vm->def->name) < 0)
+        goto cleanup;
+
+    ret = 0;
+ cleanup:
+    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:

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__ */

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;
 }
 

src/qemu/qemu_process.c

@@ -2855,15 +2855,14 @@ static int qemuProcessHook(void *data)
 }
 
 int
-qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg,
+qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
-                             virDomainChrSourceDefPtr monConfig,
+                             const char *domainDir)
-                             const char *vm)
 {
     monConfig->type = VIR_DOMAIN_CHR_TYPE_UNIX;
     monConfig->data.nix.listen = true;
 
-    if (virAsprintf(&monConfig->data.nix.path, "%s/domain-%s/monitor.sock",
+    if (virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock",
-                    cfg->libDir, vm) < 0)
+                    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 ||
+    if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 ||
-        qemuProcessMakeDir(driver, vm, cfg->channelTargetDir) < 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",
+    virFileDeleteTree(priv->libDir);
-                             cfg->libDir, vm->def->name));
+    virFileDeleteTree(priv->channelTargetDir);
-    virFileDeleteTree(tmppath);
-    VIR_FREE(tmppath);
-
-    ignore_value(virAsprintf(&tmppath, "%s/domain-%s",
-                             cfg->channelTargetDir, vm->def->name));
-    virFileDeleteTree(tmppath);
-    VIR_FREE(tmppath);
 
     ignore_value(virDomainChrDefForeach(vm->def,
                                         false,

src/qemu/qemu_process.h

@@ -25,9 +25,8 @@
 # include "qemu_conf.h"
 # include "qemu_domain.h"
 
-int qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg,
+int qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
-                                 virDomainChrSourceDefPtr monConfig,
+                                 const char *domainDir);
-                                 const char *vm);
 
 int qemuProcessStartCPUs(virQEMUDriverPtr driver,
                          virDomainObjPtr vm,

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 \

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 \

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

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

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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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,\
+-chardev socket,id=charchannel1,\
-nowait \
+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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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

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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \