[Qemu-commits] [qemu/qemu] deb6cc: nbd: Allow description when creating NBD blockdev

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: deb6ccb077238660080abe7e667bbf8ede5141c7
      
https://github.com/qemu/qemu/commit/deb6ccb077238660080abe7e667bbf8ede5141c7
  Author: Eric Blake <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M blockdev-nbd.c
    M monitor/hmp-cmds.c
    M qapi/block.json
    M tests/qemu-iotests/223
    M tests/qemu-iotests/223.out

  Log Message:
  -----------
  nbd: Allow description when creating NBD blockdev

Allow blockdevs to match the feature already present in qemu-nbd -D.
Enhance iotest 223 to cover it.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>


  Commit: 2e3cb7583a138861cd68977394b172f268b8ed63
      
https://github.com/qemu/qemu/commit/2e3cb7583a138861cd68977394b172f268b8ed63
  Author: Eric Blake <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M qemu-deprecated.texi

  Log Message:
  -----------
  docs: Fix typo in qemu-nbd -P replacement

The suggested replacement for the deprecated 'qemu-nbd -P' refers to
'file.backing.opt' instead of 'file.file.opt'; using the example
verbatim results in:

qemu-nbd: Failed to blk_new_open 
'driver=raw,offset=1m,size=100m,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file4':
 A block device must be specified for "file"

Correct this text, prior to actually finishing the deprecation process.

Fixes: 0ae2d54645eb
Reported-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 0bc16997f5404134637227e53b637d0825d46b5a
      
https://github.com/qemu/qemu/commit/0bc16997f5404134637227e53b637d0825d46b5a
  Author: Eric Blake <address@hidden>
  Date:   2020-02-05 (Wed, 05 Feb 2020)

  Changed paths:
    M docs/interop/qemu-nbd.rst
    M qemu-deprecated.texi
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: Removed deprecated --partition option

The option was deprecated in 4.0.0 (commit 0ae2d546); it's now been
long enough with no complaints to follow through with that process.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 5b7686f3fa2092d2b3be92df67b5966ee1b0142a
      
https://github.com/qemu/qemu/commit/5b7686f3fa2092d2b3be92df67b5966ee1b0142a
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M blockdev-nbd.c
    M docs/interop/qemu-nbd.rst
    M monitor/hmp-cmds.c
    M qapi/block.json
    M qemu-deprecated.texi
    M qemu-nbd.c
    M tests/qemu-iotests/223
    M tests/qemu-iotests/223.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-02-06' into 
staging

nbd patches for 2020-02-06

- Allow setting NBD description from QMP for parity with qemu-nbd
- Remove deprecated 'qemu-nbd --partition'

# gpg: Signature made Thu 06 Feb 2020 12:50:46 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [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-2020-02-06:
  qemu-nbd: Removed deprecated --partition option
  docs: Fix typo in qemu-nbd -P replacement
  nbd: Allow description when creating NBD blockdev

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/863d2ed5823f...5b7686f3fa20