[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/15] block: group together the plugging of sync
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 06/15] block: group together the plugging of synchronous IO emulation |
Date: |
Fri, 16 Sep 2011 16:25:43 +0200 |
This is duplicated twice for read/write operations. Unify it, and
move it close to the code that adds bdrv_flush.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index ce35dce..394ecaf 100644
--- a/block.c
+++ b/block.c
@@ -189,26 +189,26 @@ void bdrv_register(BlockDriver *bdrv)
/* Emulate AIO by coroutines, and sync by AIO */
bdrv->bdrv_aio_readv = bdrv_co_aio_readv_em;
bdrv->bdrv_aio_writev = bdrv_co_aio_writev_em;
- bdrv->bdrv_read = bdrv_read_em;
- bdrv->bdrv_write = bdrv_write_em;
} else {
bdrv->bdrv_co_readv = bdrv_co_readv_em;
bdrv->bdrv_co_writev = bdrv_co_writev_em;
-
if (!bdrv->bdrv_aio_readv) {
/* add AIO emulation layer */
bdrv->bdrv_aio_readv = bdrv_aio_readv_em;
bdrv->bdrv_aio_writev = bdrv_aio_writev_em;
- } else if (!bdrv->bdrv_read) {
- /* add synchronous IO emulation layer */
- bdrv->bdrv_read = bdrv_read_em;
- bdrv->bdrv_write = bdrv_write_em;
}
}
if (!bdrv->bdrv_aio_flush) {
bdrv->bdrv_aio_flush = bdrv_aio_flush_em;
- } else if (!bdrv->bdrv_flush) {
+ }
+
+ /* add synchronous IO emulation layer */
+ if (!bdrv->bdrv_read) {
+ bdrv->bdrv_read = bdrv_read_em;
+ bdrv->bdrv_write = bdrv_write_em;
+ }
+ if (!bdrv->bdrv_flush) {
bdrv->bdrv_flush = bdrv_flush_em;
}
--
1.7.6
- Re: [Qemu-devel] [PATCH v2 02/15] add socket_set_block, (continued)
[Qemu-devel] [PATCH v2 04/15] coroutine-io: handle zero returns from recv, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 05/15] block: emulate .bdrv_flush() using .bdrv_aio_flush(), Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 06/15] block: group together the plugging of synchronous IO emulation,
Paolo Bonzini <=
[Qemu-devel] [PATCH v2 12/15] nbd: add support for NBD_CMD_TRIM, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 09/15] nbd: fix error handling in the server, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 10/15] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 08/15] block: add bdrv_co_discard and bdrv_aio_discard support, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 07/15] block: add bdrv_co_flush support, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 14/15] nbd: split requests, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 11/15] nbd: add support for NBD_CMD_FLAG_FUA, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 13/15] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 15/15] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/09/16