Commit 74fe54f2 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Allow "driver" option on the top level 



This is traditionally -drive format=..., which is now translated into
the new driver option. This gives us a more consistent way to select the
driver of BlockDriverStates that can be used in QMP context, too.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 69dd62df

block.c

+7 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, 
    char tmp_filename[PATH_MAX + 1];

    BlockDriverState *file = NULL;

    QDict *file_options = NULL;

    const char *drvname;



    /* NULL means an empty set of options */

    if (options == NULL) {
@@ -1059,6 +1060,12 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, 
    }



    /* Find the right image format driver */

    drvname = qdict_get_try_str(options, "driver");

    if (drvname) {

        drv = bdrv_find_whitelisted_format(drvname, !(flags & BDRV_O_RDWR));

        qdict_del(options, "driver");

    }



    if (!drv) {

        ret = find_image_format(file, filename, &drv);

    }

blockdev.c

+10 −10
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    enum { MEDIA_DISK, MEDIA_CDROM } media;

    int bus_id, unit_id;

    int cyls, heads, secs, translation;

    BlockDriver *drv = NULL;

    int max_devs;

    int index;

    int ro = 0;
@@ -338,6 +337,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    QemuOpts *opts;

    QDict *bs_opts;

    const char *id;

    bool has_driver_specific_opts;



    translation = BIOS_ATA_TRANSLATION_AUTO;

    media = MEDIA_DISK;
@@ -365,6 +365,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        qdict_del(bs_opts, "id");

    }



    has_driver_specific_opts = !!qdict_size(bs_opts);



    /* extract parameters */

    bus_id  = qemu_opt_get_number(opts, "bus", 0);

    unit_id = qemu_opt_get_number(opts, "unit", -1);
@@ -477,11 +479,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
            error_printf("\n");

            return NULL;

        }

        drv = bdrv_find_whitelisted_format(buf, ro);

        if (!drv) {

            error_report("'%s' invalid format", buf);

            return NULL;

        }



        qdict_put(bs_opts, "driver", qstring_from_str(buf));

    }



    /* disk I/O throttling */
@@ -658,7 +657,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        abort();

    }

    if (!file || !*file) {

        if (qdict_size(bs_opts)) {

        if (has_driver_specific_opts) {

            file = NULL;

        } else {

            return dinfo;
@@ -695,13 +694,13 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        error_report("warning: disabling copy_on_read on readonly drive");

    }



    ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv);

    bs_opts = NULL;

    QINCREF(bs_opts);

    ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, NULL);



    if (ret < 0) {

        if (ret == -EMEDIUMTYPE) {

            error_report("could not open disk image %s: not in %s format",

                         file ?: dinfo->id, drv->format_name);

                         file ?: dinfo->id, qdict_get_str(bs_opts, "driver"));

        } else {

            error_report("could not open disk image %s: %s",

                         file ?: dinfo->id, strerror(-ret));
@@ -712,6 +711,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    if (bdrv_key_required(dinfo->bdrv))

        autostart = 0;



    QDECREF(bs_opts);

    qemu_opts_del(opts);



    return dinfo;