[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA |
Date: |
Tue, 6 Dec 2011 16:27:34 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/nbd.c | 4 ++++
nbd.c | 13 +++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 93f5d16..69fa990 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -352,6 +352,10 @@ static int nbd_co_writev_1(BlockDriverState *bs, int64_t
sector_num,
struct nbd_reply reply;
request.type = NBD_CMD_WRITE;
+ if (!bdrv_enable_write_cache(bs) && (s->nbdflags & NBD_FLAG_SEND_FUA)) {
+ request.type |= NBD_CMD_FLAG_FUA;
+ }
+
request.from = sector_num * 512;;
request.len = nb_sectors * 512;
diff --git a/nbd.c b/nbd.c
index 9353438..a6eba4d 100644
--- a/nbd.c
+++ b/nbd.c
@@ -202,7 +202,8 @@ int nbd_negotiate(int csock, off_t size, uint32_t flags)
memcpy(buf, "NBDMAGIC", 8);
cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL);
cpu_to_be64w((uint64_t*)(buf + 16), size);
- cpu_to_be32w((uint32_t*)(buf + 24), flags | NBD_FLAG_HAS_FLAGS);
+ cpu_to_be32w((uint32_t*)(buf + 24),
+ flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_FUA);
memset(buf + 28, 0, 124);
if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
@@ -630,7 +631,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset,
reply.handle = request.handle;
reply.error = 0;
- switch (request.type) {
+ switch (request.type & NBD_CMD_MASK_COMMAND) {
case NBD_CMD_READ:
TRACE("Request type is READ");
@@ -692,6 +693,14 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset,
}
*offset += request.len;
+
+ if (request.type & NBD_CMD_FLAG_FUA) {
+ ret = bdrv_flush(bs);
+ if (ret < 0) {
+ LOG("flush failed");
+ reply.error = -ret;
+ }
+ }
}
if (nbd_send_reply(csock, &reply) == -1)
--
1.7.7.1
- [Qemu-devel] [PATCH 00/25] nbd asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 01/25] add qemu_send_full and qemu_recv_full, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 03/25] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 05/25] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 04/25] nbd: split requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 02/25] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 06/25] nbd: fix error handling in the server, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 08/25] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 11/25] qemu-nbd: remove offset argument to nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 10/25] Update ioctl order in nbd_init() to detect EBUSY, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 16/25] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 14/25] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 12/25] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 15/25] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 25/25] qemu-nbd: throttle requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 23/25] qemu-nbd: add client pointer to NBDRequest, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 24/25] qemu-nbd: asynchronous operation, Paolo Bonzini, 2011/12/06