External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_command: move sasl parameter after port and addr definition

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-05-18 09:23:22 +02:00
parent 54820cc600
commit 858d7b6cf0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_command.c
View File

@ -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:

2
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
View File

@ -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 \