提交 858d7b6c 编写于 作者: P Pavel Hrdina

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: NPavel Hrdina <phrdina@redhat.com>
上级 54820cc6
...@@ -7540,16 +7540,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, ...@@ -7540,16 +7540,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, "tls-port=%u,", tlsPort); 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 (port > 0 || tlsPort > 0) {
if ((glisten = virDomainGraphicsGetListen(graphics, 0))) { if ((glisten = virDomainGraphicsGetListen(graphics, 0))) {
...@@ -7593,6 +7583,16 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, ...@@ -7593,6 +7583,16 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
VIR_FREE(netAddr); 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) { if (graphics->data.spice.mousemode) {
switch (graphics->data.spice.mousemode) { switch (graphics->data.spice.mousemode) {
case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER: case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER:
......
...@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=spice \ ...@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=spice \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -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 \ -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 \ x509-dir=/etc/pki/libvirt-spice,tls-channel=default \
-vga qxl \ -vga qxl \
-global qxl-vga.ram_size=67108864 \ -global qxl-vga.ram_size=67108864 \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册