Commit 12d5ee3a authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
parent bca5a8f4

block.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

}

blockdev.c

+8 −0
Original line number Diff line number Diff line
@@ -610,6 +610,10 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, 
            qdict_put(bs_opts, BDRV_OPT_CACHE_NO_FLUSH, qstring_from_str("on"));

        }



        if (runstate_check(RUN_STATE_INMIGRATE)) {

            bdrv_flags |= BDRV_O_INACTIVE;

        }



        blk = blk_new_open(qemu_opts_id(opts), file, NULL, bs_opts, bdrv_flags,

                           errp);

        if (!blk) {
@@ -688,6 +692,10 @@ static BlockDriverState *bds_tree_init(QDict *bs_opts, Error **errp) 
        goto fail;

    }



    if (runstate_check(RUN_STATE_INMIGRATE)) {

        bdrv_flags |= BDRV_O_INACTIVE;

    }



    bs = NULL;

    ret = bdrv_open(&bs, NULL, NULL, bs_opts, bdrv_flags, errp);

    if (ret < 0) {

tests/qemu-iotests/145

0 → 100755
+52 −0
Original line number Diff line number Diff line 
#!/bin/bash

#

# Test the combination of -incoming and snapshot=on

#

# Copyright (C) 2016 Red Hat, Inc.

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program.  If not, see <http://www.gnu.org/licenses/>.

#



# creator

owner=kwolf@redhat.com



seq=`basename $0`

echo "QA output created by $seq"



here=`pwd`

tmp=/tmp/$$

status=1	# failure is the default!



_cleanup()

{

	_cleanup_test_img

	true

}

trap "_cleanup; exit \$status" 0 1 2 3 15



# get standard environment, filters and checks

. ./common.rc

. ./common.filter



_supported_fmt generic

_supported_proto generic

_supported_os Linux



_make_test_img 1M

echo quit | $QEMU -nographic -hda "$TEST_IMG" -incoming 'exec:true' -snapshot -serial none -monitor stdio | _filter_qemu



# success, all done

echo "*** done"

rm -f $seq.full

status=0

tests/qemu-iotests/145.out

0 → 100644
+5 −0
Original line number Diff line number Diff line 
QA output created by 145

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) qququiquit

*** done

tests/qemu-iotests/group

+1 −0
Original line number Diff line number Diff line
@@ -147,3 +147,4 @@ 
142 auto

143 auto quick

144 rw auto quick

145 auto quick