Commit 0f183e67 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Mon 10 Oct 2016 12:33:14 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  dmg: Move libbz2 code to dmg-bz2.so
  module: Don't load the same module if requested multiple times
  scripts: Allow block module to not define BlockDriver
  block: Add qdev ID to DEVICE_TRAY_MOVED
  block-backend: Remember if attached device is non-qdev
  block: Add node name to BLOCK_IO_ERROR event
  block: Add bdrv_runtime_opts to query-command-line-options
  block: use aio_bh_schedule_oneshot
  async: add aio_bh_schedule_oneshot
  block: use bdrv_add_before_write_notifier

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a20fd901 9c7f3fca

async.c

+23 −4
Original line number Diff line number Diff line
@@ -44,6 +44,25 @@ struct QEMUBH { 
    bool deleted;

};



void aio_bh_schedule_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)

{

    QEMUBH *bh;

    bh = g_new(QEMUBH, 1);

    *bh = (QEMUBH){

        .ctx = ctx,

        .cb = cb,

        .opaque = opaque,

    };

    qemu_mutex_lock(&ctx->bh_lock);

    bh->next = ctx->first_bh;

    bh->scheduled = 1;

    bh->deleted = 1;

    /* Make sure that the members are ready before putting bh into list */

    smp_wmb();

    ctx->first_bh = bh;

    qemu_mutex_unlock(&ctx->bh_lock);

}



QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void *opaque)

{

    QEMUBH *bh;
@@ -86,7 +105,7 @@ int aio_bh_poll(AioContext *ctx) 
         * thread sees the zero before bh->cb has run, and thus will call

         * aio_notify again if necessary.

         */

        if (!bh->deleted && atomic_xchg(&bh->scheduled, 0)) {

        if (atomic_xchg(&bh->scheduled, 0)) {

            /* Idle BHs and the notify BH don't count as progress */

            if (!bh->idle && bh != ctx->notify_dummy_bh) {

                ret = 1;
@@ -104,7 +123,7 @@ int aio_bh_poll(AioContext *ctx) 
        bhp = &ctx->first_bh;

        while (*bhp) {

            bh = *bhp;

            if (bh->deleted) {

            if (bh->deleted && !bh->scheduled) {

                *bhp = bh->next;

                g_free(bh);

            } else {
@@ -168,7 +187,7 @@ aio_compute_timeout(AioContext *ctx) 
    QEMUBH *bh;



    for (bh = ctx->first_bh; bh; bh = bh->next) {

        if (!bh->deleted && bh->scheduled) {

        if (bh->scheduled) {

            if (bh->idle) {

                /* idle bottom halves will be polled at least

                 * every 10ms */
@@ -216,7 +235,7 @@ aio_ctx_check(GSource *source) 
    aio_notify_accept(ctx);



    for (bh = ctx->first_bh; bh; bh = bh->next) {

        if (!bh->deleted && bh->scheduled) {

        if (bh->scheduled) {

            return true;

        }

    }

block.c

+1 −8
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ out: 
    g_free(gen_node_name);

}



static QemuOptsList bdrv_runtime_opts = {

QemuOptsList bdrv_runtime_opts = {

    .name = "bdrv_common",

    .head = QTAILQ_HEAD_INITIALIZER(bdrv_runtime_opts.head),

    .desc = {
@@ -3360,17 +3360,10 @@ int bdrv_media_changed(BlockDriverState *bs) 
void bdrv_eject(BlockDriverState *bs, bool eject_flag)

{

    BlockDriver *drv = bs->drv;

    const char *device_name;



    if (drv && drv->bdrv_eject) {

        drv->bdrv_eject(bs, eject_flag);

    }



    device_name = bdrv_get_device_name(bs);

    if (device_name[0] != '\0') {

        qapi_event_send_device_tray_moved(device_name,

                                          eject_flag, &error_abort);

    }

}



/**

block/Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ gluster.o-libs := $(GLUSTERFS_LIBS) 
ssh.o-cflags       := $(LIBSSH2_CFLAGS)

ssh.o-libs         := $(LIBSSH2_LIBS)

archipelago.o-libs := $(ARCHIPELAGO_LIBS)

dmg.o-libs         := $(BZIP2_LIBS)

block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o

dmg-bz2.o-libs     := $(BZIP2_LIBS)

qcow.o-libs        := -lz

linux-aio.o-libs   := -laio

block/archipelago.c

+1 −4
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ typedef enum { 


typedef struct ArchipelagoAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    struct BDRVArchipelagoState *s;

    QEMUIOVector *qiov;

    ARCHIPCmd cmd;
@@ -154,11 +153,10 @@ static void archipelago_finish_aiocb(AIORequestData *reqdata) 
    } else if (reqdata->aio_cb->ret == reqdata->segreq->total) {

        reqdata->aio_cb->ret = 0;

    }

    reqdata->aio_cb->bh = aio_bh_new(

    aio_bh_schedule_oneshot(

                        bdrv_get_aio_context(reqdata->aio_cb->common.bs),

                        qemu_archipelago_complete_aio, reqdata

                        );

    qemu_bh_schedule(reqdata->aio_cb->bh);

}



static int wait_reply(struct xseg *xseg, xport srcport, struct xseg_port *port,
@@ -313,7 +311,6 @@ static void qemu_archipelago_complete_aio(void *opaque) 
    AIORequestData *reqdata = (AIORequestData *) opaque;

    ArchipelagoAIOCB *aio_cb = (ArchipelagoAIOCB *) reqdata->aio_cb;



    qemu_bh_delete(aio_cb->bh);

    aio_cb->common.cb(aio_cb->common.opaque, aio_cb->ret);

    aio_cb->status = 0;

block/blkdebug.c

+1 −6
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ typedef struct BDRVBlkdebugState { 


typedef struct BlkdebugAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    int ret;

} BlkdebugAIOCB;
@@ -410,7 +409,6 @@ out: 
static void error_callback_bh(void *opaque)

{

    struct BlkdebugAIOCB *acb = opaque;

    qemu_bh_delete(acb->bh);

    acb->common.cb(acb->common.opaque, acb->ret);

    qemu_aio_unref(acb);

}
@@ -421,7 +419,6 @@ static BlockAIOCB *inject_error(BlockDriverState *bs, 
    BDRVBlkdebugState *s = bs->opaque;

    int error = rule->options.inject.error;

    struct BlkdebugAIOCB *acb;

    QEMUBH *bh;

    bool immediately = rule->options.inject.immediately;



    if (rule->options.inject.once) {
@@ -436,9 +433,7 @@ static BlockAIOCB *inject_error(BlockDriverState *bs, 
    acb = qemu_aio_get(&blkdebug_aiocb_info, bs, cb, opaque);

    acb->ret = -error;



    bh = aio_bh_new(bdrv_get_aio_context(bs), error_callback_bh, acb);

    acb->bh = bh;

    qemu_bh_schedule(bh);

    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), error_callback_bh, acb);



    return &acb->common;

}