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

blockdev: Move parsing of 'if' option to drive_init

Browse Source 
It's always IF_NONE for blockdev-add.

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-08-28 17:24:51 +02:00
parent 33cb7dc8b7
commit 593d464bd4
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
blockdev.c
View File

@ -309,14 +309,13 @@ typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType;
/* Takes the ownership of bs_opts */ /* Takes the ownership of bs_opts */
static DriveInfo *blockdev_init(QDict *bs_opts, static DriveInfo *blockdev_init(QDict *bs_opts,
BlockInterfaceType block_default_type, BlockInterfaceType type,
DriveMediaType media) DriveMediaType media)
{ {
const char *buf; const char *buf;
const char *file = NULL; const char *file = NULL;
const char *serial; const char *serial;
const char *mediastr = ""; const char *mediastr = "";
BlockInterfaceType type;
int bus_id, unit_id; int bus_id, unit_id;
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
int max_devs; int max_devs;
@ -377,17 +376,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
file = qemu_opt_get(opts, "file"); file = qemu_opt_get(opts, "file");
serial = qemu_opt_get(opts, "serial"); serial = qemu_opt_get(opts, "serial");
if ((buf = qemu_opt_get(opts, "if")) != NULL) {
for (type = 0; type < IF_COUNT && strcmp(buf, if_name[type]); type++)
;
if (type == IF_COUNT) {
error_report("unsupported bus type '%s'", buf);
return NULL;
}
} else {
type = block_default_type;
}
max_devs = if_max_devs[type]; max_devs = if_max_devs[type];
if (cyls || heads || secs) { if (cyls || heads || secs) {
@ -752,6 +740,10 @@ QemuOptsList qemu_legacy_drive_opts = {
.name = "media", .name = "media",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "media type (disk, cdrom)", .help = "media type (disk, cdrom)",
},{
.name = "if",
.type = QEMU_OPT_STRING,
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
}, },
{ /* end of list */ } { /* end of list */ }
}, },
@ -764,6 +756,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
QDict *bs_opts; QDict *bs_opts;
QemuOpts *legacy_opts; QemuOpts *legacy_opts;
DriveMediaType media = MEDIA_DISK; DriveMediaType media = MEDIA_DISK;
BlockInterfaceType type;
Error *local_err = NULL; Error *local_err = NULL;
/* Change legacy command line options into QMP ones */ /* Change legacy command line options into QMP ones */
@ -838,8 +831,23 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
} }
} }
/* Controller type */
value = qemu_opt_get(legacy_opts, "if");
if (value) {
for (type = 0;
type < IF_COUNT && strcmp(value, if_name[type]);
type++) {
}
if (type == IF_COUNT) {
error_report("unsupported bus type '%s'", value);
goto fail;
}
} else {
type = block_default_type;
}
/* Actual block device init: Functionality shared with blockdev-add */ /* Actual block device init: Functionality shared with blockdev-add */
dinfo = blockdev_init(bs_opts, block_default_type, media); dinfo = blockdev_init(bs_opts, type, media);
if (dinfo == NULL) { if (dinfo == NULL) {
goto fail; goto fail;
} }
@ -2190,10 +2198,6 @@ QemuOptsList qemu_common_drive_opts = {
.name = "unit", .name = "unit",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "unit number (i.e. lun for scsi)", .help = "unit number (i.e. lun for scsi)",
},{
.name = "if",
.type = QEMU_OPT_STRING,
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
},{ },{
.name = "index", .name = "index",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,