[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 08/17] blockdev: Move parsing of 'if' option
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v2 08/17] blockdev: Move parsing of 'if' option to drive_init |
Date: |
Tue, 1 Oct 2013 16:44:41 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Le Tuesday 01 Oct 2013 à 15:20:10 (+0200), Kevin Wolf a écrit :
> It's always IF_NONE for blockdev-add.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> blockdev.c | 40 ++++++++++++++++++++++------------------
> 1 file changed, 22 insertions(+), 18 deletions(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index d364dca..ce1208f 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -309,14 +309,13 @@ typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType;
>
> /* Takes the ownership of bs_opts */
> static DriveInfo *blockdev_init(QDict *bs_opts,
> - BlockInterfaceType block_default_type,
> + BlockInterfaceType type,
> DriveMediaType media)
> {
> const char *buf;
> const char *file = NULL;
> const char *serial;
> const char *mediastr = "";
> - BlockInterfaceType type;
> int bus_id, unit_id;
> int cyls, heads, secs, translation;
> int max_devs;
> @@ -377,17 +376,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
> file = qemu_opt_get(opts, "file");
> 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];
>
> if (cyls || heads || secs) {
> @@ -756,6 +744,10 @@ QemuOptsList qemu_legacy_drive_opts = {
> .name = "media",
> .type = QEMU_OPT_STRING,
> .help = "media type (disk, cdrom)",
> + },{
> + .name = "if",
> + .type = QEMU_OPT_STRING,
> + .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
> },
> { /* end of list */ }
> },
> @@ -768,6 +760,7 @@ DriveInfo *drive_init(QemuOpts *all_opts,
> BlockInterfaceType block_default_type)
> QDict *bs_opts;
> QemuOpts *legacy_opts;
> DriveMediaType media = MEDIA_DISK;
> + BlockInterfaceType type;
> Error *local_err = NULL;
>
> /* Change legacy command line options into QMP ones */
> @@ -842,8 +835,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 */
> - dinfo = blockdev_init(bs_opts, block_default_type, media);
> + dinfo = blockdev_init(bs_opts, type, media);
> if (dinfo == NULL) {
> goto fail;
> }
> @@ -2191,10 +2199,6 @@ QemuOptsList qemu_common_drive_opts = {
> .type = QEMU_OPT_NUMBER,
> .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",
> .type = QEMU_OPT_NUMBER,
> .help = "index number",
> --
> 1.8.1.4
>
Reviewed-by: Benoit Canet <address@hidden>
- [Qemu-devel] [PATCH v2 13/17] blockdev: Remove IF_* check for read-only blockdev_init, (continued)
- [Qemu-devel] [PATCH v2 13/17] blockdev: Remove IF_* check for read-only blockdev_init, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 03/17] blockdev: Introduce DriveInfo.enable_auto_del, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 15/17] blockdev: Remove 'media' parameter from blockdev_init(), Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 16/17] blockdev: Don't disable COR automatically with blockdev-add, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 17/17] blockdev: blockdev_init() error conversion, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 08/17] blockdev: Move parsing of 'if' option to drive_init, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 07/17] blockdev: Move parsing of 'media' option to drive_init, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 14/17] qemu-iotests: Check autodel behaviour for device_del, Kevin Wolf, 2013/10/01
- Re: [Qemu-devel] [PATCH v2 00/17] blockdev-add QMP command, Eric Blake, 2013/10/01