summaryrefslogtreecommitdiffstats
path: root/qapi/block-core.json
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy2019-05-29 01:33:31 +0200
committerJohn Snow2019-05-29 01:33:31 +0200
commiteff0829b0710d60c1846eb99baeb47b2478a414a (patch)
tree64d75fb283bc84a282bb2323b6c3ffb835cb4d41 /qapi/block-core.json
parentmigration/dirty-bitmaps: change bitmap enumeration method (diff)
downloadqemu-eff0829b0710d60c1846eb99baeb47b2478a414a.tar.gz
qemu-eff0829b0710d60c1846eb99baeb47b2478a414a.tar.xz
qemu-eff0829b0710d60c1846eb99baeb47b2478a414a.zip
qapi: support external bitmaps in block-dirty-bitmap-merge
Add new optional parameter making possible to merge bitmaps from different nodes. It is needed to maintain external snapshots during incremental backup chain history. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@redhat.com> Message-id: 20190517152111.206494-2-vsementsov@virtuozzo.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'qapi/block-core.json')
-rw-r--r--qapi/block-core.json22
1 files changed, 19 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7ccbfff9d0..dcc935d655 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2004,18 +2004,34 @@
'*persistent': 'bool', '*autoload': 'bool', '*disabled': 'bool' } }
##
+# @BlockDirtyBitmapMergeSource:
+#
+# @local: name of the bitmap, attached to the same node as target bitmap.
+#
+# @external: bitmap with specified node
+#
+# Since: 4.1
+##
+{ 'alternate': 'BlockDirtyBitmapMergeSource',
+ 'data': { 'local': 'str',
+ 'external': 'BlockDirtyBitmap' } }
+
+##
# @BlockDirtyBitmapMerge:
#
-# @node: name of device/node which the bitmap is tracking
+# @node: name of device/node which the @target bitmap is tracking
#
# @target: name of the destination dirty bitmap
#
-# @bitmaps: name(s) of the source dirty bitmap(s)
+# @bitmaps: name(s) of the source dirty bitmap(s) at @node and/or fully
+# specifed BlockDirtyBitmap elements. The latter are supported
+# since 4.1.
#
# Since: 4.0
##
{ 'struct': 'BlockDirtyBitmapMerge',
- 'data': { 'node': 'str', 'target': 'str', 'bitmaps': ['str'] } }
+ 'data': { 'node': 'str', 'target': 'str',
+ 'bitmaps': ['BlockDirtyBitmapMergeSource'] } }
##
# @block-dirty-bitmap-add: