qemu: passt: split out qemuPasstBuildCommand

Separate the command line building to make it testable.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c
index 81e5c51f6c03fffd4d79e639d09cf0b6ecc8c495..fcec2ed76bc2f2c794a324baf81badf9f65c5f38 100644 (file)
--- a/src/qemu/qemu_passt.c
+++ b/src/qemu/qemu_passt.c
@@ -194,15 +194,15 @@ qemuPasstPrepareVhostUser(virDomainObj *vm,
     net->data.vhostuser->data.nix.reconnect.timeout = QEMU_PASST_RECONNECT_TIMEOUT;
 }
 
-int
-qemuPasstStart(virDomainObj *vm,
-               virDomainNetDef *net)
+virCommand *
+qemuPasstBuildCommand(char **socketName,
+                      char **pidfileRet,
+                      virDomainObj *vm,
+                      virDomainNetDef *net)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-    virQEMUDriver *driver = priv->driver;
     g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net);
-    g_autoptr(virCommand) cmd = NULL;
     g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net);
+    g_autoptr(virCommand) cmd = NULL;
     size_t i;
 
     cmd = virCommandNew(PASST);
@@ -244,7 +244,7 @@ qemuPasstStart(virDomainObj *vm,
          * a single IPv4 and single IPv6 address
          */
         if (!(addr = virSocketAddrFormat(&ip->address)))
-            return -1;
+            return NULL;
 
         virCommandAddArgList(cmd, "--address", addr, NULL);
 
@@ -272,14 +272,14 @@ qemuPasstStart(virDomainObj *vm,
             /* validation guarantees this will never happen */
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Invalid portForward proto value %1$u"), pf->proto);
-            return -1;
+            return NULL;
         }
 
         if (VIR_SOCKET_ADDR_VALID(&pf->address)) {
             g_autofree char *addr = NULL;
 
             if (!(addr = virSocketAddrFormat(&pf->address)))
-                return -1;
+                return NULL;
 
             virBufferAddStr(&buf, addr);
             emitsep = true;
@@ -323,6 +323,26 @@ qemuPasstStart(virDomainObj *vm,
         virCommandAddArg(cmd, virBufferCurrentContent(&buf));
     }
 
+    if (socketName)
+        *socketName = g_steal_pointer(&passtSocketName);
+    if (pidfileRet)
+        *pidfileRet = g_steal_pointer(&pidfile);
+
+    return g_steal_pointer(&cmd);
+}
+
+int
+qemuPasstStart(virDomainObj *vm,
+               virDomainNetDef *net)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    g_autofree char *passtSocketName = NULL;
+    g_autofree char *pidfile = NULL;
+    virQEMUDriver *driver = priv->driver;
+    g_autoptr(virCommand) cmd = NULL;
+
+    if (!(cmd = qemuPasstBuildCommand(&passtSocketName, &pidfile, vm, net)))
+        return -1;
 
     if (qemuExtDeviceLogCommand(driver, vm, cmd, "passt") < 0)
         return -1;

diff --git a/src/qemu/qemu_passt.h b/src/qemu/qemu_passt.h
index ea545ccf38ecb48839bff7435031983bf2fbcfb5..e16d4c1119b088266844b2f6e6c343487723418a 100644 (file)
--- a/src/qemu/qemu_passt.h
+++ b/src/qemu/qemu_passt.h
@@ -27,6 +27,11 @@ qemuPasstAddNetProps(virDomainObj *vm,
                      virDomainNetDef *net,
                      virJSONValue **netprops);
 
+virCommand *qemuPasstBuildCommand(char **socketName,
+                                  char **pidfileRet,
+                                  virDomainObj *vm,
+                                  virDomainNetDef *net);
+
 int qemuPasstStart(virDomainObj *vm,
                    virDomainNetDef *net);