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: do not set wait:false for client sockets

Browse Source 
Qemu commit 767abe7 ("chardev: forbid 'wait' option with client
sockets") effectively deprecates usage of "wait" with client sockets
starting with qemu 4.0, and earlier versions ignored the value.

Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-04-15 18:51:48 +02:00 committed by Ján Tomko
parent 70d60b811f
commit ad32d76165
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_monitor_json.c
View File

@ -6922,8 +6922,11 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID,
telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET;
if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || if (chr->data.tcp.listen &&
virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 || virJSONValueObjectAppendBoolean(data, "wait", false) < 0)
goto cleanup;
if (virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 ||
virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0) virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0)
goto cleanup; goto cleanup;
if (chr->data.tcp.tlscreds) { if (chr->data.tcp.tlscreds) {
@ -6973,8 +6976,11 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID,
goto cleanup; goto cleanup;
addr = NULL; addr = NULL;
if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || if (chr->data.nix.listen &&
virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) virJSONValueObjectAppendBoolean(data, "wait", false) < 0)
goto cleanup;
if (virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0)
goto cleanup; goto cleanup;
if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.nix.reconnect) < 0) if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.nix.reconnect) < 0)

2
tests/qemumonitorjsontest.c
View File

@ -874,7 +874,6 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt)
"'data':{'addr':{'type':'inet'," "'data':{'addr':{'type':'inet',"
"'data':{'host':'example.com'," "'data':{'host':'example.com',"
"'port':'1234'}}," "'port':'1234'}},"
"'wait':false,"
"'telnet':false," "'telnet':false,"
"'server':false}}}"); "'server':false}}}");
@ -920,7 +919,6 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt)
"'backend':{'type':'socket'," "'backend':{'type':'socket',"
"'data':{'addr':{'type':'unix'," "'data':{'addr':{'type':'unix',"
"'data':{'path':'/path/to/socket'}}," "'data':{'path':'/path/to/socket'}},"
"'wait':false,"
"'server':false}}}"); "'server':false}}}");
chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_SPICEVMC }; chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_SPICEVMC };