[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/11] blockdev: Put BlockInterfaceType names and
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 04/11] blockdev: Put BlockInterfaceType names and max_devs in tables |
Date: |
Fri, 28 Jan 2011 11:21:39 +0100 |
Turns drive_init()'s lengthy conditional into a concise loop, and
makes the data available elsewhere.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.c | 51 +++++++++++++++++++++------------------------------
1 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 883117a..7156cd1 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.
@@ -173,11 +190,9 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi,
int *fatal_error)
if (default_to_scsi) {
type = IF_SCSI;
- max_devs = MAX_SCSI_DEVS;
pstrcpy(devname, sizeof(devname), "scsi");
} else {
type = IF_IDE;
- max_devs = MAX_IDE_DEVS;
pstrcpy(devname, sizeof(devname), "ide");
}
media = MEDIA_DISK;
@@ -199,38 +214,14 @@ 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) {
if (cyls < 1 || (type == IF_IDE && cyls > 16383)) {
--
1.7.2.3
- [Qemu-devel] [PATCH v2 03/11] blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h, (continued)
- [Qemu-devel] [PATCH v2 03/11] blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 02/11] blockdev: New drive_get_next(), replacing qdev_init_bdrv(), Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 08/11] blockdev: Factor drive_index_to_{bus, unit}_id out of drive_init(), Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 05/11] blockdev: Fix regression in -drive if=scsi, index=N, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 09/11] blockdev: New drive_get_by_index(), Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 07/11] blockdev: Replace drive_add()'s fmt, ... by optstr parameter, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 11/11] blockdev: Fix drive_add for drives without media, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 10/11] blockdev: Reject multiple definitions for the same drive, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 06/11] blockdev: Make drive_add() take explicit type, index parameters, Markus Armbruster, 2011/01/28
- [Qemu-devel] [PATCH v2 04/11] blockdev: Put BlockInterfaceType names and max_devs in tables,
Markus Armbruster <=
- [Qemu-devel] Re: [PATCH v2 00/11] -drive/drive_add fixes and cleanups, Kevin Wolf, 2011/01/31