aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-16 21:28:52 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-06-29 16:49:41 +0200
commit74b6ce43e3aacbb101018407196fc963e2c39fea (patch)
tree84a5082d6ce8b1c32be1f0a26deb47ce3510181e /io
parent3fa27a9a1e20e8fb2bf4358d6873177d5d5c049a (diff)
socket: unlink unix socket on remove
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 <marcandre.lureau@redhat.com> Message-Id: <1466105332-10285-4-git-send-email-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'io')
-rw-r--r--io/channel-socket.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 1cd58487b0..6ec87f8cdb 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) {
+ if (QIO_CHANNEL(ioc)->features & QIO_CHANNEL_FEATURE_LISTEN) {
+ Error *err = NULL;
+
+ socket_listen_cleanup(ioc->fd, &err);
+ if (err) {
+ error_report_err(err);
+ err = NULL;
+ }
+ }
#ifdef WIN32
WSAEventSelect(ioc->fd, NULL, 0);
#endif