From patchwork Thu Jan 27 12:29:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 80671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DF14B7129 for ; Thu, 27 Jan 2011 23:48:23 +1100 (EST) Received: from localhost ([127.0.0.1]:54502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiRGU-0000xi-EC for incoming@patchwork.ozlabs.org; Thu, 27 Jan 2011 07:47:54 -0500 Received: from [140.186.70.92] (port=52977 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiQyc-0006uS-KE for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiQyW-0007fX-PY for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:26 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:58225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiQyV-0007dw-Tf for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:20 -0500 Received: from blackfin.pond.sub.org (p5B32BFB4.dip.t-dialin.net [91.50.191.180]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 0BE1B276FDA; Thu, 27 Jan 2011 13:29:17 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 8A4B9324; Thu, 27 Jan 2011 13:29:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 27 Jan 2011 13:29:11 +0100 Message-Id: <1296131356-27257-5-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1296131356-27257-1-git-send-email-armbru@redhat.com> References: <1296131356-27257-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, stefanha@gmail.com Subject: [Qemu-devel] [PATCH 04/10] blockdev: Put BlockInterfaceType names and max_devs in tables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Turns drive_init()'s lengthy conditional into a concise loop, and makes the data available elsewhere. Signed-off-by: Markus Armbruster --- blockdev.c | 49 +++++++++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 28 deletions(-) diff --git a/blockdev.c b/blockdev.c index 883117a..e8dd353 100644 --- a/blockdev.c +++ b/blockdev.c @@ -19,6 +19,23 @@ static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives); +static const char *const if_name[IF_COUNT] = { + [IF_NONE] = "none", + [IF_IDE] = "ide", + [IF_SCSI] = "scsi", + [IF_FLOPPY] = "floppy", + [IF_PFLASH] = "pflash", + [IF_MTD] = "mtd", + [IF_SD] = "sd", + [IF_VIRTIO] = "virtio", + [IF_XEN] = "xen", +}; + +static const int if_max_devs[IF_COUNT] = { + [IF_IDE] = MAX_IDE_DEVS, + [IF_SCSI] = MAX_SCSI_DEVS, +}; + /* * We automatically delete the drive when a device using it gets * unplugged. Questionable feature, but we can't just drop it. @@ -199,37 +216,13 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) if ((buf = qemu_opt_get(opts, "if")) != NULL) { pstrcpy(devname, sizeof(devname), buf); - if (!strcmp(buf, "ide")) { - type = IF_IDE; - max_devs = MAX_IDE_DEVS; - } else if (!strcmp(buf, "scsi")) { - type = IF_SCSI; - max_devs = MAX_SCSI_DEVS; - } else if (!strcmp(buf, "floppy")) { - type = IF_FLOPPY; - max_devs = 0; - } else if (!strcmp(buf, "pflash")) { - type = IF_PFLASH; - max_devs = 0; - } else if (!strcmp(buf, "mtd")) { - type = IF_MTD; - max_devs = 0; - } else if (!strcmp(buf, "sd")) { - type = IF_SD; - max_devs = 0; - } else if (!strcmp(buf, "virtio")) { - type = IF_VIRTIO; - max_devs = 0; - } else if (!strcmp(buf, "xen")) { - type = IF_XEN; - max_devs = 0; - } else if (!strcmp(buf, "none")) { - type = IF_NONE; - max_devs = 0; - } else { + 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; } + max_devs = if_max_devs[type]; } if (cyls || heads || secs) {