Commit 331ac659 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Thu 17 Mar 2016 11:08:28 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  Revert "qed: Implement .bdrv_drain"
  aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8c457547 1f3ddfcb

aio-posix.c

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "block/block.h"

#include "qemu/queue.h"

#include "qemu/sockets.h"

#ifdef CONFIG_EPOLL

#ifdef CONFIG_EPOLL_CREATE1

#include <sys/epoll.h>

#endif
@@ -33,7 +33,7 @@ struct AioHandler 
    QLIST_ENTRY(AioHandler) node;

};



#ifdef CONFIG_EPOLL

#ifdef CONFIG_EPOLL_CREATE1



/* The fd number threashold to switch to epoll */

#define EPOLL_ENABLE_THRESHOLD 64
@@ -483,7 +483,7 @@ bool aio_poll(AioContext *ctx, bool blocking) 


void aio_context_setup(AioContext *ctx, Error **errp)

{

#ifdef CONFIG_EPOLL

#ifdef CONFIG_EPOLL_CREATE1

    assert(!ctx->epollfd);

    ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);

    if (ctx->epollfd == -1) {

block/qed.c

+0 −13
Original line number Diff line number Diff line
@@ -377,18 +377,6 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs, 
    }

}



static void bdrv_qed_drain(BlockDriverState *bs)

{

    BDRVQEDState *s = bs->opaque;



    /* Cancel timer and start doing I/O that were meant to happen as if it

     * fired, that way we get bdrv_drain() taking care of the ongoing requests

     * correctly. */

    qed_cancel_need_check_timer(s);

    qed_plug_allocating_write_reqs(s);

    bdrv_aio_flush(s->bs, qed_clear_need_check, s);

}



static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags,

                         Error **errp)

{
@@ -1694,7 +1682,6 @@ static BlockDriver bdrv_qed = { 
    .bdrv_check               = bdrv_qed_check,

    .bdrv_detach_aio_context  = bdrv_qed_detach_aio_context,

    .bdrv_attach_aio_context  = bdrv_qed_attach_aio_context,

    .bdrv_drain               = bdrv_qed_drain,

};



static void bdrv_qed_init(void)