diff options
| author | Peter Maydell | 2015-05-29 16:32:15 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-05-29 16:32:15 +0200 |
| commit | 2cc3bdbe2d3908f7a813d1c2d774cc2bf07746cd (patch) | |
| tree | 3b15b5565d3bad53127dbfcd5f2c34218aca6256 /qapi | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150529-1' into s... (diff) | |
| parent | qapi: add dirty bitmap status (diff) | |
| download | qemu-2cc3bdbe2d3908f7a813d1c2d774cc2bf07746cd.tar.gz qemu-2cc3bdbe2d3908f7a813d1c2d774cc2bf07746cd.tar.xz qemu-2cc3bdbe2d3908f7a813d1c2d774cc2bf07746cd.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2015-05-29' into staging
Block QAPI, monitor, command line patches
# gpg: Signature made Fri May 29 12:02:32 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-block-2015-05-29:
qapi: add dirty bitmap status
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 863ffea0c7..8411d4f83a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -326,6 +326,25 @@ 'data': 'bool', '*offset': 'int' } } ## +# @DirtyBitmapStatus: +# +# An enumeration of possible states that a dirty bitmap can report to the user. +# +# @frozen: The bitmap is currently in-use by a backup operation or block job, +# and is immutable. +# +# @disabled: The bitmap is currently in-use by an internal operation and is +# read-only. It can still be deleted. +# +# @active: The bitmap is actively monitoring for new writes, and can be cleared, +# deleted, or used for backup operations. +# +# Since: 2.4 +## +{ 'enum': 'DirtyBitmapStatus', + 'data': ['active', 'disabled', 'frozen'] } + +## # @BlockDirtyInfo: # # Block dirty bitmap information. @@ -336,13 +355,13 @@ # # @granularity: granularity of the dirty bitmap in bytes (since 1.4) # -# @frozen: whether the dirty bitmap is frozen (Since 2.4) +# @status: current status of the dirty bitmap (since 2.4) # # Since: 1.3 ## { 'struct': 'BlockDirtyInfo', 'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32', - 'frozen': 'bool'} } + 'status': 'DirtyBitmapStatus'} } ## # @BlockInfo: |