block: Support driver specific options in drive_init()
Any non-default -drive options are now passed down to the block drivers. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
bb44619b06
commit
0006383e15
69
blockdev.c
69
blockdev.c
|
@ -22,6 +22,7 @@
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
|
|
||||||
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
|
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
|
||||||
|
extern QemuOptsList qemu_common_drive_opts;
|
||||||
|
|
||||||
static const char *const if_name[IF_COUNT] = {
|
static const char *const if_name[IF_COUNT] = {
|
||||||
[IF_NONE] = "none",
|
[IF_NONE] = "none",
|
||||||
|
@ -288,7 +289,7 @@ static bool do_check_io_limits(BlockIOLimit *io_limits, Error **errp)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
||||||
{
|
{
|
||||||
const char *buf;
|
const char *buf;
|
||||||
const char *file = NULL;
|
const char *file = NULL;
|
||||||
|
@ -311,10 +312,36 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
||||||
bool copy_on_read;
|
bool copy_on_read;
|
||||||
int ret;
|
int ret;
|
||||||
Error *error = NULL;
|
Error *error = NULL;
|
||||||
|
QemuOpts *opts;
|
||||||
|
QDict *bs_opts;
|
||||||
|
const char *id;
|
||||||
|
|
||||||
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
|
||||||
|
* are stored in bs_opts. */
|
||||||
|
id = qemu_opts_id(all_opts);
|
||||||
|
opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
|
||||||
|
if (error_is_set(&error)) {
|
||||||
|
qerror_report_err(error);
|
||||||
|
error_free(error);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bs_opts = qdict_new();
|
||||||
|
qemu_opts_to_qdict(all_opts, bs_opts);
|
||||||
|
qemu_opts_absorb_qdict(opts, bs_opts, &error);
|
||||||
|
if (error_is_set(&error)) {
|
||||||
|
qerror_report_err(error);
|
||||||
|
error_free(error);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
qdict_del(bs_opts, "id");
|
||||||
|
}
|
||||||
|
|
||||||
/* extract parameters */
|
/* extract parameters */
|
||||||
bus_id = qemu_opt_get_number(opts, "bus", 0);
|
bus_id = qemu_opt_get_number(opts, "bus", 0);
|
||||||
unit_id = qemu_opt_get_number(opts, "unit", -1);
|
unit_id = qemu_opt_get_number(opts, "unit", -1);
|
||||||
|
@ -565,7 +592,7 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
||||||
dinfo->heads = heads;
|
dinfo->heads = heads;
|
||||||
dinfo->secs = secs;
|
dinfo->secs = secs;
|
||||||
dinfo->trans = translation;
|
dinfo->trans = translation;
|
||||||
dinfo->opts = opts;
|
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);
|
||||||
|
@ -590,17 +617,20 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
||||||
case IF_MTD:
|
case IF_MTD:
|
||||||
break;
|
break;
|
||||||
case IF_VIRTIO:
|
case IF_VIRTIO:
|
||||||
|
{
|
||||||
/* add virtio block device */
|
/* add virtio block device */
|
||||||
opts = qemu_opts_create_nofail(qemu_find_opts("device"));
|
QemuOpts *devopts;
|
||||||
|
devopts = qemu_opts_create_nofail(qemu_find_opts("device"));
|
||||||
if (arch_type == QEMU_ARCH_S390X) {
|
if (arch_type == QEMU_ARCH_S390X) {
|
||||||
qemu_opt_set(opts, "driver", "virtio-blk-s390");
|
qemu_opt_set(devopts, "driver", "virtio-blk-s390");
|
||||||
} else {
|
} else {
|
||||||
qemu_opt_set(opts, "driver", "virtio-blk-pci");
|
qemu_opt_set(devopts, "driver", "virtio-blk-pci");
|
||||||
}
|
}
|
||||||
qemu_opt_set(opts, "drive", dinfo->id);
|
qemu_opt_set(devopts, "drive", dinfo->id);
|
||||||
if (devaddr)
|
if (devaddr)
|
||||||
qemu_opt_set(opts, "addr", devaddr);
|
qemu_opt_set(devopts, "addr", devaddr);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
@ -638,7 +668,9 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
||||||
error_report("warning: disabling copy_on_read on readonly drive");
|
error_report("warning: disabling copy_on_read on readonly drive");
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = bdrv_open(dinfo->bdrv, file, NULL, bdrv_flags, drv);
|
ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv);
|
||||||
|
bs_opts = NULL;
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (ret == -EMEDIUMTYPE) {
|
if (ret == -EMEDIUMTYPE) {
|
||||||
error_report("could not open disk image %s: not in %s format",
|
error_report("could not open disk image %s: not in %s format",
|
||||||
|
@ -652,9 +684,14 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type)
|
||||||
|
|
||||||
if (bdrv_key_required(dinfo->bdrv))
|
if (bdrv_key_required(dinfo->bdrv))
|
||||||
autostart = 0;
|
autostart = 0;
|
||||||
|
|
||||||
|
qemu_opts_del(opts);
|
||||||
|
|
||||||
return dinfo;
|
return dinfo;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
qemu_opts_del(opts);
|
||||||
|
QDECREF(bs_opts);
|
||||||
bdrv_delete(dinfo->bdrv);
|
bdrv_delete(dinfo->bdrv);
|
||||||
g_free(dinfo->id);
|
g_free(dinfo->id);
|
||||||
QTAILQ_REMOVE(&drives, dinfo, next);
|
QTAILQ_REMOVE(&drives, dinfo, next);
|
||||||
|
@ -1464,9 +1501,9 @@ BlockJobInfoList *qmp_query_block_jobs(Error **errp)
|
||||||
return dummy.next;
|
return dummy.next;
|
||||||
}
|
}
|
||||||
|
|
||||||
QemuOptsList qemu_drive_opts = {
|
QemuOptsList qemu_common_drive_opts = {
|
||||||
.name = "drive",
|
.name = "drive",
|
||||||
.head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head),
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_common_drive_opts.head),
|
||||||
.desc = {
|
.desc = {
|
||||||
{
|
{
|
||||||
.name = "bus",
|
.name = "bus",
|
||||||
|
@ -1585,3 +1622,15 @@ QemuOptsList qemu_drive_opts = {
|
||||||
{ /* end of list */ }
|
{ /* end of list */ }
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
QemuOptsList qemu_drive_opts = {
|
||||||
|
.name = "drive",
|
||||||
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head),
|
||||||
|
.desc = {
|
||||||
|
/*
|
||||||
|
* no elements => accept any params
|
||||||
|
* validation will happen later
|
||||||
|
*/
|
||||||
|
{ /* end of list */ }
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in New Issue