aboutsummaryrefslogtreecommitdiff
path: root/qapi/transaction.json
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2018-10-29 16:23:15 -0400
committerJohn Snow <jsnow@redhat.com>2018-10-29 16:23:15 -0400
commit6fd2e40789ef7389b17c5fff93b0bf82d4352cb3 (patch)
treefae563a08ca273f7a0f693736ba1087b97a55905 /qapi/transaction.json
parent5c4cf8b294ee65c049d6c40f5f6ff7c1befdb3d9 (diff)
downloadqemu-6fd2e40789ef7389b17c5fff93b0bf82d4352cb3.zip
qemu-6fd2e40789ef7389b17c5fff93b0bf82d4352cb3.tar.gz
qemu-6fd2e40789ef7389b17c5fff93b0bf82d4352cb3.tar.bz2
qapi: add transaction support for x-block-dirty-bitmap-merge
New action is like clean action: do the whole thing in .prepare and undo in .abort. This behavior for bitmap-changing actions is needed because backup job actions use bitmap in .prepare. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'qapi/transaction.json')
-rw-r--r--qapi/transaction.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/qapi/transaction.json b/qapi/transaction.json
index d7e4274..5875cdb 100644
--- a/qapi/transaction.json
+++ b/qapi/transaction.json
@@ -48,6 +48,7 @@
# - @block-dirty-bitmap-clear: since 2.5
# - @x-block-dirty-bitmap-enable: since 3.0
# - @x-block-dirty-bitmap-disable: since 3.0
+# - @x-block-dirty-bitmap-merge: since 3.1
# - @blockdev-backup: since 2.3
# - @blockdev-snapshot: since 2.5
# - @blockdev-snapshot-internal-sync: since 1.7
@@ -63,6 +64,7 @@
'block-dirty-bitmap-clear': 'BlockDirtyBitmap',
'x-block-dirty-bitmap-enable': 'BlockDirtyBitmap',
'x-block-dirty-bitmap-disable': 'BlockDirtyBitmap',
+ 'x-block-dirty-bitmap-merge': 'BlockDirtyBitmapMerge',
'blockdev-backup': 'BlockdevBackup',
'blockdev-snapshot': 'BlockdevSnapshot',
'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal',