From patchwork Fri Oct 11 15:05:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 282813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80D682C0185 for ; Sat, 12 Oct 2013 02:30:17 +1100 (EST) Received: from localhost ([::1]:55024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUefP-0005zu-Bo for incoming@patchwork.ozlabs.org; Fri, 11 Oct 2013 11:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJU-0000dv-Dk for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUeJN-0005wr-MH for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJN-0005wl-EY for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:29 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9BF7SHm012416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Oct 2013 11:07:28 -0400 Received: from dhcp-200-207.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r9BF5s36006329; Fri, 11 Oct 2013 11:07:27 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 11 Oct 2013 17:05:39 +0200 Message-Id: <1381503951-27985-50-git-send-email-kwolf@redhat.com> In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com> References: <1381503951-27985-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 49/61] blockdev: Move parsing of 'if' option to drive_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's always IF_NONE for blockdev-add. Signed-off-by: Kevin Wolf Reviewed-by: Benoit Canet Reviewed-by: Eric Blake --- blockdev.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/blockdev.c b/blockdev.c index 149ddc1..e25f0b8 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) { @@ -752,6 +740,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 */ } }, @@ -764,6 +756,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 */ @@ -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 */ - 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",