From bbb74edd405bee8cf29957ef781294f40f02d4c6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 8 Sep 2011 17:24:55 +0200 Subject: [PATCH] nbd: sync API definitions with upstream Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- nbd.c | 2 ++ nbd.h | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nbd.c b/nbd.c index 47ecb2234b..d32a19e5e3 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 b9c3b391d6..61553f4128 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