Hi ----- Original Message ----- > > > On 16/06/2016 13:17, [email protected] wrote: > > From: Marc-André Lureau <[email protected]> > > > > 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. > > > > Fixes: > > https://bugzilla.redhat.com/show_bug.cgi?id=1347077 > > > > Signed-off-by: Marc-André Lureau <[email protected]> > > --- > > 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(-) > > > > 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); > > > > /* 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 = QIO_CHANNEL_SOCKET(obj); > > + > > if (ioc->fd != -1) { > > + Error *err = 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!
Oh no! :) (weird the git hook usually catch this for me), fixed
