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

qemu-io: Put flag changes in the options QDict in reopen_f() 



When reopen_f() puts a block device in the reopen queue, some of the
new options are passed using a QDict, but others ("read-only" and the
cache options) are passed as flags.

This patch puts those flags in the QDict. This way the flags parameter
becomes redundant and we'll be able to get rid of it in a subsequent
patch.

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 295cf237

qemu-io-cmds.c

+26 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qapi/qmp/qdict.h"

#include "qemu-io.h"

#include "sysemu/block-backend.h"

#include "block/block.h"
@@ -1978,6 +1979,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv) 
    int flags = bs->open_flags;

    bool writethrough = !blk_enable_write_cache(blk);

    bool has_rw_option = false;

    bool has_cache_option = false;



    BlockReopenQueue *brq;

    Error *local_err = NULL;
@@ -1989,6 +1991,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv) 
                error_report("Invalid cache option: %s", optarg);

                return -EINVAL;

            }

            has_cache_option = true;

            break;

        case 'o':

            if (!qemu_opts_parse_noisily(&reopen_opts, optarg, 0)) {
@@ -2046,9 +2049,31 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv) 
    }



    qopts = qemu_opts_find(&reopen_opts, NULL);

    opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : NULL;

    opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : qdict_new();

    qemu_opts_reset(&reopen_opts);



    if (qdict_haskey(opts, BDRV_OPT_READ_ONLY)) {

        if (has_rw_option) {

            error_report("Cannot set both -r/-w and '" BDRV_OPT_READ_ONLY "'");

            qobject_unref(opts);

            return -EINVAL;

        }

    } else {

        qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));

    }



    if (qdict_haskey(opts, BDRV_OPT_CACHE_DIRECT) ||

        qdict_haskey(opts, BDRV_OPT_CACHE_NO_FLUSH)) {

        if (has_cache_option) {

            error_report("Cannot set both -c and the cache options");

            qobject_unref(opts);

            return -EINVAL;

        }

    } else {

        qdict_put_bool(opts, BDRV_OPT_CACHE_DIRECT, flags & BDRV_O_NOCACHE);

        qdict_put_bool(opts, BDRV_OPT_CACHE_NO_FLUSH, flags & BDRV_O_NO_FLUSH);

    }



    bdrv_subtree_drained_begin(bs);

    brq = bdrv_reopen_queue(NULL, bs, opts, flags);

    bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);

tests/qemu-iotests/133

+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,15 @@ echo 
IMGOPTSSYNTAX=false $QEMU_IO -f null-co -c 'reopen' -c 'info' \

    "json:{'driver': 'null-co', 'size': 65536}"



echo

echo "=== Check that mixing -c/-r/-w and their corresponding options is forbidden ==="

echo



$QEMU_IO -c 'reopen -r -o read-only=on' $TEST_IMG

$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

# success, all done

echo "*** done"

rm -f $seq.full

tests/qemu-iotests/133.out

+8 −0
Original line number Diff line number Diff line
@@ -24,4 +24,12 @@ Cannot change the option 'driver' 


format name: null-co

format name: null-co



=== Check that mixing -c/-r/-w and their corresponding options is forbidden ===



Cannot set both -r/-w and 'read-only'

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

*** done