Commit abd269b7 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

block/linux-aio: fix memory and fd leak 



Hot unplugging -drive aio=native,file=test.img,format=raw images leaves
the Linux AIO event notifier and struct qemu_laio_state allocated.
Luckily nothing will use the event notifier after the BlockDriverState
has been closed so the handler function is never called.

It's still worth fixing this resource leak.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent c2f3426c

block/linux-aio.c

+8 −0
Original line number Diff line number Diff line
@@ -212,3 +212,11 @@ out_free_state: 
    g_free(s);

    return NULL;

}



void laio_cleanup(void *s_)

{

    struct qemu_laio_state *s = s_;



    event_notifier_cleanup(&s->e);

    g_free(s);

}

block/raw-aio.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
/* linux-aio.c - Linux native implementation */

#ifdef CONFIG_LINUX_AIO

void *laio_init(void);

void laio_cleanup(void *s);

BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque, int type);

block/raw-posix.c

+5 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,11 @@ static void raw_close(BlockDriverState *bs) 


    raw_detach_aio_context(bs);



#ifdef CONFIG_LINUX_AIO

    if (s->use_aio) {

        laio_cleanup(s->aio_ctx);

    }

#endif

    if (s->fd >= 0) {

        qemu_close(s->fd);

        s->fd = -1;