summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2015-11-18 16:27:44 +0100
committerKevin Wolf <kwolf@redhat.com>2015-11-18 16:27:44 +0100
commitca4fa82fe66076284f702adcfe7c319ebbf909ec (patch)
tree915a0ce641b41170d66030675af164d49ceb19e8
parent0702d3d88c2059814212b83f01e14ff3bb7b0c66 (diff)
parent4ad6f3db7db154d5274274bd0079d6318367ab16 (diff)
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block
One block patch for qemu 2.5-rc1. # gpg: Signature made Wed Nov 18 16:26:59 2015 CET using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" * mreitz/tags/pull-block-for-kevin-2015-11-18: block: Call external_snapshot_clean after blockdev-snapshot Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--blockdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/blockdev.c b/blockdev.c
index 07c1741214..313841b0b4 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2098,6 +2098,7 @@ static const BlkActionOps actions[] = {
.prepare = external_snapshot_prepare,
.commit = external_snapshot_commit,
.abort = external_snapshot_abort,
+ .clean = external_snapshot_clean,
},
[TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC] = {
.instance_size = sizeof(ExternalSnapshotState),