qemu: Convert passing of 'slirpfd' to 'qemuFDPassDirect'

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c2f3061e57be7cc5be8424e41caf3b97388f8dd4..64d3c1386e7a198d16b19bdbe5cde585b6b866fc 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4289,7 +4289,7 @@ qemuBuildHostNetProps(virDomainNetDef *net)
         if (netpriv->slirpfd) {
             if (virJSONValueObjectAdd(&netprops,
                                       "s:type", "socket",
-                                      "s:fd", qemuFDPassGetPath(netpriv->slirpfd),
+                                      "s:fd", qemuFDPassDirectGetPath(netpriv->slirpfd),
                                       NULL) < 0)
                 return NULL;
         } else {
@@ -8884,8 +8884,9 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
     for (n = netpriv->vhostfds; n; n = n->next)
         qemuFDPassDirectTransferCommand(n->data, cmd);
 
-    if (qemuFDPassTransferCommand(netpriv->slirpfd, cmd) < 0 ||
-        qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0)
+    qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd);
+
+    if (qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0)
         return -1;
 
     if (!(hostnetprops = qemuBuildHostNetProps(net)))

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f83ee55246281fadc7b5ba01cb51e74934863a44..c957b5296a84d80dd6d7a3f3af76a37c1fe82f26 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1051,7 +1051,7 @@ qemuDomainNetworkPrivateClearFDs(qemuDomainNetworkPrivate *priv)
     if (!priv)
         return;
 
-    g_clear_pointer(&priv->slirpfd, qemuFDPassFree);
+    g_clear_pointer(&priv->slirpfd, qemuFDPassDirectFree);
     g_clear_pointer(&priv->vdpafd, qemuFDPassFree);
     g_slist_free_full(g_steal_pointer(&priv->vhostfds), (GDestroyNotify) qemuFDPassDirectFree);
     g_slist_free_full(g_steal_pointer(&priv->tapfds), (GDestroyNotify) qemuFDPassDirectFree);

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 521df8ca010cb3398ff54e1d8a6ed8c05faec277..1547dec668c28b24c197430c40021382388df325 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -403,7 +403,7 @@ struct _qemuDomainNetworkPrivate {
     qemuSlirp *slirp;
 
     /* file descriptor transfer helpers */
-    qemuFDPass *slirpfd;
+    qemuFDPassDirect *slirpfd;
     GSList *tapfds; /* qemuFDPassDirect */
     GSList *vhostfds; /* qemuFDPassDirect */
     qemuFDPass *vdpafd;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 251f3df0a116eae480a5babd858df552055456df..457ca00789754fc99770f66fcdb7d2c89d1ab84c 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1386,7 +1386,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
         }
     }
 
-    if (qemuFDPassTransferMonitor(netpriv->slirpfd, priv->mon) < 0 ||
+    if (qemuFDPassDirectTransferMonitor(netpriv->slirpfd, priv->mon) < 0 ||
         qemuFDPassTransferMonitor(netpriv->vdpafd, priv->mon) < 0) {
         qemuDomainObjExitMonitor(vm);
         goto cleanup;

diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c
index 618947b6c10f8f7a8b436a12aa4c5a0cace70628..772ea582c561ede4c523addfadcc6d418fb829b6 100644 (file)
--- a/src/qemu/qemu_slirp.c
+++ b/src/qemu/qemu_slirp.c
@@ -352,9 +352,7 @@ qemuSlirpStart(virDomainObj *vm,
 
     slirp->pid = pid;
 
-    netpriv->slirpfd = qemuFDPassNewDirect(fdname, priv);
-
-    qemuFDPassAddFD(netpriv->slirpfd, &slirp->fd[0], NULL);
+    netpriv->slirpfd = qemuFDPassDirectNew(fdname, &slirp->fd[0]);
 
     return 0;