diff options
author | Kevin Wolf | 2014-11-21 17:43:57 +0100 |
---|---|---|
committer | Kevin Wolf | 2014-11-24 13:52:10 +0100 |
commit | 24bf10dac389942b58f0d24e96590c927251b3d6 (patch) | |
tree | c6c477ab383aef474d21ce9d7279fc1673d4322e /qapi | |
parent | Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st... (diff) | |
download | qemu-24bf10dac389942b58f0d24e96590c927251b3d6.tar.gz qemu-24bf10dac389942b58f0d24e96590c927251b3d6.tar.xz qemu-24bf10dac389942b58f0d24e96590c927251b3d6.zip |
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 <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r-- | qapi/block-core.json | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 8c3e45d4c3..a14e6ab1fd 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -119,8 +119,6 @@ # @format-specific: #optional structure supplying additional format-specific # information (since 1.7) # -# @nocow: #optional info of whether NOCOW flag is set or not. (since 2.2) -# # Since: 1.3 # ## @@ -132,8 +130,7 @@ '*backing-filename': 'str', '*full-backing-filename': 'str', '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'], '*backing-image': 'ImageInfo', - '*format-specific': 'ImageInfoSpecific', - '*nocow': 'bool' } } + '*format-specific': 'ImageInfoSpecific' } } ## # @ImageCheck: |