diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 11:27:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 11:27:54 +0000 |
| commit | 331ac65963ab74dd84659b748affa0b111486f06 (patch) | |
| tree | f6cfc2b655d997660b63add838cc64f24124cc65 | |
| parent | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (diff) | |
| parent | 1f3ddfcb258e6e0562467a9644daad3f28597da8 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | aio-posix.c | 6 | ||||
| -rw-r--r-- | block/qed.c | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/aio-posix.c b/aio-posix.c index fa7f8ab2a5..7fd565fbde 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -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) { diff --git a/block/qed.c b/block/qed.c index 8de7dd0832..5a58856ecd 100644 --- a/block/qed.c +++ b/block/qed.c @@ -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) |