[PATCH 05/17] qemuMonitorJSONGraphicsRelocate: Clean up command argument construction
Move the construction of the command from the variable declaration so
that it doesn't exceed the line length and we can also move the logic of
determining the protocol outside of the command construction.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor_json.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 82631e30e0..7cb6795a58 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3590,17 +3590,20 @@ int qemuMonitorJSONGraphicsRelocate(qemuMonitor *mon,
int tlsPort,
const char *tlsSubject)
{
- g_autoptr(virJSONValue) cmd =
qemuMonitorJSONMakeCommand("client_migrate_info",
- "s:protocol",
- (type ==
VIR_DOMAIN_GRAPHICS_TYPE_SPICE ? "spice" : "vnc"),
- "s:hostname",
hostname,
- "i:port", port,
- "i:tls-port",
tlsPort,
- "S:cert-subject",
tlsSubject,
- NULL);
+ const char *protocol = "vnc";
+ g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL;
- if (!cmd)
+ if (type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE)
+ protocol = "spice";
+
+ if (!(cmd = qemuMonitorJSONMakeCommand("client_migrate_info",
+ "s:protocol", protocol,
+ "s:hostname", hostname,
+ "i:port", port,
+ "i:tls-port", tlsPort,
+ "S:cert-subject", tlsSubject,
+ NULL)))
return -1;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
--
2.31.1