From 0dde16be73fa84c13ce777b43f695284a2e231ca Mon Sep 17 00:00:00 2001 From: ZhiPeng Lu Date: Wed, 13 Sep 2017 08:33:40 +0800 Subject: [PATCH] qemu: handle reconnect on chardev hotplug The patch passes the reconnect timeout to QEMU by monitor on chardev hotplug. Signed-off-by: ZhiPeng Lu Signed-off-by: Michal Privoznik --- src/qemu/qemu_monitor_json.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0fc5d21222..63b855920b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6441,6 +6441,16 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, return qemuMonitorJSONGetStringArray(mon, "query-tpm-types", tpmtypes); } +static int +qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, + const virDomainChrSourceReconnectDef *def) +{ + if (def->enabled != VIR_TRISTATE_BOOL_YES) + return 0; + + return virJSONValueObjectAppendNumberUint(object, "reconnect", def->timeout); +} + static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) @@ -6505,6 +6515,9 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto cleanup; } + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.tcp.reconnect) < 0) + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_UDP: @@ -6542,6 +6555,9 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) goto cleanup; + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.nix.reconnect) < 0) + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: