diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-05 12:46:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-05 12:46:18 +0000 |
| commit | 1c3d45df5e94042d5fb2bb31416072563ab30e49 (patch) | |
| tree | b93bbcb015f1a7e2b2cc14d26930536b0559faa1 /qemu-nbd.c | |
| parent | 9ae805637a9cfab2edc15f56fbc3219815c8118e (diff) | |
| parent | bc5a03350c220698229e7d6929dd242d5d358345 (diff) | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-04' into staging
nbd patches for 2019-02-04
- deprecate 'qemu-nbd --partition'
- preparation for NBD reconnect, including better logging of read errors
# gpg: Signature made Tue 05 Feb 2019 03:50:56 GMT
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg: aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2019-02-04:
block/nbd-client: rename read_reply_co to connection_co
block/nbd-client: don't check ioc
block/nbd-client: fix nbd_reply_chunk_iter_receive
block/nbd-client: split connection from initialization
block/nbd: move connection code from block/nbd to block/nbd-client
block/nbd-client: split channel errors from export errors
nbd: generalize usage of nbd_read
qemu-nbd: Deprecate qemu-nbd --partition
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-nbd.c')
| -rw-r--r-- | qemu-nbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5..00c07fd27e 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); |