From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDWPT-0003p2-GQ for qemu-devel@nongnu.org; Thu, 16 Jun 2016 08:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDWPO-0001KA-9b for qemu-devel@nongnu.org; Thu, 16 Jun 2016 08:28:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDWPO-0001Jq-1D for qemu-devel@nongnu.org; Thu, 16 Jun 2016 08:28:30 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8BC4627FA for ; Thu, 16 Jun 2016 12:28:29 +0000 (UTC) References: <1466075835-28494-1-git-send-email-marcandre.lureau@redhat.com> <1466075835-28494-4-git-send-email-marcandre.lureau@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 16 Jun 2016 14:28:25 +0200 MIME-Version: 1.0 In-Reply-To: <1466075835-28494-4-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 3/3] socket: unlink unix socket on remove List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org On 16/06/2016 13:17, marcandre.lureau@redhat.com wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > qemu leaves unix socket files behind when removing a listening chardev > or leaving. qemu could clean that up, even if doing so isn't race-free. >=20 > Fixes: > https://bugzilla.redhat.com/show_bug.cgi?id=3D1347077 >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > include/qemu/sockets.h | 1 + > io/channel-socket.c | 10 ++++++++++ > tests/test-io-channel-socket.c | 2 +- > util/qemu-sockets.c | 18 ++++++++++++++++++ > 4 files changed, 30 insertions(+), 1 deletion(-) >=20 > diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h > index 1bd9218..5dd2648 100644 > --- a/include/qemu/sockets.h > +++ b/include/qemu/sockets.h > @@ -51,6 +51,7 @@ SocketAddress *socket_parse(const char *str, Error **= errp); > int socket_connect(SocketAddress *addr, Error **errp, > NonBlockingConnectHandler *callback, void *opaque); > int socket_listen(SocketAddress *addr, Error **errp); > +void socket_listen_cleanup(int fd, Error **errp); > int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **= errp); > =20 > /* Old, ipv4 only bits. Don't use for new code. */ > diff --git a/io/channel-socket.c b/io/channel-socket.c > index 1cd5848..319e1ab 100644 > --- a/io/channel-socket.c > +++ b/io/channel-socket.c > @@ -400,7 +400,17 @@ static void qio_channel_socket_init(Object *obj) > static void qio_channel_socket_finalize(Object *obj) > { > QIOChannelSocket *ioc =3D QIO_CHANNEL_SOCKET(obj); > + > if (ioc->fd !=3D -1) { > + Error *err =3D NULL; > + > + if (QIO_CHANNEL(ioc)->features & QIO_CHANNEL_FEATURE_LISTEN) > + socket_listen_cleanup(ioc->fd, &err); Every time you forget braces, checkpatch.pl kills a kitten! Think of the kittens! Paolo > + > + if (err) { > + error_report_err(err); > + err =3D NULL; > + } > #ifdef WIN32 > WSAEventSelect(ioc->fd, NULL, 0); > #endif > diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-soc= ket.c > index 855306b..f73e063 100644 > --- a/tests/test-io-channel-socket.c > +++ b/tests/test-io-channel-socket.c > @@ -383,7 +383,7 @@ static void test_io_channel_unix(bool async) > =20 > qapi_free_SocketAddress(listen_addr); > qapi_free_SocketAddress(connect_addr); > - unlink(TEST_SOCKET); > + g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) =3D=3D FALSE= ); > } > =20 > =20 > diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c > index 0d6cd1f..5d03695 100644 > --- a/util/qemu-sockets.c > +++ b/util/qemu-sockets.c > @@ -997,6 +997,24 @@ int socket_listen(SocketAddress *addr, Error **err= p) > return fd; > } > =20 > +void socket_listen_cleanup(int fd, Error **errp) > +{ > + SocketAddress *addr; > + > + addr =3D socket_local_address(fd, errp); > + > + if (addr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX > + && addr->u.q_unix.data->path) { > + if (unlink(addr->u.q_unix.data->path) < 0 && errno !=3D ENOENT= ) { > + error_setg_errno(errp, errno, > + "Failed to unlink socket %s", > + addr->u.q_unix.data->path); > + } > + } > + > + g_free(addr); > +} > + > int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **= errp) > { > int fd; >=20