mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: Pass QDict to blockdev_init()

Browse Source 
Working on a QDict instead of a QemuOpts that accepts anything is more
in line with bdrv_open(). A QDict is what qmp_blockdev_add() already has
anyway, so this saves additional conversions. And last, but not least,
it allows later patches to easily extract legacy options into a
separate, typed QemuOpts for drive_init() (the untyped QemuOpts that
drive_init already has doesn't allow access to numbers, only strings,
and is therefore useless without conversion).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2013-09-10 12:01:20 +02:00
parent 326642bc7f
commit f298d07166
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
blockdev.c
View File

@ -217,7 +217,10 @@ static void bdrv_format_print(void *opaque, const char *name)
static void drive_uninit(DriveInfo *dinfo) static void drive_uninit(DriveInfo *dinfo)
{ {
qemu_opts_del(dinfo->opts); if (dinfo->opts) {
qemu_opts_del(dinfo->opts);
}
bdrv_unref(dinfo->bdrv); bdrv_unref(dinfo->bdrv);
g_free(dinfo->id); g_free(dinfo->id);
QTAILQ_REMOVE(&drives, dinfo, next); QTAILQ_REMOVE(&drives, dinfo, next);
@ -302,7 +305,8 @@ static bool check_throttle_config(ThrottleConfig *cfg, Error **errp)
return true; return true;
} }
static DriveInfo *blockdev_init(QemuOpts *all_opts, /* Takes the ownership of bs_opts */
static DriveInfo *blockdev_init(QDict *bs_opts,
BlockInterfaceType block_default_type) BlockInterfaceType block_default_type)
{ {
const char *buf; const char *buf;
@ -326,7 +330,6 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
int ret; int ret;
Error *error = NULL; Error *error = NULL;
QemuOpts *opts; QemuOpts *opts;
QDict *bs_opts;
const char *id; const char *id;
bool has_driver_specific_opts; bool has_driver_specific_opts;
BlockDriver *drv = NULL; BlockDriver *drv = NULL;
@ -334,9 +337,9 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
translation = BIOS_ATA_TRANSLATION_AUTO; translation = BIOS_ATA_TRANSLATION_AUTO;
media = MEDIA_DISK; media = MEDIA_DISK;
/* Check common options by copying from all_opts to opts, all other options /* Check common options by copying from bs_opts to opts, all other options
* are stored in bs_opts. */ * stay in bs_opts for processing by bdrv_open(). */
id = qemu_opts_id(all_opts); id = qdict_get_try_str(bs_opts, "id");
opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error); opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
if (error_is_set(&error)) { if (error_is_set(&error)) {
qerror_report_err(error); qerror_report_err(error);
@ -344,8 +347,6 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
return NULL; return NULL;
} }
bs_opts = qdict_new();
qemu_opts_to_qdict(all_opts, bs_opts);
qemu_opts_absorb_qdict(opts, bs_opts, &error); qemu_opts_absorb_qdict(opts, bs_opts, &error);
if (error_is_set(&error)) { if (error_is_set(&error)) {
qerror_report_err(error); qerror_report_err(error);
@ -630,7 +631,6 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
dinfo->heads = heads; dinfo->heads = heads;
dinfo->secs = secs; dinfo->secs = secs;
dinfo->trans = translation; dinfo->trans = translation;
dinfo->opts = all_opts;
dinfo->refcount = 1; dinfo->refcount = 1;
if (serial != NULL) { if (serial != NULL) {
dinfo->serial = g_strdup(serial); dinfo->serial = g_strdup(serial);
@ -755,6 +755,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
{ {
const char *value; const char *value;
DriveInfo *dinfo; DriveInfo *dinfo;
QDict *bs_opts;
/* Change legacy command line options into QMP ones */ /* Change legacy command line options into QMP ones */
qemu_opt_rename(all_opts, "iops", "throttling.iops-total"); qemu_opt_rename(all_opts, "iops", "throttling.iops-total");
@ -803,14 +804,19 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
qemu_opt_unset(all_opts, "cache"); qemu_opt_unset(all_opts, "cache");
} }
/* Get a QDict for processing the options */
bs_opts = qdict_new();
qemu_opts_to_qdict(all_opts, bs_opts);
/* Actual block device init: Functionality shared with blockdev-add */ /* Actual block device init: Functionality shared with blockdev-add */
dinfo = blockdev_init(all_opts, block_default_type); dinfo = blockdev_init(bs_opts, block_default_type);
if (dinfo == NULL) { if (dinfo == NULL) {
goto fail; goto fail;
} }
/* Set legacy DriveInfo fields */ /* Set legacy DriveInfo fields */
dinfo->enable_auto_del = true; dinfo->enable_auto_del = true;
dinfo->opts = all_opts;
fail: fail:
return dinfo; return dinfo;
@ -2109,13 +2115,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
qdict_flatten(qdict); qdict_flatten(qdict);
QemuOpts *opts = qemu_opts_from_qdict(&qemu_drive_opts, qdict, &local_err); dinfo = blockdev_init(qdict, IF_NONE);
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
goto fail;
}
dinfo = blockdev_init(opts, IF_NONE);
if (!dinfo) { if (!dinfo) {
error_setg(errp, "Could not open image"); error_setg(errp, "Could not open image");
goto fail; goto fail;