diff options
| author | Peter Maydell | 2017-08-15 19:17:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-15 19:17:02 +0200 |
| commit | 09920c53549f6097a007bc6081b6f03b9dc13d9c (patch) | |
| tree | f89faaaa418a7922c811c01ab29e4d83eef73ede /nbd/common.c | |
| parent | mmio-interface: Mark as not user creatable (diff) | |
| parent | nbd-client: Fix regression when server sends garbage (diff) | |
| download | qemu-09920c53549f6097a007bc6081b6f03b9dc13d9c.tar.gz qemu-09920c53549f6097a007bc6081b6f03b9dc13d9c.tar.xz qemu-09920c53549f6097a007bc6081b6f03b9dc13d9c.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-08-15' into staging
nbd patches for 2017-08-15
- Eric Blake: nbd: Fix trace message for disconnect
- Stefan Hajnoczi: qemu-iotests: step clock after each test iteration
- Fam Zheng: 0/4 block: Fix non-shared storage migration
- Eric Blake: nbd-client: Fix regression when server sends garbage
# gpg: Signature made Tue 15 Aug 2017 16:06:02 BST
# gpg: using RSA key 0xA7A16B4A2527436A
# 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-2017-08-15:
nbd-client: Fix regression when server sends garbage
iotests: Add non-shared storage migration case 192
block-backend: Defer shared_perm tightening migration completion
nbd: Fix order of bdrv_set_perm and bdrv_invalidate_cache
stubs: Add vm state change handler stubs
qemu-iotests: step clock after each test iteration
nbd: Fix trace message for disconnect
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'nbd/common.c')
| -rw-r--r-- | nbd/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd/common.c b/nbd/common.c index a2f28f2eec..e288d1b972 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -182,7 +182,7 @@ const char *nbd_cmd_lookup(uint16_t cmd) case NBD_CMD_WRITE: return "write"; case NBD_CMD_DISC: - return "discard"; + return "disconnect"; case NBD_CMD_FLUSH: return "flush"; case NBD_CMD_TRIM: |