diff options
| author | Eric Blake <eblake@redhat.com> | 2016-10-14 13:33:04 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-11-02 09:28:55 +0100 |
| commit | b626b51a6721e53817155af720243f59072e424f (patch) | |
| tree | ad00a53ab79e04ddcc2d09fd21ade2640f3da955 /nbd/nbd-internal.h | |
| parent | b1a75b3348010820cc324943f09e090ea1fc524f (diff) | |
nbd: Treat flags vs. command type as separate fields
Current upstream NBD documents that requests have a 16-bit flags,
followed by a 16-bit type integer; although older versions mentioned
only a 32-bit field with masking to find flags. Since the protocol
is in network order (big-endian over the wire), the ABI is unchanged;
but dealing with the flags as a separate field rather than masking
will make it easier to add support for upcoming NBD extensions that
increase the number of both flags and commands.
Improve some comments in nbd.h based on the current upstream
NBD protocol (https://github.com/yoe/nbd/blob/master/doc/proto.md),
and touch some nearby code to keep checkpatch.pl happy.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1476469998-28592-3-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'nbd/nbd-internal.h')
| -rw-r--r-- | nbd/nbd-internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 7e78064021..99e51571a2 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -53,10 +53,10 @@ /* This is all part of the "official" NBD API. * * The most up-to-date documentation is available at: - * https://github.com/yoe/nbd/blob/master/doc/proto.txt + * https://github.com/yoe/nbd/blob/master/doc/proto.md */ -#define NBD_REQUEST_SIZE (4 + 4 + 8 + 8 + 4) +#define NBD_REQUEST_SIZE (4 + 2 + 2 + 8 + 8 + 4) #define NBD_REPLY_SIZE (4 + 4 + 8) #define NBD_REQUEST_MAGIC 0x25609513 #define NBD_REPLY_MAGIC 0x67446698 |