Commit 06d22aa3 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Fail if requested driver is not available 



If an explicit driver option is present, but doesn't specify a valid
driver, then bdrv_open() should fail instead of probing the format.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent f05b328c

block.c

+5 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,11 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, 
    if (drvname) {

        drv = bdrv_find_format(drvname);

        qdict_del(options, "driver");

        if (!drv) {

            error_setg(errp, "Invalid driver: '%s'", drvname);

            ret = -EINVAL;

            goto unlink_and_fail;

        }

    }



    if (!drv) {

tests/qemu-iotests/051

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,13 @@ run_qemu -drive file="$TEST_IMG",format=qcow2,unknown_opt=on 
run_qemu -drive file="$TEST_IMG",format=qcow2,unknown_opt=1234

run_qemu -drive file="$TEST_IMG",format=qcow2,unknown_opt=foo



echo

echo === Invalid format ===

echo



run_qemu -drive file="$TEST_IMG",format=foo

run_qemu -drive file="$TEST_IMG",driver=foo



echo

echo === Overriding backing file ===

echo

tests/qemu-iotests/051.out

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo 
QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used by device 'ide0-hd0' doesn't support the option 'unknown_opt'





=== Invalid format ===



Testing: -drive file=TEST_DIR/t.qcow2,format=foo

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=foo: 'foo' invalid format



Testing: -drive file=TEST_DIR/t.qcow2,driver=foo

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=foo: could not open disk image TEST_DIR/t.qcow2: Invalid driver: 'foo'





=== Overriding backing file ===



Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig -nodefaults