diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-02-19 16:48:10 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-02-22 09:49:46 +0100 |
| commit | 12d5ee3a7e83a42ba75a79b220a9db4dacd70a6e (patch) | |
| tree | 213170f7769782df87cc56ed9bef124bf04efcd5 /block.c | |
| parent | bca5a8f4624f1859ad1a2b078e6b685456e6befd (diff) | |
| download | focaccia-qemu-12d5ee3a7e83a42ba75a79b220a9db4dacd70a6e.tar.gz focaccia-qemu-12d5ee3a7e83a42ba75a79b220a9db4dacd70a6e.zip | |
block: Fix -incoming with snapshot=on
The BDRV_O_INACTIVE flag should only be set for images explicitly opened by the user. snapshot=on needs to create a new qcow2 image and write some metadata to it. This is not a problem because it can't come from the source, so there's no reason to mark it as BDRV_O_INACTIVE, even though it is opened while waiting for the migration to complete. This fixes an assertion failure when -incoming and snapshot=on are combined. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/block.c b/block.c index efc3c43f89..ba24b8e674 100644 --- a/block.c +++ b/block.c @@ -1191,10 +1191,6 @@ static int bdrv_fill_options(QDict **options, const char *filename, } } - if (runstate_check(RUN_STATE_INMIGRATE)) { - *flags |= BDRV_O_INACTIVE; - } - return 0; } |