From 0634d640d679835489a6848131ce80120a10c02b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 20 Feb 2023 10:49:34 +0100 Subject: [PATCH] qemu_slirp: Don't set errfd when starting slirp helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- src/qemu/qemu_slirp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 3f83db03bf..faf58b0394 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -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]);