Commit c2b38b27 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

block: move AioContext, QEMUTimer, main-loop to libqemuutil 



AioContext is fairly self contained, the only dependency is QEMUTimer but
that in turn doesn't need anything else.  So move them out of block-obj-y
to avoid introducing a dependency from io/ to block-obj-y.

main-loop and its dependency iohandler also need to be moved, because
later in this series io/ will call iohandler_get_aio_context.

[Changed copyright "the QEMU team" to "other QEMU contributors" as
suggested by Daniel Berrange and agreed by Paolo.
--Stefan]

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 20170213135235.12274-2-pbonzini@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 56f9e46b

Makefile.objs

+0 −4
Original line number Diff line number Diff line
@@ -9,12 +9,8 @@ chardev-obj-y = chardev/ 
#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y = async.o thread-pool.o

block-obj-y += nbd/

block-obj-y += block.o blockjob.o

block-obj-y += main-loop.o iohandler.o qemu-timer.o

block-obj-$(CONFIG_POSIX) += aio-posix.o

block-obj-$(CONFIG_WIN32) += aio-win32.o

block-obj-y += block/

block-obj-y += qemu-io-cmds.o

block-obj-$(CONFIG_REPLICATION) += replication.o

block/io.c

+0 −29
Original line number Diff line number Diff line
@@ -2239,35 +2239,6 @@ BlockAIOCB *bdrv_aio_flush(BlockDriverState *bs, 
    return &acb->common;

}



void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,

                   BlockCompletionFunc *cb, void *opaque)

{

    BlockAIOCB *acb;



    acb = g_malloc(aiocb_info->aiocb_size);

    acb->aiocb_info = aiocb_info;

    acb->bs = bs;

    acb->cb = cb;

    acb->opaque = opaque;

    acb->refcnt = 1;

    return acb;

}



void qemu_aio_ref(void *p)

{

    BlockAIOCB *acb = p;

    acb->refcnt++;

}



void qemu_aio_unref(void *p)

{

    BlockAIOCB *acb = p;

    assert(acb->refcnt > 0);

    if (--acb->refcnt == 0) {

        g_free(acb);

    }

}



/**************************************************************/

/* Coroutine block device emulation */

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ stub-obj-y += get-vm-name.o 
stub-obj-y += iothread.o

stub-obj-y += iothread-lock.o

stub-obj-y += is-daemonized.o

stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

stub-obj-y += machine-init-done.o

stub-obj-y += migr-blocker.o

stub-obj-y += monitor.o

stubs/linux-aio.c

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Linux native AIO support.

 *

 * Copyright (C) 2009 IBM, Corp.

 * Copyright (C) 2009 Red Hat, Inc.

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */

#include "qemu/osdep.h"

#include "block/aio.h"

#include "block/raw-aio.h"



void laio_detach_aio_context(LinuxAioState *s, AioContext *old_context)

{

    abort();

}



void laio_attach_aio_context(LinuxAioState *s, AioContext *new_context)

{

    abort();

}



LinuxAioState *laio_init(void)

{

    abort();

}



void laio_cleanup(LinuxAioState *s)

{

    abort();

}

stubs/set-fd-handler.c

+0 −11
Original line number Diff line number Diff line
@@ -9,14 +9,3 @@ void qemu_set_fd_handler(int fd, 
{

    abort();

}
 


void aio_set_fd_handler(AioContext *ctx,

                        int fd,

                        bool is_external,

                        IOHandler *io_read,

                        IOHandler *io_write,

                        AioPollFn *io_poll,

                        void *opaque)

{

    abort();

}