From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwq-0001kY-0g for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXwwk-0000HC-Dp for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:47 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:34753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwk-0000GG-6l for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:42 -0500 Received: by mail-fx0-f45.google.com with SMTP id o26so1417543faa.4 for ; Tue, 06 Dec 2011 07:28:41 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 6 Dec 2011 16:27:34 +0100 Message-Id: <1323185272-2610-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> References: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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