qemu: Clear 'qemuFDPass' helpers of char devices when no longer needed

While the FDs are closed right after use to prevent leaks, at certain
point we don't need the whole helper any more. Clear them for char
devices after hotplug and on start.

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

src/qemu/qemu_command.c

@@ -1547,6 +1547,8 @@ qemuBuildChardevCommand(virCommand *cmd,
 
     virCommandAddArgList(cmd, "-chardev", charstr, NULL);
 
+    qemuDomainChrSourcePrivateClearFDPass(chrSourcePriv);
+
     return 0;
 }
 

src/qemu/qemu_domain.c

@@ -908,13 +908,23 @@ qemuDomainChrSourcePrivateNew(void)
 }
 
 
+void
+qemuDomainChrSourcePrivateClearFDPass(qemuDomainChrSourcePrivate *priv)
+{
+    if (!priv)
+        return;
+
+    g_clear_pointer(&priv->sourcefd, qemuFDPassFree);
+    g_clear_pointer(&priv->logfd, qemuFDPassFree);
+}
+
+
 static void
 qemuDomainChrSourcePrivateDispose(void *obj)
 {
     qemuDomainChrSourcePrivate *priv = obj;
 
-    qemuFDPassFree(priv->sourcefd);
-    qemuFDPassFree(priv->logfd);
+    qemuDomainChrSourcePrivateClearFDPass(priv);
 
     g_free(priv->tlsCertPath);
 

src/qemu/qemu_domain.h

@@ -359,6 +359,9 @@ struct _qemuDomainChrSourcePrivate {
 };
 
 
+void
+qemuDomainChrSourcePrivateClearFDPass(qemuDomainChrSourcePrivate *priv);
+
 typedef struct _qemuDomainVsockPrivate qemuDomainVsockPrivate;
 struct _qemuDomainVsockPrivate {
     virObject parent;

src/qemu/qemu_hotplug.c

@@ -2293,6 +2293,9 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
         if (teardowndevice && qemuDomainNamespaceTeardownChardev(vm, chr) < 0)
             VIR_WARN("Unable to remove chr device from /dev");
     }
+
+    qemuDomainChrSourcePrivateClearFDPass(charpriv);
+
     return ret;
 
  exit_monitor: