[Qemu-commits] [qemu/qemu] 3f4868: block: Forward 'discard' to temporary overlay

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3f48686faca1856d74c244b151da1d3a521ef967
      
https://github.com/qemu/qemu/commit/3f48686faca1856d74c244b151da1d3a521ef967
  Author: Kevin Wolf <address@hidden>
  Date:   2019-04-08 (Mon, 08 Apr 2019)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Forward 'discard' to temporary overlay

When bdrv_temp_snapshot_options() is called for snapshot=on, the
'discard' option in the options QDict hasn't been parsed and merged into
the flags yet. So copy the dict entry to make sure that the temporary
overlay enables discard when it was requested for the drive.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>


  Commit: ab63817119b03b95f7dce6fae036e6d063ad63fb
      
https://github.com/qemu/qemu/commit/ab63817119b03b95f7dce6fae036e6d063ad63fb
  Author: Markus Armbruster <address@hidden>
  Date:   2019-04-08 (Mon, 08 Apr 2019)

  Changed paths:
    M device-hotplug.c
    M tests/test-hmp.c

  Log Message:
  -----------
  hmp: Fix drive_add ... format=help crash

drive_new() returns null without setting an error when it provided
help.  add_init_drive() assumes null means failure, and crashes trying
to report a null error.

Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 5263724b78f89cdea2354c8e92c53bac1b4641a3
      
https://github.com/qemu/qemu/commit/5263724b78f89cdea2354c8e92c53bac1b4641a3
  Author: Peter Maydell <address@hidden>
  Date:   2019-04-08 (Mon, 08 Apr 2019)

  Changed paths:
    M block.c
    M device-hotplug.c
    M tests/test-hmp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- hmp: Fix drive_add ... format=help crash
- block: Forward 'discard' to temporary overlay

# gpg: Signature made Mon 08 Apr 2019 16:43:20 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  hmp: Fix drive_add ... format=help crash
  block: Forward 'discard' to temporary overlay

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


Compare: https://github.com/qemu/qemu/compare/2c5731062794...5263724b78f8