Commit 74b6ce43 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1466105332-10285-4-git-send-email-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3fa27a9a

include/qemu/sockets.h

+1 −0
Original line number Diff line number Diff line
@@ -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. */

io/channel-socket.c

+10 −0
Original line number Diff line number Diff line
@@ -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

tests/test-io-channel-socket.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void test_io_channel_unix(bool async) 


    qapi_free_SocketAddress(listen_addr);

    qapi_free_SocketAddress(connect_addr);

    unlink(TEST_SOCKET);

    g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE);

}

util/qemu-sockets.c

+18 −0
Original line number Diff line number Diff line
@@ -997,6 +997,24 @@ int socket_listen(SocketAddress *addr, Error **errp) 
    return fd;

}



void socket_listen_cleanup(int fd, Error **errp)

{

    SocketAddress *addr;



    addr = socket_local_address(fd, errp);



    if (addr->type == SOCKET_ADDRESS_KIND_UNIX

        && addr->u.q_unix.data->path) {

        if (unlink(addr->u.q_unix.data->path) < 0 && errno != 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;