[Qemu-commits] [qemu/qemu] 24bf10: Revert "qemu-img info: show nocow info"

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 24bf10dac389942b58f0d24e96590c927251b3d6
      
https://github.com/qemu/qemu/commit/24bf10dac389942b58f0d24e96590c927251b3d6
  Author: Kevin Wolf <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M block/qapi.c
    M qapi/block-core.json

  Log Message:
  -----------
  Revert "qemu-img info: show nocow info"

This reverts commit 000c4dfff4d7686e2fba3066a477a1290ed60622.

The main reason for reverting this commit before the 2.2 release is that
it adds a QAPI interface that we don't want to keep: The 'nocow' flag
doesn't generally make sense for block nodes, but only for the raw-posix
driver. It should therefore be part of ImageInfoSpecific rather than
ImageInfo.

The commit contains more problems, but unlike the API stability issue
they wouldn't justify reverting it.

Conflicts:
        block/qapi.c

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 3d4a70f80fead02a3b3872790b4c8f07ee804494
      
https://github.com/qemu/qemu/commit/3d4a70f80fead02a3b3872790b4c8f07ee804494
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M block/qapi.c
    M qapi/block-core.json

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

Block patches for 2.2.0-rc3

# gpg: Signature made Mon 24 Nov 2014 12:52:23 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  Revert "qemu-img info: show nocow info"

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


Compare: https://github.com/qemu/qemu/compare/a31a7475e930...3d4a70f80fea