diff options
| author | Peter Maydell | 2018-03-02 13:39:13 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-02 13:39:13 +0100 |
| commit | 2e7b766594e17f786a6b2e5be690bc5b43ce6036 (patch) | |
| tree | 19882f988fb17dd5666d70a46eeb3e2d87d67fe8 /nbd/common.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | nbd/client: fix error messages in nbd_handle_reply_err (diff) | |
| download | qemu-2e7b766594e17f786a6b2e5be690bc5b43ce6036.tar.gz qemu-2e7b766594e17f786a6b2e5be690bc5b43ce6036.tar.xz qemu-2e7b766594e17f786a6b2e5be690bc5b43ce6036.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-03-01' into staging
nbd patches for 2018-03-01
- Eric Blake: nbd: Honor server's advertised minimum block size
- Vladimir Sementsov-Ogievskiy: partial: nbd block status base:allocation
# gpg: Signature made Thu 01 Mar 2018 21:01:22 GMT
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg: aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2018-03-01:
nbd/client: fix error messages in nbd_handle_reply_err
nbd: BLOCK_STATUS constants
nbd: change indenting in nbd.h
nbd: Honor server's advertised minimum block size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'nbd/common.c')
| -rw-r--r-- | nbd/common.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nbd/common.c b/nbd/common.c index 6295526dd1..8c95c1d606 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -75,6 +75,10 @@ const char *nbd_opt_lookup(uint32_t opt) return "go"; case NBD_OPT_STRUCTURED_REPLY: return "structured reply"; + case NBD_OPT_LIST_META_CONTEXT: + return "list meta context"; + case NBD_OPT_SET_META_CONTEXT: + return "set meta context"; default: return "<unknown>"; } @@ -90,6 +94,8 @@ const char *nbd_rep_lookup(uint32_t rep) return "server"; case NBD_REP_INFO: return "info"; + case NBD_REP_META_CONTEXT: + return "meta context"; case NBD_REP_ERR_UNSUP: return "unsupported"; case NBD_REP_ERR_POLICY: @@ -144,6 +150,8 @@ const char *nbd_cmd_lookup(uint16_t cmd) return "trim"; case NBD_CMD_WRITE_ZEROES: return "write zeroes"; + case NBD_CMD_BLOCK_STATUS: + return "block status"; default: return "<unknown>"; } @@ -159,6 +167,8 @@ const char *nbd_reply_type_lookup(uint16_t type) return "data"; case NBD_REPLY_TYPE_OFFSET_HOLE: return "hole"; + case NBD_REPLY_TYPE_BLOCK_STATUS: + return "block status"; case NBD_REPLY_TYPE_ERROR: return "generic error"; case NBD_REPLY_TYPE_ERROR_OFFSET: |