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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 18156a4fe4988e9bfa49285d9ae8dfa19b5da5b8..4896f0b3175d38f0ac67a8f976bed47634525d52 100644 (file)
--- 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)