Commit 326642bc authored by Kevin Wolf's avatar Kevin Wolf
Browse files

blockdev: Separate ID generation from DriveInfo creation 



blockdev-add shouldn't automatically generate IDs, but will keep most of
the DriveInfo creation code.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent d26c9a15

blockdev.c

+17 −15
Original line number Diff line number Diff line
@@ -600,23 +600,25 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, 
        return NULL;

    }



    /* init */



    dinfo = g_malloc0(sizeof(*dinfo));

    if ((buf = qemu_opts_id(opts)) != NULL) {

        dinfo->id = g_strdup(buf);

    } else {

    /* no id supplied -> create one */

        dinfo->id = g_malloc0(32);

        if (type == IF_IDE || type == IF_SCSI)

    if (qemu_opts_id(opts) == NULL) {

        char *new_id;

        if (type == IF_IDE || type == IF_SCSI) {

            mediastr = (media == MEDIA_CDROM) ? "-cd" : "-hd";

        if (max_devs)

            snprintf(dinfo->id, 32, "%s%i%s%i",

                     if_name[type], bus_id, mediastr, unit_id);

        else

            snprintf(dinfo->id, 32, "%s%s%i",

                     if_name[type], mediastr, unit_id);

        }

        if (max_devs) {

            new_id = g_strdup_printf("%s%i%s%i", if_name[type], bus_id,

                                     mediastr, unit_id);

        } else {

            new_id = g_strdup_printf("%s%s%i", if_name[type],

                                     mediastr, unit_id);

        }

        qemu_opts_set_id(opts, new_id);

    }



    /* init */

    dinfo = g_malloc0(sizeof(*dinfo));

    dinfo->id = g_strdup(qemu_opts_id(opts));

    dinfo->bdrv = bdrv_new(dinfo->id);

    dinfo->bdrv->open_flags = snapshot ? BDRV_O_SNAPSHOT : 0;

    dinfo->bdrv->read_only = ro;

include/qemu/option.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ void qemu_opts_loc_restore(QemuOpts *opts); 
int qemu_opts_set(QemuOptsList *list, const char *id,

                  const char *name, const char *value);

const char *qemu_opts_id(QemuOpts *opts);

void qemu_opts_set_id(QemuOpts *opts, char *id);

void qemu_opts_del(QemuOpts *opts);

void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);

int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname);

util/qemu-option.c

+6 −0
Original line number Diff line number Diff line
@@ -834,6 +834,12 @@ const char *qemu_opts_id(QemuOpts *opts) 
    return opts->id;

}



/* The id string will be g_free()d by qemu_opts_del */

void qemu_opts_set_id(QemuOpts *opts, char *id)

{

    opts->id = id;

}



void qemu_opts_del(QemuOpts *opts)

{

    QemuOpt *opt;