Commit 8eb4b07b authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Remove assertions from update_flags_from_options() 



This function takes four options (cache.direct, cache.no-flush,
read-only and auto-read-only) from a QemuOpts object and updates the
flags accordingly.

If any of those options is not set (because it was missing from the
original QDict or because it had an invalid value) then the function
aborts with a failed assertion:

   $ qemu-io -c 'reopen -o read-only=foo' hd.qcow2
   block.c:1126: update_flags_from_options: Assertion `qemu_opt_find(opts, BDRV_OPT_CACHE_DIRECT)' failed.
   Aborted

This assertion is unnecessary, and it forces any caller of
bdrv_reopen() to pass all the aforementioned four options. This may
have made sense in order to remove ambiguity when bdrv_reopen() was
taking both flags and options, but that's not the case anymore.

It's also unnecessary if we want to validate the option values,
because bdrv_reopen_prepare() already takes care of that, as we can
see if we remove the assertions:

   $ qemu-io -c 'reopen -o read-only=foo' hd.qcow2
   Parameter 'read-only' expects 'on' or 'off'

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 9aa09ddd

block.c

+0 −4
Original line number Diff line number Diff line
@@ -1139,22 +1139,18 @@ static void update_flags_from_options(int *flags, QemuOpts *opts) 
{

    *flags &= ~(BDRV_O_CACHE_MASK | BDRV_O_RDWR | BDRV_O_AUTO_RDONLY);



    assert(qemu_opt_find(opts, BDRV_OPT_CACHE_NO_FLUSH));

    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {

        *flags |= BDRV_O_NO_FLUSH;

    }



    assert(qemu_opt_find(opts, BDRV_OPT_CACHE_DIRECT));

    if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_DIRECT, false)) {

        *flags |= BDRV_O_NOCACHE;

    }



    assert(qemu_opt_find(opts, BDRV_OPT_READ_ONLY));

    if (!qemu_opt_get_bool_del(opts, BDRV_OPT_READ_ONLY, false)) {

        *flags |= BDRV_O_RDWR;

    }



    assert(qemu_opt_find(opts, BDRV_OPT_AUTO_READ_ONLY));

    if (qemu_opt_get_bool_del(opts, BDRV_OPT_AUTO_READ_ONLY, false)) {

        *flags |= BDRV_O_AUTO_RDONLY;

    }

tests/qemu-iotests/133

+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ $QEMU_IO -c 'reopen -w -o read-only=on' $TEST_IMG 
$QEMU_IO -c 'reopen -c none -o cache.direct=on' $TEST_IMG

$QEMU_IO -c 'reopen -c writeback -o cache.direct=on' $TEST_IMG

$QEMU_IO -c 'reopen -c directsync -o cache.no-flush=on' $TEST_IMG



echo

echo "=== Check that invalid options are handled correctly ==="

echo



$QEMU_IO -c 'reopen -o read-only=foo' $TEST_IMG

$QEMU_IO -c 'reopen -o cache.no-flush=bar' $TEST_IMG

$QEMU_IO -c 'reopen -o cache.direct=baz' $TEST_IMG

$QEMU_IO -c 'reopen -o auto-read-only=qux' $TEST_IMG

# success, all done

echo "*** done"

rm -f $seq.full

tests/qemu-iotests/133.out

+7 −0
Original line number Diff line number Diff line
@@ -32,4 +32,11 @@ Cannot set both -r/-w and 'read-only' 
Cannot set both -c and the cache options

Cannot set both -c and the cache options

Cannot set both -c and the cache options



=== Check that invalid options are handled correctly ===



Parameter 'read-only' expects 'on' or 'off'

Parameter 'cache.no-flush' expects 'on' or 'off'

Parameter 'cache.direct' expects 'on' or 'off'

Parameter 'auto-read-only' expects 'on' or 'off'

*** done