aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-11-21 10:49:00 +0000
committerKevin Wolf <kwolf@redhat.com>2014-12-10 10:31:13 +0100
commit3dc7ca3c97dff8732e38828b38e0497efba0fedf (patch)
tree0819f2e9f3e91c8c0f08e97f0b7e1f2b789d27f9
parent5d6e96efb81f94f39a50110e8178584fb1817f66 (diff)
downloadqemu-3dc7ca3c97dff8732e38828b38e0497efba0fedf.zip
qemu-3dc7ca3c97dff8732e38828b38e0497efba0fedf.tar.gz
qemu-3dc7ca3c97dff8732e38828b38e0497efba0fedf.tar.bz2
blockdev: check for BLOCK_OP_TYPE_INTERNAL_SNAPSHOT
The BLOCK_OP_TYPE_INTERNAL_SNAPSHOT op blocker exists but was never used! Let's fix that so internal snapshots can be blocked. [Fixed s/external/internal/ typo as pointed out by Paolo Bonzini and Max Reitz. --Stefan] Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 1416566940-4430-5-git-send-email-stefanha@redhat.com Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--blockdev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/blockdev.c b/blockdev.c
index ea59c39..5651a8e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1250,6 +1250,10 @@ static void internal_snapshot_prepare(BlkTransactionState *common,
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) {
+ return;
+ }
+
if (bdrv_is_read_only(bs)) {
error_set(errp, QERR_DEVICE_IS_READ_ONLY, device);
return;