aboutsummaryrefslogtreecommitdiff
path: root/qmp-commands.hx
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2015-11-05 18:13:18 -0500
committerKevin Wolf <kwolf@redhat.com>2015-11-12 16:22:44 +0100
commit94d16a640a1058653327392e08c6d39eeba1e499 (patch)
tree5de12a06b8d714ac159a5d9cc3f8922ed4790d93 /qmp-commands.hx
parent78f51fde88d1925b5ae51ba789339baa9ff72ad1 (diff)
downloadqemu-94d16a640a1058653327392e08c6d39eeba1e499.zip
qemu-94d16a640a1058653327392e08c6d39eeba1e499.tar.gz
qemu-94d16a640a1058653327392e08c6d39eeba1e499.tar.bz2
block: add transactional properties
Add both transactional properties to the QMP transactional interface, and add the BlockJobTxn that we create as a result of the err-cancel property to the BlkActionState structure. [split up from a patch originally by Stefan and Fam. --js] Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 1446765200-3054-13-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 02c0c5b..ede18bf 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1281,7 +1281,7 @@ EQMP
},
{
.name = "transaction",
- .args_type = "actions:q",
+ .args_type = "actions:q,properties:q?",
.mhandler.cmd_new = qmp_marshal_transaction,
},