NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: use long on|off syntax for -spice boolean option values

Browse Source 
The preferred syntax for boolean options is to set the value "on" or
"off". QEMU 7.1.0 will deprecate the short format we currently use.

The long format has been supported with -spice since at least 1.5.3,
so we don't need to check for it.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-16 11:29:24 +00:00
parent 43c9c0859f
commit 67f8ccb4e2
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -7765,7 +7765,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
} }
if (cfg->spiceSASL) { if (cfg->spiceSASL) {
virBufferAddLit(&opt, "sasl,"); virBufferAddLit(&opt, "sasl=on,");
if (cfg->spiceSASLdir) if (cfg->spiceSASLdir)
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", virCommandAddEnvPair(cmd, "SASL_CONF_PATH",
@ -7797,7 +7797,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
* in this bit of the code */ * in this bit of the code */
if (!graphics->data.spice.auth.passwd && if (!graphics->data.spice.auth.passwd &&
!cfg->spicePassword) !cfg->spicePassword)
virBufferAddLit(&opt, "disable-ticketing,"); virBufferAddLit(&opt, "disable-ticketing=on,");
if (hasSecure) { if (hasSecure) {
virBufferAddLit(&opt, "x509-dir="); virBufferAddLit(&opt, "x509-dir=");
@ -7879,10 +7879,10 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, "streaming-video=%s,", virBufferAsprintf(&opt, "streaming-video=%s,",
virDomainGraphicsSpiceStreamingModeTypeToString(graphics->data.spice.streaming)); virDomainGraphicsSpiceStreamingModeTypeToString(graphics->data.spice.streaming));
if (graphics->data.spice.copypaste == VIR_TRISTATE_BOOL_NO) if (graphics->data.spice.copypaste == VIR_TRISTATE_BOOL_NO)
virBufferAddLit(&opt, "disable-copy-paste,"); virBufferAddLit(&opt, "disable-copy-paste=on,");
if (graphics->data.spice.filetransfer == VIR_TRISTATE_BOOL_NO) if (graphics->data.spice.filetransfer == VIR_TRISTATE_BOOL_NO)
virBufferAddLit(&opt, "disable-agent-file-xfer,"); virBufferAddLit(&opt, "disable-agent-file-xfer=on,");
if (graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES) { if (graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES) {
/* spice.gl is a TristateBool, but qemu expects on/off: use /* spice.gl is a TristateBool, but qemu expects on/off: use

2
tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
View File

@ -27,7 +27,7 @@ server=on,wait=off \
-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-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer,\ tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,\
seamless-migration=on \ seamless-migration=on \
-vga qxl \ -vga qxl \
-global qxl-vga.ram_size=67108864 \ -global qxl-vga.ram_size=67108864 \

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

@ -27,7 +27,7 @@ server=on,wait=off \
-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-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ -spice port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,\
x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \ x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \
-vga qxl \ -vga qxl \
-global qxl-vga.ram_size=67108864 \ -global qxl-vga.ram_size=67108864 \

2
tests/qemuxml2argvdata/graphics-spice-usb-redir.args
View File

@ -32,7 +32,7 @@ addr=0x4 \
tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,\ tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,\
image-compression=auto_glz,jpeg-wan-compression=auto,\ image-compression=auto_glz,jpeg-wan-compression=auto,\
zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\
disable-copy-paste,seamless-migration=on \ disable-copy-paste=on,seamless-migration=on \
-vga cirrus \ -vga cirrus \
-chardev socket,id=charredir0,host=localhost,port=4000 \ -chardev socket,id=charredir0,host=localhost,port=4000 \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \ -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \

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

@ -30,7 +30,7 @@ server=on,wait=off \
tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ tls-channel=default,tls-channel=main,plaintext-channel=inputs,\
image-compression=auto_glz,jpeg-wan-compression=auto,\ image-compression=auto_glz,jpeg-wan-compression=auto,\
zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\
disable-copy-paste,disable-agent-file-xfer,seamless-migration=on \ disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on \
-vga qxl \ -vga qxl \
-global qxl-vga.ram_size=67108864 \ -global qxl-vga.ram_size=67108864 \
-global qxl-vga.vram_size=33554432 \ -global qxl-vga.vram_size=33554432 \