qemu_command: move sasl parameter after port and addr definition

This is required for following patches where new listen types will be
introduced.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c35d2966ecd74c22bc28351581398e04137cbdd6..27e8c7690982e323cad2a722047bccef2e4a7cbc 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7540,16 +7540,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
         virBufferAsprintf(&opt, "tls-port=%u,", tlsPort);
     }
 
-    if (cfg->spiceSASL) {
-        virBufferAddLit(&opt, "sasl,");
-
-        if (cfg->spiceSASLdir)
-            virCommandAddEnvPair(cmd, "SASL_CONF_PATH",
-                                 cfg->spiceSASLdir);
-
-        /* TODO: Support ACLs later */
-    }
-
     if (port > 0 || tlsPort > 0) {
         if ((glisten = virDomainGraphicsGetListen(graphics, 0))) {
 
@@ -7593,6 +7583,16 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
         VIR_FREE(netAddr);
     }
 
+    if (cfg->spiceSASL) {
+        virBufferAddLit(&opt, "sasl,");
+
+        if (cfg->spiceSASLdir)
+            virCommandAddEnvPair(cmd, "SASL_CONF_PATH",
+                                 cfg->spiceSASLdir);
+
+        /* TODO: Support ACLs later */
+    }
+
     if (graphics->data.spice.mousemode) {
         switch (graphics->data.spice.mousemode) {
         case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER:

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
index e21d69923363ecf89ce97dfd46c48c9166381115..bf9045fffff1a146b423a72676b7a7c1686ed771 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=spice \
 -usb \
 -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 \
--spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\
+-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\
 x509-dir=/etc/pki/libvirt-spice,tls-channel=default \
 -vga qxl \
 -global qxl-vga.ram_size=67108864 \