]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_slirp: Don't set errfd when starting slirp helper
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 20 Feb 2023 09:49:34 +0000 (10:49 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 3 Mar 2023 10:48:54 +0000 (11:48 +0100)
Way back, in v6.2.0-rc1~67 we removed the code that reads slirp's
stderr on failed startup. However, we forgot to remove
corresponding virCommandSetErrorFD() call and variable
declaration. Do that now.

While this may seem like a step in wrong direction (we should be
reading stderr as it may contain reason for failed start), this
is going to be handled in more general way in next commits.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_slirp.c

index 3f83db03bf16b0574aaef06bd53b86600215046a..faf58b03944c97d87522471645bfb66751a8804f 100644 (file)
@@ -249,7 +249,6 @@ qemuSlirpStart(virDomainObj *vm,
     int rc;
     int exitstatus = 0;
     int cmdret = 0;
-    VIR_AUTOCLOSE errfd = -1;
     bool killDBusDaemon = false;
     g_autofree char *fdname = g_strdup_printf("slirpfd-%s", net->info.alias);
 
@@ -272,7 +271,6 @@ qemuSlirpStart(virDomainObj *vm,
 
     virCommandClearCaps(cmd);
     virCommandSetPidFile(cmd, pidfile);
-    virCommandSetErrorFD(cmd, &errfd);
     virCommandDaemonize(cmd);
 
     virCommandAddArgFormat(cmd, "--fd=%d", slirp->fd[1]);