Commit ca4fa82f authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
parents 0702d3d8 4ad6f3db

blockdev.c

+1 −0
Original line number Diff line number Diff line
@@ -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),