diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 17:16:57 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 17:16:57 +0100 |
| commit | 8627edfb3f1fca24a96a0954148885c3241c10f8 (patch) | |
| tree | ba41aa3263969de04f1a95a0a307e78cfecb91c5 /docs/interop/nbd.txt | |
| parent | d434a47905641433e16ef65356d17090fd6fdcb1 (diff) | |
| parent | fdc6e168181d06391711171b7c409b34f2981ced (diff) | |
| download | qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.zip qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.tar.gz qemu-8627edfb3f1fca24a96a0954148885c3241c10f8.tar.bz2 | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
Bugfixes for 6.2.
# gpg: Signature made Fri 19 Nov 2021 10:33:29 AM CET
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
chardev/wctable: don't free the instance in wctablet_chr_finalize
meson.build: Support ncurses on MacOS and OpenBSD
docs: Spell QEMU all caps
qtest/am53c974-test: add test for reset before transfer
esp: ensure that async_len is reset to 0 during esp_hard_reset()
nvmm: Fix support for stable version
meson: fix botched compile check conversions
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'docs/interop/nbd.txt')
| -rw-r--r-- | docs/interop/nbd.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/interop/nbd.txt b/docs/interop/nbd.txt index 10ce098..bdb0f2a 100644 --- a/docs/interop/nbd.txt +++ b/docs/interop/nbd.txt @@ -1,4 +1,4 @@ -Qemu supports the NBD protocol, and has an internal NBD client (see +QEMU supports the NBD protocol, and has an internal NBD client (see block/nbd.c), an internal NBD server (see blockdev-nbd.c), and an external NBD server tool (see qemu-nbd.c). The common code is placed in nbd/*. @@ -7,11 +7,11 @@ The NBD protocol is specified here: https://github.com/NetworkBlockDevice/nbd/blob/master/doc/proto.md The following paragraphs describe some specific properties of NBD -protocol realization in Qemu. +protocol realization in QEMU. = Metadata namespaces = -Qemu supports the "base:allocation" metadata context as defined in the +QEMU supports the "base:allocation" metadata context as defined in the NBD protocol specification, and also defines an additional metadata namespace "qemu". |