File libxl-f3f778c81769075ac0eb93b98d4b2803e7936453.patch of Package xen.26659
From: Anthony PERARD <anthony.perard@citrix.com>
Date: Tue, 11 May 2021 10:28:04 +0100
Subject: libxl f3f778c81769075ac0eb93b98d4b2803e7936453
References: bsc#1180350
libxl: Replace QEMU's command line short-form boolean option
Short-form boolean options are deprecated in QEMU 6.0.
Upstream commit that deprecate those: ccd3b3b8112b ("qemu-option: warn
for short-form boolean options").
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
---
tools/libxl/libxl_dm.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -962,14 +962,14 @@ static char *dm_spice_options(libxl__gc
if (spice->host)
opt = GCSPRINTF("%s,addr=%s", opt, spice->host);
if (libxl_defbool_val(spice->disable_ticketing))
- opt = GCSPRINTF("%s,disable-ticketing", opt);
+ opt = GCSPRINTF("%s,disable-ticketing=on", opt);
else
opt = GCSPRINTF("%s,password=%s", opt, spice->passwd);
opt = GCSPRINTF("%s,agent-mouse=%s", opt,
libxl_defbool_val(spice->agent_mouse) ? "on" : "off");
if (!libxl_defbool_val(spice->clipboard_sharing))
- opt = GCSPRINTF("%s,disable-copy-paste", opt);
+ opt = GCSPRINTF("%s,disable-copy-paste=on", opt);
if (spice->image_compression)
opt = GCSPRINTF("%s,image-compression=%s", opt,
@@ -1209,7 +1209,7 @@ static int libxl__build_device_model_arg
flexarray_append(dm_args, "-chardev");
if (state->dm_monitor_fd >= 0) {
flexarray_append(dm_args,
- GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait",
+ GCSPRINTF("socket,id=libxl-cmd,fd=%d,server=on,wait=off",
state->dm_monitor_fd));
/*
@@ -1222,7 +1222,7 @@ static int libxl__build_device_model_arg
} else {
flexarray_append(dm_args,
GCSPRINTF("socket,id=libxl-cmd,"
- "path=%s,server,nowait",
+ "path=%s,server=on,wait=off",
libxl__qemu_qmp_path(gc, guest_domid)));
}
@@ -1232,7 +1232,7 @@ static int libxl__build_device_model_arg
flexarray_append(dm_args, "-chardev");
flexarray_append(dm_args,
GCSPRINTF("socket,id=libxenstat-cmd,"
- "path=%s/qmp-libxenstat-%d,server,nowait",
+ "path=%s/qmp-libxenstat-%d,server=on,wait=off",
libxl__run_dir_path(), guest_domid));
flexarray_append(dm_args, "-mon");
@@ -1249,7 +1249,7 @@ static int libxl__build_device_model_arg
case LIBXL_CHANNEL_CONNECTION_SOCKET:
path = guest_config->channels[i].u.socket.path;
chardev = GCSPRINTF("socket,id=libxl-channel%d,path=%s,"
- "server,nowait", devid, path);
+ "server=on,wait=off", devid, path);
break;
default:
/* We've forgotten to add the clause */
@@ -1560,7 +1560,7 @@ static int libxl__build_device_model_arg
nics[i].colo_##sock_port) { \
flexarray_append(dm_args, "-chardev"); \
flexarray_append(dm_args, \
- GCSPRINTF("socket,id=%s,host=%s,port=%s,server,nowait", \
+ GCSPRINTF("socket,id=%s,host=%s,port=%s,server=on,wait=off", \
nics[i].colo_##sock_id, \
nics[i].colo_##sock_ip, \
nics[i].colo_##sock_port)); \