From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5yCE-0004NO-Jf for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5yCD-0008Ug-3u for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5yCC-0008UU-NK for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:01 -0400 From: Kevin Wolf Date: Tue, 20 Sep 2011 13:11:34 +0200 Message-Id: <1316517112-9908-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1316517112-9908-1-git-send-email-kwolf@redhat.com> References: <1316517112-9908-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 02/20] nbd: sync API definitions with upstream List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- nbd.c | 2 ++ nbd.h | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/nbd.c b/nbd.c index 47ecb22..d32a19e 100644 --- a/nbd.c +++ b/nbd.c @@ -67,6 +67,8 @@ #define NBD_PRINT_DEBUG _IO(0xab, 6) #define NBD_SET_SIZE_BLOCKS _IO(0xab, 7) #define NBD_DISCONNECT _IO(0xab, 8) +#define NBD_SET_TIMEOUT _IO(0xab, 9) +#define NBD_SET_FLAGS _IO(0xab, 10) #define NBD_OPT_EXPORT_NAME (1 << 0) diff --git a/nbd.h b/nbd.h index b9c3b39..61553f4 100644 --- a/nbd.h +++ b/nbd.h @@ -39,11 +39,20 @@ struct nbd_reply { #define NBD_FLAG_HAS_FLAGS (1 << 0) /* Flags are there */ #define NBD_FLAG_READ_ONLY (1 << 1) /* Device is read-only */ +#define NBD_FLAG_SEND_FLUSH (1 << 2) /* Send FLUSH */ +#define NBD_FLAG_SEND_FUA (1 << 3) /* Send FUA (Force Unit Access) */ +#define NBD_FLAG_ROTATIONAL (1 << 4) /* Use elevator algorithm - rotational media */ +#define NBD_FLAG_SEND_TRIM (1 << 5) /* Send TRIM (discard) */ + +#define NBD_CMD_MASK_COMMAND 0x0000ffff +#define NBD_CMD_FLAG_FUA (1 << 16) enum { NBD_CMD_READ = 0, NBD_CMD_WRITE = 1, - NBD_CMD_DISC = 2 + NBD_CMD_DISC = 2, + NBD_CMD_FLUSH = 3, + NBD_CMD_TRIM = 4 }; #define NBD_DEFAULT_PORT 10809 -- 1.7.6.2