From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Irars-0006QB-Qc
	for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Irarp-0006Ob-KE
	for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:27 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Irarp-0006OW-Bu
	for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:25 -0500
Received: from ecfrec.frec.bull.fr ([129.183.4.8])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Laurent.Vivier@bull.net>) id 1Irarm-0001dY-W0
	for qemu-devel@nongnu.org; Mon, 12 Nov 2007 10:06:25 -0500
Received: from localhost (localhost [127.0.0.1])
	by ecfrec.frec.bull.fr (Postfix) with ESMTP id 049A519D93E
	for <qemu-devel@nongnu.org>; Mon, 12 Nov 2007 16:05:46 +0100 (CET)
Received: from ecfrec.frec.bull.fr ([127.0.0.1])
	by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 19831-02 for <qemu-devel@nongnu.org>;
	Mon, 12 Nov 2007 16:05:41 +0100 (CET)
Received: from ecn002.frec.bull.fr (ecn002.frec.bull.fr [129.183.4.6])
	by ecfrec.frec.bull.fr (Postfix) with ESMTP id 8357319D94F
	for <qemu-devel@nongnu.org>; Mon, 12 Nov 2007 16:05:38 +0100 (CET)
In-Reply-To: <1194879921937@bull.net>
Date: Mon, 12 Nov 2007 16:05:21 +0100
Message-Id: <11948799213737@bull.net>
Mime-Version: 1.0
From: Laurent Vivier <Laurent.Vivier@bull.net>
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PATCH 2/2][UPDATE] Add arg -drive to define new drive
	with more features
Reply-To: Laurent Vivier <Laurent.Vivier@bull.net>, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: qemu-devel@nongnu.org


This patch introduces a new parameter allowing to define drives.

The new parameter is "-drive":

    -drive [file=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,cy=
ls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][snapshot=3Don|off]

where:

    file is the disk image
    type is the interface type (ide, scsi, sd, mtd, floppy, pflash)
    n is the bus number of the given type
    m is the unit number on the given bus
    d is the type of the media (disk, cdrom)
    c,h,s,t are the parameters usually given by -hdachs
    snapshot allows to enable or not the snapshot for this disk

"-cdrom file" is an alias for "-drive file=3Dfile,bus=3D1,unit=3D0,media=3D=
cdrom"
"-hda file" is an alias for "-drive file=3Dfile,bus=3D0,unit=3D0,media=3D=
disk"
"-hdb file" is an alias for "-drive file=3Dfile,bus=3D0,unit=3D1,media=3D=
disk"
"-hdc file" is an alias for "-drive file=3Dfile,bus=3D1,unit=3D0,media=3D=
disk"
"-hdd file" is an alias for "-drive file=3Dfile,bus=3D1,unit=3D1,media=3D=
disk"
"-hda file -hdachs a,b,c" is an alias for=20
                 "-drive file=3Dfile,bus=3D0,unit=3D0,cyls=3Da,heads=3Db,=
secs=3Dc"

You can also define a cdrom on the slace of ide0 with:
"-drive file=3Dfile,if=3Dide,bus=3D0,unit=3D1,media=3Dcdrom"

You can define an empty cdrom:
"-drive if=3Dide,bus=3D0,unit=3D1,media=3Dcdrom"

"-drive file=3Dfile,if=3Dscsi,bus=3D0,unit=3D6" allows to connect the dis=
k image file=20
to the scsi bus 0 with the unit id 6.

if there is no SCSI disk, the SCSI interface is not created.

It also defines the default interface type to "scsi" for targets
"realview", "SS-5", "SS-10", "versatilepb", "versatileab"
to keep old behavior, where "-hda" is a SCSI disk.

"-fda file" is an alias for "-drive file=3Dfile,unit=3D0,if=3Dfloppy"
"-fdb file" is an alias for "-drive file=3Dfile,unit=3D1,if=3Dfloppy"
"-pflash file" is an alias for "-drive file=3Dfile,if=3Dpflash"
"-mtdblock file" is an alias for "-drive file=3Dfile,if=3Dmtd"
"-sd file" becomes the alias of "-drive file=3Dfile,if=3Dsd"

"-drive file=3Da -drive file=3Db" will be interpreted like "-hda a -hdb b=
"
---
 hw/esp.c           |   10 -
 hw/integratorcp.c  |    8
 hw/lsi53c895a.c    |    3
 hw/mips_malta.c    |   15 +
 hw/mips_pica61.c   |   21 +-
 hw/mips_r4k.c      |   17 +
 hw/nand.c          |    2
 hw/omap_mmc.c      |    2
 hw/pc.c            |   65 ++++--
 hw/ppc405_boards.c |   29 +-
 hw/ppc_chrp.c      |   17 +
 hw/ppc_oldworld.c  |   31 ++-
 hw/ppc_prep.c      |   27 ++
 hw/pxa2xx_mmci.c   |    3
 hw/realview.c      |   17 +
 hw/spitz.c         |    9
 hw/esp.c           |   10 -
 hw/integratorcp.c  |    8=20
 hw/lsi53c895a.c    |    3=20
 hw/mips_malta.c    |   15 +
 hw/mips_pica61.c   |   21 +-
 hw/mips_r4k.c      |   17 +
 hw/nand.c          |    2=20
 hw/omap_mmc.c      |    2=20
 hw/pc.c            |   65 ++++--
 hw/ppc405_boards.c |   29 +-
 hw/ppc_chrp.c      |   17 +
 hw/ppc_oldworld.c  |   31 ++-
 hw/ppc_prep.c      |   27 ++
 hw/pxa2xx_mmci.c   |    3=20
 hw/realview.c      |   17 +
 hw/spitz.c         |    9=20
 hw/sun4m.c         |   26 +-
 hw/sun4u.c         |   24 ++
 hw/versatilepb.c   |   18 +
 monitor.c          |   11 -
 vl.c               |  527 +++++++++++++++++++++++++++++++++++-----------=
-------
 vl.h               |   32 ++-
 22 files changed, 644 insertions(+), 270 deletions(-)

Index: qemu/vl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/vl.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/vl.c	2007-11-12 14:59:45.000000000 +0100
@@ -149,12 +149,10 @@ char phys_ram_file[1024];
 void *ioport_opaque[MAX_IOPORTS];
 IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS];
 IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
-/* Note: bs_table[MAX_DISKS] is a dummy block driver if none available
+/* Note: drives_table[MAX_DRIVES] is a dummy block driver if none availa=
ble
    to store the VM snapshots */
-BlockDriverState *bs_table[MAX_DISKS + 1], *fd_table[MAX_FD];
-BlockDriverState *pflash_table[MAX_PFLASH];
-BlockDriverState *sd_bdrv;
-BlockDriverState *mtd_bdrv;
+DriveInfo drives_table[MAX_DRIVES+1];
+int nb_drives;
 /* point to the block driver where the snapshots are managed */
 BlockDriverState *bs_snapshots;
 int vga_ram_size;
@@ -218,6 +216,8 @@ int alt_grab =3D 0;
 unsigned int nb_prom_envs =3D 0;
 const char *prom_envs[MAX_PROM_ENVS];
 #endif
+int nb_drives_opt;
+char drives_opt[MAX_DRIVES][1024];
=20
 #define TFR(expr) do { if ((expr) !=3D -1) break; } while (errno =3D=3D =
EINTR)
=20
@@ -1734,12 +1734,9 @@ static int mux_proc_byte(CharDriverState
         case 's':
             {
                 int i;
-                for (i =3D 0; i < MAX_DISKS; i++) {
-                    if (bs_table[i])
-                        bdrv_commit(bs_table[i]);
+                for (i =3D 0; i < nb_drives; i++) {
+                        bdrv_commit(drives_table[i].bdrv);
                 }
-                if (mtd_bdrv)
-                    bdrv_commit(mtd_bdrv);
             }
             break;
         case 'b':
@@ -4692,6 +4689,276 @@ void do_info_network(void)
     }
 }
=20
+#define HD_ALIAS "file=3D%s,bus=3D%d,unit=3D%d,media=3Ddisk"
+#ifdef TARGET_PPC
+#define CDROM_ALIAS "bus=3D0,unit=3D1,media=3Dcdrom"
+#else
+#define CDROM_ALIAS "bus=3D1,unit=3D0,media=3Dcdrom"
+#endif
+#define FD_ALIAS "unit=3D%d,if=3Dfloppy"
+#define PFLASH_ALIAS "file=3D%s,if=3Dpflash"
+#define MTD_ALIAS "file=3D%s,if=3Dmtd"
+#define SD_ALIAS "file=3D%s,if=3Dsd"
+
+static int drive_add(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (nb_drives_opt >=3D MAX_DRIVES) {
+        fprintf(stderr, "qemu: too many drives\n");
+        exit(1);
+    }
+
+    va_start(ap, fmt);
+    vsnprintf(drives_opt[nb_drives_opt], sizeof(drives_opt[0]), fmt, ap)=
;
+    va_end(ap);
+
+    return nb_drives_opt++;
+}
+
+int drive_get_index(BlockInterfaceType interface, int bus, int unit)
+{
+    int index;
+
+    /* seek interface, bus and unit */
+
+    for (index =3D 0; index < nb_drives; index++)
+        if (drives_table[index].interface =3D=3D interface &&
+	    drives_table[index].bus =3D=3D bus &&
+	    drives_table[index].unit =3D=3D unit)
+        return index;
+
+    return -1;
+}
+
+int drive_get_max_bus(BlockInterfaceType interface)
+{
+    int max_bus;
+    int index;
+
+    max_bus =3D -1;
+    for (index =3D 0; index < nb_drives; index++) {
+        if(drives_table[index].interface =3D=3D interface &&
+           drives_table[index].bus > max_bus)
+            max_bus =3D drives_table[index].bus;
+    }
+    return max_bus;
+}
+
+static int drive_init(const char *str, int snapshot, QEMUMachine *machin=
e)
+{
+    char buf[16];
+    char file[1024];
+    BlockInterfaceType interface;
+    enum { MEDIA_DISK, MEDIA_CDROM } media;
+    int bus_id, unit_id;
+    int cyls, heads, secs, translation;
+    BlockDriverState *bdrv;
+    int max_devs;
+
+    file[0] =3D 0;
+    cyls =3D heads =3D secs =3D 0;
+    bus_id =3D 0;
+    unit_id =3D -1;
+    translation =3D BIOS_ATA_TRANSLATION_AUTO;
+
+    if (!strcmp(machine->name, "realview") ||
+        !strcmp(machine->name, "SS-5") ||
+        !strcmp(machine->name, "SS-10") ||
+        !strcmp(machine->name, "versatilepb") ||
+        !strcmp(machine->name, "versatileab")) {
+        interface =3D IF_SCSI;
+        max_devs =3D MAX_SCSI_DEVS;
+    } else {
+        interface =3D IF_IDE;
+        max_devs =3D MAX_IDE_DEVS;
+    }
+    media =3D MEDIA_DISK;
+
+    /* extract parameters */
+
+    if (get_param_value(buf, sizeof(buf), "bus", str)) {
+        bus_id =3D strtol(buf, NULL, 0);
+	if (bus_id < 0) {
+	    fprintf(stderr, "qemu: invalid bus id\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "unit", str)) {
+        unit_id =3D strtol(buf, NULL, 0);
+	if (unit_id < 0) {
+	    fprintf(stderr, "qemu: invalid unit id\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "cyls", str)) {
+        cyls =3D strtol(buf, NULL, 0);
+        if (cyls < 1 || cyls > 16383) {
+            fprintf(stderr, "qemu: invalid physical cyls number\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "heads", str)) {
+        heads =3D strtol(buf, NULL, 0);
+        if (heads < 1 || heads > 16) {
+            fprintf(stderr, "qemu: invalid physical heads number\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "secs", str)) {
+        secs =3D strtol(buf, NULL, 0);
+            if (secs < 1 || secs > 63) {
+            fprintf(stderr, "qemu: invalid physical secs number\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "if", str)) {
+        if (!strcmp(buf, "ide")) {
+	    interface =3D IF_IDE;
+            max_devs =3D MAX_IDE_DEVS;
+        } else if (!strcmp(buf, "scsi")) {
+	    interface =3D IF_SCSI;
+            max_devs =3D MAX_SCSI_DEVS;
+        } else if (!strcmp(buf, "floppy")) {
+	    interface =3D IF_FLOPPY;
+            max_devs =3D 0;
+        } else if (!strcmp(buf, "pflash")) {
+	    interface =3D IF_PFLASH;
+            max_devs =3D 0;
+	} else if (!strcmp(buf, "mtd")) {
+	    interface =3D IF_MTD;
+            max_devs =3D 0;
+	} else if (!strcmp(buf, "sd")) {
+	    interface =3D IF_SD;
+            max_devs =3D 0;
+	} else {
+            fprintf(stderr, "unsupported bus type '%s'\n", buf);
+            return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "trans", str)) {
+        if (!strcmp(buf, "none"))
+            translation =3D BIOS_ATA_TRANSLATION_NONE;
+        else if (!strcmp(buf, "lba"))
+            translation =3D BIOS_ATA_TRANSLATION_LBA;
+        else if (!strcmp(buf, "auto"))
+            translation =3D BIOS_ATA_TRANSLATION_AUTO;
+	else {
+            fprintf(stderr, "qemu: invalid translation type\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "media", str)) {
+        if (!strcmp(buf, "disk")) {
+	    media =3D MEDIA_DISK;
+	} else if (!strcmp(buf, "cdrom")) {
+            if (cyls || secs || heads) {
+                fprintf(stderr, "qemu: invalid physical CHS format\n");
+	        return -1;
+            }
+	    media =3D MEDIA_CDROM;
+	} else {
+	    fprintf(stderr, "qemu: invalid media\n");
+	    return -1;
+	}
+    }
+
+    if (get_param_value(buf, sizeof(buf), "snapshot", str)) {
+        if (!strcmp(buf, "on"))
+	    snapshot =3D 1;
+        else if (!strcmp(buf, "off"))
+	    snapshot =3D 0;
+	else {
+	    fprintf(stderr, "qemu: invalid snapshot option\n");
+	    return -1;
+	}
+    }
+
+    get_param_value(file, sizeof(file), "file", str);
+
+    /* if user doesn't specify a unit_id,
+     * try to find the first free
+     */
+
+    if (unit_id =3D=3D -1) {
+       unit_id =3D 0;
+       while (drive_get_index(interface, bus_id, unit_id) !=3D -1) {
+           unit_id++;
+           if (max_devs && unit_id >=3D max_devs) {
+               unit_id -=3D max_devs;
+               bus_id++;
+           }
+       }
+    }
+
+    /* check unit id */
+
+    if (max_devs && unit_id >=3D max_devs) {
+        fprintf(stderr, "qemu: unit %d too big on bus %d (max is %d)\n",
+                        unit_id, bus_id, max_devs - 1);
+        exit(1);
+    }
+
+    /*
+     * ignore multiple definitions
+     */
+
+    if (drive_get_index(interface, bus_id, unit_id) !=3D -1)
+        return 0;
+
+    /* init */
+
+    snprintf(buf, sizeof(buf), "drive%d", nb_drives);
+    bdrv =3D bdrv_new(buf);
+    drives_table[nb_drives].bdrv =3D bdrv;
+    drives_table[nb_drives].interface =3D interface;
+    drives_table[nb_drives].bus =3D bus_id;
+    drives_table[nb_drives].unit =3D unit_id;
+    nb_drives++;
+
+    switch(interface) {
+    case IF_IDE:
+    case IF_SCSI:
+        switch(media) {
+	case MEDIA_DISK:
+            if (cyls !=3D 0) {
+                bdrv_set_geometry_hint(bdrv, cyls, heads, secs);
+                bdrv_set_translation_hint(bdrv, translation);
+            }
+	    break;
+	case MEDIA_CDROM:
+            bdrv_set_type_hint(bdrv, BDRV_TYPE_CDROM);
+	    break;
+	}
+        break;
+    case IF_SD:
+        /* FIXME: This isn't really a floppy, but it's a reasonable
+           approximation.  */
+    case IF_FLOPPY:
+        bdrv_set_type_hint(bdrv, BDRV_TYPE_FLOPPY);
+        break;
+    case IF_PFLASH:
+    case IF_MTD:
+        break;
+    }
+    if (!file[0])
+        return 0;
+    if (bdrv_open(bdrv, file, snapshot ? BDRV_O_SNAPSHOT : 0) < 0 ||
+        qemu_key_check(bdrv, file)) {
+        fprintf(stderr, "qemu: could not open disk image %s\n",
+                        file);
+        return -1;
+    }
+    return 0;
+}
+
 /***********************************************************/
 /* USB devices */
=20
@@ -5475,8 +5742,8 @@ static BlockDriverState *get_bs_snapshot
=20
     if (bs_snapshots)
         return bs_snapshots;
-    for(i =3D 0; i <=3D MAX_DISKS; i++) {
-        bs =3D bs_table[i];
+    for(i =3D 0; i <=3D nb_drives; i++) {
+        bs =3D drives_table[i].bdrv;
         if (bdrv_can_snapshot(bs))
             goto ok;
     }
@@ -5584,8 +5851,8 @@ void do_savevm(const char *name)
=20
     /* create the snapshots */
=20
-    for(i =3D 0; i < MAX_DISKS; i++) {
-        bs1 =3D bs_table[i];
+    for(i =3D 0; i < nb_drives; i++) {
+        bs1 =3D drives_table[i].bdrv;
         if (bdrv_has_snapshot(bs1)) {
             if (must_delete) {
                 ret =3D bdrv_snapshot_delete(bs1, old_sn->id_str);
@@ -5627,8 +5894,8 @@ void do_loadvm(const char *name)
     saved_vm_running =3D vm_running;
     vm_stop(0);
=20
-    for(i =3D 0; i <=3D MAX_DISKS; i++) {
-        bs1 =3D bs_table[i];
+    for(i =3D 0; i <=3D nb_drives; i++) {
+        bs1 =3D drives_table[i].bdrv;
         if (bdrv_has_snapshot(bs1)) {
             ret =3D bdrv_snapshot_goto(bs1, name);
             if (ret < 0) {
@@ -5688,8 +5955,8 @@ void do_delvm(const char *name)
         return;
     }
=20
-    for(i =3D 0; i <=3D MAX_DISKS; i++) {
-        bs1 =3D bs_table[i];
+    for(i =3D 0; i <=3D nb_drives; i++) {
+        bs1 =3D drives_table[i].bdrv;
         if (bdrv_has_snapshot(bs1)) {
             ret =3D bdrv_snapshot_delete(bs1, name);
             if (ret < 0) {
@@ -5717,8 +5984,8 @@ void do_info_snapshots(void)
         return;
     }
     term_printf("Snapshot devices:");
-    for(i =3D 0; i <=3D MAX_DISKS; i++) {
-        bs1 =3D bs_table[i];
+    for(i =3D 0; i <=3D nb_drives; i++) {
+        bs1 =3D drives_table[i].bdrv;
         if (bdrv_has_snapshot(bs1)) {
             if (bs =3D=3D bs1)
                 term_printf(" %s", bdrv_get_device_name(bs1));
@@ -6468,15 +6735,14 @@ static void ram_save(QEMUFile *f, void *
             /* find if the memory block is available on a virtual
                block device */
             sector_num =3D -1;
-            for(j =3D 0; j < MAX_DISKS; j++) {
-                if (bs_table[j]) {
-                    sector_num =3D bdrv_hash_find(bs_table[j],
-                                                phys_ram_base + i, BDRV_=
HASH_BLOCK_SIZE);
-                    if (sector_num >=3D 0)
-                        break;
-                }
+            for(j =3D 0; j < nb_drives; j++) {
+                sector_num =3D bdrv_hash_find(drives_table[j].bdrv,
+                                            phys_ram_base + i,
+					    BDRV_HASH_BLOCK_SIZE);
+                if (sector_num >=3D 0)
+                    break;
             }
-            if (j =3D=3D MAX_DISKS)
+            if (j =3D=3D nb_drives)
                 goto normal_compress;
             buf[0] =3D 1;
             buf[1] =3D j;
@@ -6527,11 +6793,12 @@ static int ram_load(QEMUFile *f, void *o
             ram_decompress_buf(s, buf + 1, 9);
             bs_index =3D buf[1];
             sector_num =3D be64_to_cpupu((const uint64_t *)(buf + 2));
-            if (bs_index >=3D MAX_DISKS || bs_table[bs_index] =3D=3D NUL=
L) {
+            if (bs_index >=3D nb_drives) {
                 fprintf(stderr, "Invalid block device index %d\n", bs_in=
dex);
                 goto error;
             }
-            if (bdrv_read(bs_table[bs_index], sector_num, phys_ram_base =
+ i,
+            if (bdrv_read(drives_table[bs_index].bdrv, sector_num,
+	                  phys_ram_base + i,
                           BDRV_HASH_BLOCK_SIZE / 512) < 0) {
                 fprintf(stderr, "Error while reading sector %d:%" PRId64=
 "\n",
                         bs_index, sector_num);
@@ -7028,6 +7295,8 @@ static void help(int exitcode)
            "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n"
            "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n"
            "-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1=
 master)\n"
+	   "-drive [file=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,=
cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][snapshot=3Don|off]\n"
+	   "                use 'file' as a drive image\n"
            "-mtdblock file  use 'file' as on-board Flash memory image\n"
            "-sd file        use 'file' as SecureDigital card image\n"
            "-pflash file    use 'file' as a parallel flash image\n"
@@ -7173,6 +7442,7 @@ enum {
     QEMU_OPTION_hdb,
     QEMU_OPTION_hdc,
     QEMU_OPTION_hdd,
+    QEMU_OPTION_drive,
     QEMU_OPTION_cdrom,
     QEMU_OPTION_mtdblock,
     QEMU_OPTION_sd,
@@ -7262,6 +7532,7 @@ const QEMUOption qemu_options[] =3D {
     { "hdb", HAS_ARG, QEMU_OPTION_hdb },
     { "hdc", HAS_ARG, QEMU_OPTION_hdc },
     { "hdd", HAS_ARG, QEMU_OPTION_hdd },
+    { "drive", HAS_ARG, QEMU_OPTION_drive },
     { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
     { "mtdblock", HAS_ARG, QEMU_OPTION_mtdblock },
     { "sd", HAS_ARG, QEMU_OPTION_sd },
@@ -7374,16 +7645,9 @@ int qemu_key_check(BlockDriverState *bs,
=20
 static BlockDriverState *get_bdrv(int index)
 {
-    BlockDriverState *bs;
-
-    if (index < 4) {
-        bs =3D bs_table[index];
-    } else if (index < 6) {
-        bs =3D fd_table[index - 4];
-    } else {
-        bs =3D NULL;
-    }
-    return bs;
+    if (index > nb_drives)
+        return NULL;
+    return drives_table[index].bdrv;
 }
=20
 static void read_passwords(void)
@@ -7583,19 +7847,16 @@ int main(int argc, char **argv)
     const char *gdbstub_port;
 #endif
     uint32_t boot_devices_bitmap =3D 0;
-    int i, cdrom_index, pflash_index;
+    int i;
     int snapshot, linux_boot, net_boot;
     const char *initrd_filename;
-    const char *hd_filename[MAX_DISKS], *fd_filename[MAX_FD];
-    const char *pflash_filename[MAX_PFLASH];
-    const char *sd_filename;
-    const char *mtd_filename;
     const char *kernel_filename, *kernel_cmdline;
     const char *boot_devices =3D "";
     DisplayState *ds =3D &display_state;
     int cyls, heads, secs, translation;
     char net_clients[MAX_NET_CLIENTS][256];
     int nb_net_clients;
+    int hda_index;
     int optind;
     const char *r, *optarg;
     CharDriverState *monitor_hd;
@@ -7648,15 +7909,6 @@ int main(int argc, char **argv)
     machine =3D first_machine;
     cpu_model =3D NULL;
     initrd_filename =3D NULL;
-    for(i =3D 0; i < MAX_FD; i++)
-        fd_filename[i] =3D NULL;
-    for(i =3D 0; i < MAX_DISKS; i++)
-        hd_filename[i] =3D NULL;
-    for(i =3D 0; i < MAX_PFLASH; i++)
-        pflash_filename[i] =3D NULL;
-    pflash_index =3D 0;
-    sd_filename =3D NULL;
-    mtd_filename =3D NULL;
     ram_size =3D DEFAULT_RAM_SIZE * 1024 * 1024;
     vga_ram_size =3D VGA_RAM_SIZE;
 #ifdef CONFIG_GDBSTUB
@@ -7667,11 +7919,6 @@ int main(int argc, char **argv)
     nographic =3D 0;
     kernel_filename =3D NULL;
     kernel_cmdline =3D "";
-#ifdef TARGET_PPC
-    cdrom_index =3D 1;
-#else
-    cdrom_index =3D 2;
-#endif
     cyls =3D heads =3D secs =3D 0;
     translation =3D BIOS_ATA_TRANSLATION_AUTO;
     pstrcpy(monitor_device, sizeof(monitor_device), "vc");
@@ -7689,6 +7936,9 @@ int main(int argc, char **argv)
     usb_devices_index =3D 0;
=20
     nb_net_clients =3D 0;
+    nb_drives =3D 0;
+    nb_drives_opt =3D 0;
+    hda_index =3D -1;
=20
     nb_nics =3D 0;
     /* default mac address of the first network interface */
@@ -7699,7 +7949,7 @@ int main(int argc, char **argv)
             break;
         r =3D argv[optind];
         if (r[0] !=3D '-') {
-            hd_filename[0] =3D argv[optind++];
+	    hda_index =3D drive_add(HD_ALIAS, argv[optind++], 0, 0);
         } else {
             const QEMUOption *popt;
=20
@@ -7759,29 +8009,38 @@ int main(int argc, char **argv)
                 initrd_filename =3D optarg;
                 break;
             case QEMU_OPTION_hda:
+                if (cyls =3D=3D 0)
+                    hda_index =3D drive_add(HD_ALIAS, optarg, 0, 0);
+                else
+                    hda_index =3D drive_add(HD_ALIAS
+			     ",cyls=3D%d,heads=3D%d,secs=3D%d%s",
+                             optarg, 0, 0, cyls, heads, secs,
+                             translation =3D=3D BIOS_ATA_TRANSLATION_LBA=
 ?
+                                 ",trans=3Dlba" :
+                             translation =3D=3D BIOS_ATA_TRANSLATION_NON=
E ?
+                                 ",trans=3Dnone" : "");
+                 break;
             case QEMU_OPTION_hdb:
             case QEMU_OPTION_hdc:
             case QEMU_OPTION_hdd:
                 {
                     int hd_index;
                     hd_index =3D popt->index - QEMU_OPTION_hda;
-                    hd_filename[hd_index] =3D optarg;
-                    if (hd_index =3D=3D cdrom_index)
-                        cdrom_index =3D -1;
+		    drive_add(HD_ALIAS, optarg, hd_index / MAX_IDE_DEVS,
+                                                hd_index % MAX_IDE_DEVS)=
;
                 }
                 break;
+            case QEMU_OPTION_drive:
+                drive_add("%s", optarg);
+	        break;
             case QEMU_OPTION_mtdblock:
-                mtd_filename =3D optarg;
+	        drive_add(MTD_ALIAS, optarg);
                 break;
             case QEMU_OPTION_sd:
-                sd_filename =3D optarg;
+                drive_add(SD_ALIAS, optarg);
                 break;
             case QEMU_OPTION_pflash:
-                if (pflash_index >=3D MAX_PFLASH) {
-                    fprintf(stderr, "qemu: too many parallel flash image=
s\n");
-                    exit(1);
-                }
-                pflash_filename[pflash_index++] =3D optarg;
+	        drive_add(PFLASH_ALIAS, optarg);
                 break;
             case QEMU_OPTION_snapshot:
                 snapshot =3D 1;
@@ -7820,6 +8079,17 @@ int main(int argc, char **argv)
                         fprintf(stderr, "qemu: invalid physical CHS form=
at\n");
                         exit(1);
                     }
+		    if (hda_index !=3D -1)
+		        snprintf(drives_opt[hda_index] +
+			         strlen(drives_opt[hda_index]),
+			         sizeof(drives_opt[0]) -
+				 strlen(drives_opt[hda_index]),
+		                 ",cyls=3D%d,heads=3D%d,secs=3D%d%s",
+			         cyls, heads, secs,
+			         translation =3D=3D BIOS_ATA_TRANSLATION_LBA ?
+			     	    ",trans=3Dlba" :
+			         translation =3D=3D BIOS_ATA_TRANSLATION_NONE ?
+			             ",trans=3Dnone" : "");
                 }
                 break;
             case QEMU_OPTION_nographic:
@@ -7838,9 +8108,7 @@ int main(int argc, char **argv)
                 kernel_cmdline =3D optarg;
                 break;
             case QEMU_OPTION_cdrom:
-                if (cdrom_index >=3D 0) {
-                    hd_filename[cdrom_index] =3D optarg;
-                }
+		drive_add("file=3D%s," CDROM_ALIAS, optarg);
                 break;
             case QEMU_OPTION_boot:
                 boot_devices =3D optarg;
@@ -7874,10 +8142,9 @@ int main(int argc, char **argv)
                 }
                 break;
             case QEMU_OPTION_fda:
-                fd_filename[0] =3D optarg;
-                break;
             case QEMU_OPTION_fdb:
-                fd_filename[1] =3D optarg;
+		drive_add("file=3D%s," FD_ALIAS, optarg,
+		          popt->index - QEMU_OPTION_fda);
                 break;
 #ifdef TARGET_I386
             case QEMU_OPTION_no_fd_bootchk:
@@ -8258,19 +8525,11 @@ int main(int argc, char **argv)
    =20
     /* XXX: this should not be: some embedded targets just have flash */
     if (!linux_boot && net_boot =3D=3D 0 &&
-        hd_filename[0] =3D=3D '\0' &&
-        (cdrom_index >=3D 0 && hd_filename[cdrom_index] =3D=3D '\0') &&
-        fd_filename[0] =3D=3D '\0')
+        nb_drives_opt =3D=3D 0)
         help(1);
=20
-    /* boot to floppy or the default cd if no hard disk defined yet */
     if (!boot_devices[0]) {
-        if (hd_filename[0] !=3D '\0')
-            boot_devices =3D "c";
-        else if (fd_filename[0] !=3D '\0')
-            boot_devices =3D "a";
-        else
-            boot_devices =3D "d";
+        boot_devices =3D "cad";
     }
     setvbuf(stdout, NULL, _IOLBF, 0);
=20
@@ -8347,97 +8606,23 @@ int main(int argc, char **argv)
         exit(1);
     }
=20
-    /* we always create the cdrom drive, even if no disk is there */
     bdrv_init();
-    if (cdrom_index >=3D 0) {
-        bs_table[cdrom_index] =3D bdrv_new("cdrom");
-        bdrv_set_type_hint(bs_table[cdrom_index], BDRV_TYPE_CDROM);
-    }
=20
-    /* open the virtual block devices */
-    for(i =3D 0; i < MAX_DISKS; i++) {
-        if (hd_filename[i]) {
-            if (!bs_table[i]) {
-                char buf[64];
-                snprintf(buf, sizeof(buf), "hd%c", i + 'a');
-                bs_table[i] =3D bdrv_new(buf);
-            }
-            if (bdrv_open(bs_table[i], hd_filename[i], snapshot ? BDRV_O=
_SNAPSHOT : 0) < 0) {
-                fprintf(stderr, "qemu: could not open hard disk image '%=
s'\n",
-                        hd_filename[i]);
-                exit(1);
-            }
-            if (i =3D=3D 0 && cyls !=3D 0) {
-                bdrv_set_geometry_hint(bs_table[i], cyls, heads, secs);
-                bdrv_set_translation_hint(bs_table[i], translation);
-            }
-        }
-    }
+    /* we always create the cdrom drive, even if no disk is there */
=20
-    /* we always create at least one floppy disk */
-    fd_table[0] =3D bdrv_new("fda");
-    bdrv_set_type_hint(fd_table[0], BDRV_TYPE_FLOPPY);
-
-    for(i =3D 0; i < MAX_FD; i++) {
-        if (fd_filename[i]) {
-            if (!fd_table[i]) {
-                char buf[64];
-                snprintf(buf, sizeof(buf), "fd%c", i + 'a');
-                fd_table[i] =3D bdrv_new(buf);
-                bdrv_set_type_hint(fd_table[i], BDRV_TYPE_FLOPPY);
-            }
-            if (fd_filename[i][0] !=3D '\0') {
-                if (bdrv_open(fd_table[i], fd_filename[i],
-                              snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
-                    fprintf(stderr, "qemu: could not open floppy disk im=
age '%s'\n",
-                            fd_filename[i]);
-                    exit(1);
-                }
-            }
-        }
-    }
+    if (nb_drives_opt < MAX_DRIVES)
+        drive_add(CDROM_ALIAS);
=20
-    /* Open the virtual parallel flash block devices */
-    for(i =3D 0; i < MAX_PFLASH; i++) {
-        if (pflash_filename[i]) {
-            if (!pflash_table[i]) {
-                char buf[64];
-                snprintf(buf, sizeof(buf), "fl%c", i + 'a');
-                pflash_table[i] =3D bdrv_new(buf);
-            }
-            if (bdrv_open(pflash_table[i], pflash_filename[i],
-                          snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
-                fprintf(stderr, "qemu: could not open flash image '%s'\n=
",
-                        pflash_filename[i]);
-                exit(1);
-            }
-        }
-    }
+    /* we always create at least on floppy */
=20
-    sd_bdrv =3D bdrv_new ("sd");
-    /* FIXME: This isn't really a floppy, but it's a reasonable
-       approximation.  */
-    bdrv_set_type_hint(sd_bdrv, BDRV_TYPE_FLOPPY);
-    if (sd_filename) {
-        if (bdrv_open(sd_bdrv, sd_filename,
-                      snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
-            fprintf(stderr, "qemu: could not open SD card image %s\n",
-                    sd_filename);
-        } else
-            qemu_key_check(sd_bdrv, sd_filename);
-    }
+    if (nb_drives_opt < MAX_DRIVES)
+        drive_add(FD_ALIAS, 0);
=20
-    if (mtd_filename) {
-        mtd_bdrv =3D bdrv_new ("mtd");
-        if (bdrv_open(mtd_bdrv, mtd_filename,
-                      snapshot ? BDRV_O_SNAPSHOT : 0) < 0 ||
-            qemu_key_check(mtd_bdrv, mtd_filename)) {
-            fprintf(stderr, "qemu: could not open Flash image %s\n",
-                    mtd_filename);
-            bdrv_delete(mtd_bdrv);
-            mtd_bdrv =3D 0;
-        }
-    }
+    /* open the virtual block devices */
+
+    for(i =3D 0; i < nb_drives_opt; i++)
+        if (drive_init(drives_opt[i], snapshot, machine) =3D=3D -1)
+	    exit(1);
=20
     register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
     register_savevm("ram", 0, 2, ram_save, ram_load, NULL);
Index: qemu/vl.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/vl.h	2007-11-12 14:59:27.000000000 +0100
+++ qemu/vl.h	2007-11-12 14:59:45.000000000 +0100
@@ -785,13 +785,27 @@ void isa_cirrus_vga_init(DisplayState *d
 void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_bas=
e,
                      unsigned long vga_ram_offset, int vga_ram_size);
=20
-/* ide.c */
-#define MAX_DISKS 4
+typedef enum {
+    IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD
+} BlockInterfaceType;
+
+typedef struct DriveInfo {
+    BlockDriverState *bdrv;
+    BlockInterfaceType interface;
+    int bus;
+    int unit;
+} DriveInfo;
+
+#define MAX_DRIVES 32
=20
-extern BlockDriverState *bs_table[MAX_DISKS + 1];
-extern BlockDriverState *sd_bdrv;
-extern BlockDriverState *mtd_bdrv;
+extern int nb_drives;
+extern DriveInfo drives_table[MAX_DRIVES+1];
=20
+extern int drive_get_index(BlockInterfaceType interface, int bus, int un=
it);
+extern int drive_get_max_bus(BlockInterfaceType interface);
+
+/* ide.c */
+#define MAX_IDE_DEVS 2
 void isa_ide_init(int iobase, int iobase2, qemu_irq irq,
                   BlockDriverState *hd0, BlockDriverState *hd1);
 void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table,
@@ -836,7 +850,6 @@ void DMA_register_channel (int nchan,
                            void *opaque);
 /* fdc.c */
 #define MAX_FD 2
-extern BlockDriverState *fd_table[MAX_FD];
=20
 typedef struct fdctrl_t fdctrl_t;
=20
@@ -1103,8 +1116,11 @@ void *slavio_misc_init(target_phys_addr_
 void slavio_set_power_fail(void *opaque, int power_failing);
=20
 /* esp.c */
+/* The HBA is ID 7, so for simplicitly limit to 7 devices.  */
+#define MAX_SCSI_DEVS      7
+#define ESP_MAX_DEVS     MAX_SCSI_DEVS
 void esp_scsi_attach(void *opaque, BlockDriverState *bd, int id);
-void *esp_init(BlockDriverState **bd, target_phys_addr_t espaddr,
+void *esp_init(target_phys_addr_t espaddr,
                void *dma_opaque, qemu_irq irq, qemu_irq *reset);
=20
 /* sparc32_dma.c */
@@ -1234,6 +1250,7 @@ void scsi_cancel_io(SCSIDevice *s, uint3
 uint8_t *scsi_get_buf(SCSIDevice *s, uint32_t tag);
=20
 /* lsi53c895a.c */
+#define LSI_MAX_DEVS      MAX_SCSI_DEVS
 void lsi_scsi_attach(void *opaque, BlockDriverState *bd, int id);
 void *lsi_scsi_init(PCIBus *bus, int devfn);
=20
@@ -1376,7 +1393,6 @@ int tc58128_init(struct SH7750State *s,=20
=20
 /* NOR flash devices */
 #define MAX_PFLASH 4
-extern BlockDriverState *pflash_table[MAX_PFLASH];
 typedef struct pflash_t pflash_t;
=20
 pflash_t *pflash_register (target_phys_addr_t base, ram_addr_t off,
Index: qemu/monitor.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/monitor.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/monitor.c	2007-11-12 14:59:45.000000000 +0100
@@ -204,16 +204,11 @@ static void do_commit(const char *device
     int i, all_devices;
=20
     all_devices =3D !strcmp(device, "all");
-    for (i =3D 0; i < MAX_DISKS; i++) {
-        if (bs_table[i]) {
+    for (i =3D 0; i < nb_drives; i++) {
             if (all_devices ||
-                !strcmp(bdrv_get_device_name(bs_table[i]), device))
-                bdrv_commit(bs_table[i]);
-        }
+                !strcmp(bdrv_get_device_name(drives_table[i].bdrv), devi=
ce))
+                bdrv_commit(drives_table[i].bdrv);
     }
-    if (mtd_bdrv)
-        if (all_devices || !strcmp(bdrv_get_device_name(mtd_bdrv), devic=
e))
-            bdrv_commit(mtd_bdrv);
 }
=20
 static void do_info(const char *item)
Index: qemu/hw/mips_pica61.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/mips_pica61.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/mips_pica61.c	2007-11-12 14:59:45.000000000 +0100
@@ -38,6 +38,8 @@
=20
 #define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
=20
+#define MAX_IDE_BUS 2
+
 static const int ide_iobase[2] =3D { 0x1f0, 0x170 };
 static const int ide_iobase2[2] =3D { 0x3f6, 0x376 };
 static const int ide_irq[2] =3D { 14, 15 };
@@ -66,6 +68,8 @@ void mips_pica61_init (int ram_size, int
     int i;
     int available_ram;
     qemu_irq *i8259;
+    int index;
+    BlockDriverState *fd[MAX_FD];
=20
     /* init CPUs */
     if (cpu_model =3D=3D NULL) {
@@ -135,9 +139,14 @@ void mips_pica61_init (int ram_size, int
     i8042_mm_init(i8259[6], i8259[7], 0x80005060, 0);
=20
     /* IDE controller */
-    for(i =3D 0; i < 2; i++)
+    for(i =3D 0; i < MAX_IDE_BUS; i++) {
+        int hd0, hd1;
+        hd0 =3D drive_get_index(IF_IDE, i, 0);
+        hd1 =3D drive_get_index(IF_IDE, i, 1);
         isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]],
-                     bs_table[2 * i], bs_table[2 * i + 1]);
+                     hd0 =3D=3D -1 ? NULL : drives_table[hd0].bdrv,
+                     hd1 =3D=3D -1 ? NULL : drives_table[hd1].bdrv);
+    }
=20
     /* Network controller */
     /* FIXME: missing NS SONIC DP83932 */
@@ -146,7 +155,13 @@ void mips_pica61_init (int ram_size, int
     /* FIXME: missing NCR 53C94 */
=20
     /* ISA devices (floppy, serial, parallel) */
-    fdctrl_init(i8259[1], 1, 1, 0x80003000, fd_table);
+    for (i =3D 0; i < 2; i++) {
+        index =3D drive_get_index(IF_FLOPPY, 0, i);
+        if (index =3D=3D -1)
+            continue;
+        fd[i] =3D drives_table[index].bdrv;
+    }
+    fdctrl_init(i8259[1], 1, 1, 0x80003000, fd);
     for(i =3D 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
             serial_mm_init(serial_base[i], 0, i8259[serial_irq[i]], seri=
al_hds[i], 1);
Index: qemu/hw/mips_r4k.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/mips_r4k.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/mips_r4k.c	2007-11-12 14:59:45.000000000 +0100
@@ -19,6 +19,8 @@
=20
 #define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
=20
+#define MAX_IDE_BUS 2
+
 static const int ide_iobase[2] =3D { 0x1f0, 0x170 };
 static const int ide_iobase2[2] =3D { 0x3f6, 0x376 };
 static const int ide_irq[2] =3D { 14, 15 };
@@ -149,6 +151,8 @@ void mips_r4k_init (int ram_size, int vg
     RTCState *rtc_state;
     int i;
     qemu_irq *i8259;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
=20
     /* init CPUs */
     if (cpu_model =3D=3D NULL) {
@@ -239,9 +243,18 @@ void mips_r4k_init (int ram_size, int vg
         }
     }
=20
-    for(i =3D 0; i < 2; i++)
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+        if (index !=3D -1)
+            hd[i] =3D drives_table[index].bdrv;
+        else
+            hd[i] =3D NULL;
+    }
+
+    for(i =3D 0; i < MAX_IDE_BUS; i++)
         isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]],
-                     bs_table[2 * i], bs_table[2 * i + 1]);
+                     hd[MAX_IDE_DEVS * i],
+		     hd[MAX_IDE_DEVS * i + 1]);
=20
     i8042_init(i8259[1], i8259[12], 0x60);
     ds1225y_init(0x9000, "nvram");
Index: qemu/hw/pc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/pc.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/pc.c	2007-11-12 14:59:45.000000000 +0100
@@ -33,6 +33,8 @@
 /* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables.  =
*/
 #define ACPI_DATA_SIZE       0x10000
=20
+#define MAX_IDE_BUS 2
+
 static fdctrl_t *floppy_controller;
 static RTCState *rtc_state;
 static PITState *pit;
@@ -372,8 +374,10 @@ static void generate_bootsect(uint32_t g
 {
     uint8_t bootsect[512], *p;
     int i;
+    int hda;
=20
-    if (bs_table[0] =3D=3D NULL) {
+    hda =3D drive_get_index(IF_IDE, 0, 0);
+    if (hda =3D=3D -1) {
 	fprintf(stderr, "A disk image must be given for 'hda' when booting "
 		"a Linux kernel\n");
 	exit(1);
@@ -382,7 +386,7 @@ static void generate_bootsect(uint32_t g
     memset(bootsect, 0, sizeof(bootsect));
=20
     /* Copy the MSDOS partition table if possible */
-    bdrv_read(bs_table[0], 0, bootsect, 1);
+    bdrv_read(drives_table[hda].bdrv, 0, bootsect, 1);
=20
     /* Make sure we have a partition signature */
     bootsect[510] =3D 0x55;
@@ -419,7 +423,7 @@ static void generate_bootsect(uint32_t g
     *p++ =3D segs[1];		/* CS */
     *p++ =3D segs[1] >> 8;
=20
-    bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect));
+    bdrv_set_boot_sector(drives_table[hda].bdrv, bootsect, sizeof(bootse=
ct));
 }
=20
 int load_kernel(const char *filename, uint8_t *addr,
@@ -700,6 +704,9 @@ static void pc_init1(int ram_size, int v
     NICInfo *nd;
     qemu_irq *cpu_irq;
     qemu_irq *i8259;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    BlockDriverState *fd[MAX_FD];
=20
     linux_boot =3D (kernel_filename !=3D NULL);
=20
@@ -917,12 +924,20 @@ static void pc_init1(int ram_size, int v
         }
     }
=20
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+	if (index !=3D -1)
+	    hd[i] =3D drives_table[index].bdrv;
+	else
+	    hd[i] =3D NULL;
+    }
+
     if (pci_enabled) {
-        pci_piix3_ide_init(pci_bus, bs_table, piix3_devfn + 1, i8259);
+        pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1, i8259);
     } else {
-        for(i =3D 0; i < 2; i++) {
+        for(i =3D 0; i < MAX_IDE_BUS; i++) {
             isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]=
],
-                         bs_table[2 * i], bs_table[2 * i + 1]);
+	                 hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
         }
     }
=20
@@ -932,9 +947,16 @@ static void pc_init1(int ram_size, int v
     audio_init(pci_enabled ? pci_bus : NULL, i8259);
 #endif
=20
-    floppy_controller =3D fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table);
+    for(i =3D 0; i < MAX_FD; i++) {
+        index =3D drive_get_index(IF_FLOPPY, 0, i);
+	if (index !=3D -1)
+	    fd[i] =3D drives_table[index].bdrv;
+	else
+	    fd[i] =3D NULL;
+    }
+    floppy_controller =3D fdctrl_init(i8259[6], 2, 0, 0x3f0, fd);
=20
-    cmos_init(ram_size, boot_device, bs_table);
+    cmos_init(ram_size, boot_device, hd);
=20
     if (pci_enabled && usb_enabled) {
         usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);
@@ -954,23 +976,24 @@ static void pc_init1(int ram_size, int v
     if (i440fx_state) {
         i440fx_init_memory_mappings(i440fx_state);
     }
-#if 0
-    /* ??? Need to figure out some way for the user to
-       specify SCSI devices.  */
+
     if (pci_enabled) {
+	int max_bus;
+        int bus, unit;
         void *scsi;
-        BlockDriverState *bdrv;
=20
-        scsi =3D lsi_scsi_init(pci_bus, -1);
-        bdrv =3D bdrv_new("scsidisk");
-        bdrv_open(bdrv, "scsi_disk.img", 0);
-        lsi_scsi_attach(scsi, bdrv, -1);
-        bdrv =3D bdrv_new("scsicd");
-        bdrv_open(bdrv, "scsi_cd.iso", 0);
-        bdrv_set_type_hint(bdrv, BDRV_TYPE_CDROM);
-        lsi_scsi_attach(scsi, bdrv, -1);
+        max_bus =3D drive_get_max_bus(IF_SCSI);
+
+	for (bus =3D 0; bus <=3D max_bus; bus++) {
+            scsi =3D lsi_scsi_init(pci_bus, -1);
+            for (unit =3D 0; unit < LSI_MAX_DEVS; unit++) {
+	        index =3D drive_get_index(IF_SCSI, bus, unit);
+		if (index =3D=3D -1)
+		    continue;
+		lsi_scsi_attach(scsi, drives_table[index].bdrv, unit);
+	    }
+        }
     }
-#endif
 }
=20
 static void pc_init_pci(int ram_size, int vga_ram_size,
Index: qemu/hw/ppc_prep.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/ppc_prep.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/ppc_prep.c	2007-11-12 14:59:45.000000000 +0100
@@ -29,6 +29,8 @@
 /* SMP is not enabled, for now */
 #define MAX_CPUS 1
=20
+#define MAX_IDE_BUS 2
+
 #define BIOS_FILENAME "ppc_rom.bin"
 #define KERNEL_LOAD_ADDR 0x01000000
 #define INITRD_LOAD_ADDR 0x01800000
@@ -539,6 +541,9 @@ static void ppc_prep_init (int ram_size,
     PCIBus *pci_bus;
     qemu_irq *i8259;
     int ppc_boot_device;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    BlockDriverState *fd[MAX_FD];
=20
     sysctrl =3D qemu_mallocz(sizeof(sysctrl_t));
     if (sysctrl =3D=3D NULL)
@@ -658,16 +663,32 @@ static void ppc_prep_init (int ram_size,
         }
     }
=20
-    for(i =3D 0; i < 2; i++) {
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+        if (index !=3D -1)
+            hd[i] =3D drives_table[index].bdrv;
+        else
+            hd[i] =3D NULL;
+    }
+
+    for(i =3D 0; i < MAX_IDE_BUS; i++) {
         isa_ide_init(ide_iobase[i], ide_iobase2[i], i8259[ide_irq[i]],
-                     bs_table[2 * i], bs_table[2 * i + 1]);
+                     hd[2 * i],
+		     hd[2 * i + 1]);
     }
     i8042_init(i8259[1], i8259[12], 0x60);
     DMA_init(1);
     //    AUD_init();
     //    SB16_init();
=20
-    fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table);
+    for(i =3D 0; i < MAX_FD; i++) {
+        index =3D drive_get_index(IF_FLOPPY, 0, i);
+        if (index !=3D -1)
+            fd[i] =3D drives_table[index].bdrv;
+        else
+            fd[i] =3D NULL;
+    }
+    fdctrl_init(i8259[6], 2, 0, 0x3f0, fd);
=20
     /* Register speaker port */
     register_ioport_read(0x61, 1, 1, speaker_ioport_read, NULL);
Index: qemu/hw/esp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/esp.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/hw/esp.c	2007-11-12 14:59:45.000000000 +0100
@@ -45,14 +45,11 @@ do { printf("ESP: " fmt , ##args); } whi
 #define ESP_REGS 16
 #define ESP_SIZE (ESP_REGS * 4)
 #define TI_BUFSZ 32
-/* The HBA is ID 7, so for simplicitly limit to 7 devices.  */
-#define ESP_MAX_DEVS      7
=20
 typedef struct ESPState ESPState;
=20
 struct ESPState {
     qemu_irq irq;
-    BlockDriverState **bd;
     uint8_t rregs[ESP_REGS];
     uint8_t wregs[ESP_REGS];
     int32_t ti_size;
@@ -60,7 +57,7 @@ struct ESPState {
     uint8_t ti_buf[TI_BUFSZ];
     int sense;
     int dma;
-    SCSIDevice *scsi_dev[MAX_DISKS];
+    SCSIDevice *scsi_dev[ESP_MAX_DEVS];
     SCSIDevice *current_dev;
     uint8_t cmdbuf[TI_BUFSZ];
     int cmdlen;
@@ -122,7 +119,7 @@ static int get_cmd(ESPState *s, uint8_t=20
         s->async_len =3D 0;
     }
=20
-    if (target >=3D MAX_DISKS || !s->scsi_dev[target]) {
+    if (target >=3D ESP_MAX_DEVS || !s->scsi_dev[target]) {
         // No such drive
         s->rregs[4] =3D STAT_IN;
         s->rregs[5] =3D INTR_DC;
@@ -574,7 +571,7 @@ void esp_scsi_attach(void *opaque, Block
     s->scsi_dev[id] =3D scsi_disk_init(bd, 0, esp_command_complete, s);
 }
=20
-void *esp_init(BlockDriverState **bd, target_phys_addr_t espaddr,
+void *esp_init(target_phys_addr_t espaddr,
                void *dma_opaque, qemu_irq irq, qemu_irq *reset)
 {
     ESPState *s;
@@ -584,7 +581,6 @@ void *esp_init(BlockDriverState **bd, ta
     if (!s)
         return NULL;
=20
-    s->bd =3D bd;
     s->irq =3D irq;
     s->dma_opaque =3D dma_opaque;
=20
Index: qemu/hw/realview.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/realview.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/realview.c	2007-11-12 14:59:45.000000000 +0100
@@ -26,6 +26,7 @@ static void realview_init(int ram_size,=20
     int done_smc =3D 0;
     qemu_irq cpu_irq[4];
     int ncpu;
+    int index;
=20
     if (!cpu_model)
         cpu_model =3D "arm926";
@@ -83,7 +84,12 @@ static void realview_init(int ram_size,=20
=20
     pl110_init(ds, 0x10020000, pic[23], 1);
=20
-    pl181_init(0x10005000, sd_bdrv, pic[17], pic[18]);
+    index =3D drive_get_index(IF_SD, 0, 0);
+    if (index =3D=3D -1) {
+        fprintf(stderr, "qemu: missing SecureDigital card\n");
+        exit(1);
+    }
+    pl181_init(0x10005000, drives_table[index].bdrv, pic[17], pic[18]);
=20
     pl031_init(0x10017000, pic[10]);
=20
@@ -92,10 +98,11 @@ static void realview_init(int ram_size,=20
         usb_ohci_init_pci(pci_bus, 3, -1);
     }
     scsi_hba =3D lsi_scsi_init(pci_bus, -1);
-    for (n =3D 0; n < MAX_DISKS; n++) {
-        if (bs_table[n]) {
-            lsi_scsi_attach(scsi_hba, bs_table[n], n);
-        }
+    for (n =3D 0; n < LSI_MAX_DEVS; n++) {
+        index =3D drive_get_index(IF_SCSI, 0, n);
+        if (index =3D=3D -1)
+            continue;
+        lsi_scsi_attach(scsi_hba, drives_table[index].bdrv, n);
     }
     for(n =3D 0; n < nb_nics; n++) {
         nd =3D &nd_table[n];
Index: qemu/hw/sun4m.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/sun4m.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/sun4m.c	2007-11-12 14:59:45.000000000 +0100
@@ -316,6 +316,8 @@ static void *sun4m_hw_init(const struct=20
     qemu_irq *cpu_irqs[MAX_CPUS], *slavio_irq, *slavio_cpu_irq,
         *espdma_irq, *ledma_irq;
     qemu_irq *esp_reset, *le_reset;
+    BlockDriverState *fd[MAX_FD];
+    int index;
=20
     /* init CPUs */
=20
@@ -388,16 +390,26 @@ static void *sun4m_hw_init(const struct=20
     slavio_serial_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq],
                        serial_hds[1], serial_hds[0]);
=20
-    if (hwdef->fd_base !=3D (target_phys_addr_t)-1)
-        sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd_=
table);
+    if (hwdef->fd_base !=3D (target_phys_addr_t)-1) {
+        for(i =3D 0; i < MAX_FD; i++) {
+            index =3D drive_get_index(IF_FLOPPY, 0, i);
+            if (index !=3D -1)
+                fd[i] =3D drives_table[index].bdrv;
+            else
+                fd[i] =3D NULL;
+        }
+
+        sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd)=
;
+    }
=20
-    main_esp =3D esp_init(bs_table, hwdef->esp_base, espdma, *espdma_irq=
,
+    main_esp =3D esp_init(hwdef->esp_base, espdma, *espdma_irq,
                         esp_reset);
=20
-    for (i =3D 0; i < MAX_DISKS; i++) {
-        if (bs_table[i]) {
-            esp_scsi_attach(main_esp, bs_table[i], i);
-        }
+    for (i =3D 0; i < ESP_MAX_DEVS; i++) {
+        index =3D drive_get_index(IF_SCSI, 0, i);
+        if (index =3D=3D -1)
+            continue;
+        esp_scsi_attach(main_esp, drives_table[index].bdrv, i);
     }
=20
     slavio_misc =3D slavio_misc_init(hwdef->slavio_base, hwdef->power_ba=
se,
Index: qemu/hw/versatilepb.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/versatilepb.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/versatilepb.c	2007-11-12 14:59:45.000000000 +0100
@@ -165,6 +165,7 @@ static void versatile_init(int ram_size,
     NICInfo *nd;
     int n;
     int done_smc =3D 0;
+    int index;
=20
     if (!cpu_model)
         cpu_model =3D "arm926";
@@ -201,10 +202,11 @@ static void versatile_init(int ram_size,
         usb_ohci_init_pci(pci_bus, 3, -1);
     }
     scsi_hba =3D lsi_scsi_init(pci_bus, -1);
-    for (n =3D 0; n < MAX_DISKS; n++) {
-        if (bs_table[n]) {
-            lsi_scsi_attach(scsi_hba, bs_table[n], n);
-        }
+    for (n =3D 0; n < LSI_MAX_DEVS; n++) {
+        index =3D drive_get_index(IF_SCSI, 0, n);
+        if (index =3D=3D -1)
+            continue;
+        lsi_scsi_attach(scsi_hba, drives_table[index].bdrv, n);
     }
=20
     pl011_init(0x101f1000, pic[12], serial_hds[0], PL011_ARM);
@@ -220,7 +222,13 @@ static void versatile_init(int ram_size,
        that includes hardware cursor support from the PL111.  */
     pl110_init(ds, 0x10120000, pic[16], 1);
=20
-    pl181_init(0x10005000, sd_bdrv, sic[22], sic[1]);
+    index =3D drive_get_index(IF_SD, 0, 0);
+    if (index =3D=3D -1) {
+        fprintf(stderr, "qemu: missing SecureDigital card\n");
+        exit(1);
+    }
+
+    pl181_init(0x10005000, drives_table[index].bdrv, sic[22], sic[1]);
 #if 0
     /* Disabled because there's no way of specifying a block device.  */
     pl181_init(0x1000b000, NULL, sic, 23, 2);
Index: qemu/hw/integratorcp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/integratorcp.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/integratorcp.c	2007-11-12 14:59:45.000000000 +0100
@@ -473,6 +473,7 @@ static void integratorcp_init(int ram_si
     uint32_t bios_offset;
     qemu_irq *pic;
     qemu_irq *cpu_pic;
+    int sd;
=20
     if (!cpu_model)
         cpu_model =3D "arm926";
@@ -501,7 +502,12 @@ static void integratorcp_init(int ram_si
     icp_control_init(0xcb000000);
     pl050_init(0x18000000, pic[3], 0);
     pl050_init(0x19000000, pic[4], 1);
-    pl181_init(0x1c000000, sd_bdrv, pic[23], pic[24]);
+    sd =3D drive_get_index(IF_SD, 0, 0);
+    if (sd =3D=3D -1) {
+        fprintf(stderr, "qemu: missing SecureDigital card for integrator=
cp\n");
+        exit(1);
+    }
+    pl181_init(0x1c000000, drives_table[sd].bdrv, pic[23], pic[24]);
     if (nd_table[0].vlan) {
         if (nd_table[0].model =3D=3D NULL
             || strcmp(nd_table[0].model, "smc91c111") =3D=3D 0) {
Index: qemu/hw/lsi53c895a.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/lsi53c895a.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/hw/lsi53c895a.c	2007-11-12 14:59:45.000000000 +0100
@@ -149,9 +149,6 @@ do { fprintf(stderr, "lsi_scsi: error: "
 #define PHASE_MI          7
 #define PHASE_MASK        7
=20
-/* The HBA is ID 7, so for simplicitly limit to 7 devices.  */
-#define LSI_MAX_DEVS      7
-
 /* Maximum length of MSG IN data.  */
 #define LSI_MAX_MSGIN_LEN 8
=20
Index: qemu/hw/nand.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/nand.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/hw/nand.c	2007-11-12 14:59:45.000000000 +0100
@@ -447,7 +447,7 @@ struct nand_flash_s *nand_init(int manf_
     }
=20
     s =3D (struct nand_flash_s *) qemu_mallocz(sizeof(struct nand_flash_=
s));
-    s->bdrv =3D mtd_bdrv;
+    s->bdrv =3D drives_table[drive_get_index(IF_MTD, 0, 0)].bdrv;
     s->manf_id =3D manf_id;
     s->chip_id =3D chip_id;
     s->size =3D nand_flash_ids[s->chip_id].size << 20;
Index: qemu/hw/omap_mmc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/omap_mmc.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/hw/omap_mmc.c	2007-11-12 14:59:45.000000000 +0100
@@ -540,7 +540,7 @@ struct omap_mmc_s *omap_mmc_init(target_
     cpu_register_physical_memory(s->base, 0x800, iomemtype);
=20
     /* Instantiate the storage */
-    s->card =3D sd_init(sd_bdrv);
+    s->card =3D sd_init(drives_table[drive_get_index(IF_SD, 0, 0)].bdrv)=
;
=20
     sd_set_cb(s->card, s, omap_mmc_ro_cb, omap_mmc_cover_cb);
=20
Index: qemu/hw/ppc405_boards.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/ppc405_boards.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/ppc405_boards.c	2007-11-12 14:59:45.000000000 +0100
@@ -191,6 +191,7 @@ static void ref405ep_init (int ram_size,
     int linux_boot;
     int fl_idx, fl_sectors, len;
     int ppc_boot_device =3D boot_device[0];
+    int index;
=20
     /* XXX: fix this */
     ram_bases[0] =3D 0x00000000;
@@ -217,17 +218,18 @@ static void ref405ep_init (int ram_size,
     bios_offset =3D sram_offset + sram_size;
     fl_idx =3D 0;
 #ifdef USE_FLASH_BIOS
-    if (pflash_table[fl_idx] !=3D NULL) {
-        bios_size =3D bdrv_getlength(pflash_table[fl_idx]);
+    index =3D drive_get_index(IF_PFLASH, 0, fl_idx);
+    if (index !=3D -1) {
+        bios_size =3D bdrv_getlength(drives_table[index].bdrv);
         fl_sectors =3D (bios_size + 65535) >> 16;
 #ifdef DEBUG_BOARD_INIT
         printf("Register parallel flash %d size " ADDRX " at offset %08l=
x "
                " addr " ADDRX " '%s' %d\n",
                fl_idx, bios_size, bios_offset, -bios_size,
-               bdrv_get_device_name(pflash_table[fl_idx]), fl_sectors);
+               bdrv_get_device_name(drives_table[index].bdrv), fl_sector=
s);
 #endif
         pflash_register((uint32_t)(-bios_size), bios_offset,
-                        pflash_table[fl_idx], 65536, fl_sectors, 2,
+                        drives_table[index].bdrv, 65536, fl_sectors, 2,
                         0x0001, 0x22DA, 0x0000, 0x0000);
         fl_idx++;
     } else
@@ -513,6 +515,7 @@ static void taihu_405ep_init(int ram_siz
     int linux_boot;
     int fl_idx, fl_sectors;
     int ppc_boot_device =3D boot_device[0];
+    int index;
=20
     /* RAM is soldered to the board so the size cannot be changed */
     ram_bases[0] =3D 0x00000000;
@@ -530,8 +533,9 @@ static void taihu_405ep_init(int ram_siz
 #endif
     fl_idx =3D 0;
 #if defined(USE_FLASH_BIOS)
-    if (pflash_table[fl_idx] !=3D NULL) {
-        bios_size =3D bdrv_getlength(pflash_table[fl_idx]);
+    index =3D drive_get_index(IF_PFLASH, 0, fl_idx);
+    if (index !=3D -1) {
+        bios_size =3D bdrv_getlength(drives_table[index].bdrv);
         /* XXX: should check that size is 2MB */
         //        bios_size =3D 2 * 1024 * 1024;
         fl_sectors =3D (bios_size + 65535) >> 16;
@@ -539,10 +543,10 @@ static void taihu_405ep_init(int ram_siz
         printf("Register parallel flash %d size " ADDRX " at offset %08l=
x "
                " addr " ADDRX " '%s' %d\n",
                fl_idx, bios_size, bios_offset, -bios_size,
-               bdrv_get_device_name(pflash_table[fl_idx]), fl_sectors);
+               bdrv_get_device_name(drives_table[index].bdrv), fl_sector=
s);
 #endif
         pflash_register((uint32_t)(-bios_size), bios_offset,
-                        pflash_table[fl_idx], 65536, fl_sectors, 4,
+                        drives_table[index].bdrv, 65536, fl_sectors, 4,
                         0x0001, 0x22DA, 0x0000, 0x0000);
         fl_idx++;
     } else
@@ -565,8 +569,9 @@ static void taihu_405ep_init(int ram_siz
     }
     bios_offset +=3D bios_size;
     /* Register Linux flash */
-    if (pflash_table[fl_idx] !=3D NULL) {
-        bios_size =3D bdrv_getlength(pflash_table[fl_idx]);
+    index =3D drive_get_index(IF_PFLASH, 0, fl_idx);
+    if (index !=3D -1) {
+        bios_size =3D bdrv_getlength(drives_table[index].bdrv);
         /* XXX: should check that size is 32MB */
         bios_size =3D 32 * 1024 * 1024;
         fl_sectors =3D (bios_size + 65535) >> 16;
@@ -574,9 +579,9 @@ static void taihu_405ep_init(int ram_siz
         printf("Register parallel flash %d size " ADDRX " at offset %08l=
x "
                " addr " ADDRX " '%s'\n",
                fl_idx, bios_size, bios_offset, (target_ulong)0xfc000000,
-               bdrv_get_device_name(pflash_table[fl_idx]));
+               bdrv_get_device_name(drives_table[index].bdrv));
 #endif
-        pflash_register(0xfc000000, bios_offset, pflash_table[fl_idx],
+        pflash_register(0xfc000000, bios_offset, drives_table[index].bdr=
v,
                         65536, fl_sectors, 4,
                         0x0001, 0x22DA, 0x0000, 0x0000);
         fl_idx++;
Index: qemu/hw/ppc_chrp.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/ppc_chrp.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/ppc_chrp.c	2007-11-12 14:59:45.000000000 +0100
@@ -25,6 +25,8 @@
 #include "vl.h"
 #include "ppc_mac.h"
=20
+#define MAX_IDE_BUS 2
+
 /* UniN device */
 static void unin_writel (void *opaque, target_phys_addr_t addr, uint32_t=
 value)
 {
@@ -74,6 +76,8 @@ static void ppc_core99_init (int ram_siz
     int pic_mem_index, dbdma_mem_index, cuda_mem_index;
     int ide_mem_index[2];
     int ppc_boot_device;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
=20
     linux_boot =3D (kernel_filename !=3D NULL);
=20
@@ -259,11 +263,18 @@ static void ppc_core99_init (int ram_siz
             nd_table[i].model =3D "ne2k_pci";
         pci_nic_init(pci_bus, &nd_table[i], -1);
     }
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+        if (index !=3D -1)
+            hd[i] =3D drives_table[index].bdrv;
+        else
+            hd[i] =3D NULL;
+    }
 #if 1
-    ide_mem_index[0] =3D pmac_ide_init(&bs_table[0], pic[0x13]);
-    ide_mem_index[1] =3D pmac_ide_init(&bs_table[2], pic[0x14]);
+    ide_mem_index[0] =3D pmac_ide_init(&hd[0], pic[0x13]);
+    ide_mem_index[1] =3D pmac_ide_init(&hd[2], pic[0x14]);
 #else
-    pci_cmd646_ide_init(pci_bus, &bs_table[0], 0);
+    pci_cmd646_ide_init(pci_bus, &hd[0], 0);
 #endif
     /* cuda also initialize ADB */
     cuda_init(&cuda_mem_index, pic[0x19]);
Index: qemu/hw/pxa2xx_mmci.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/pxa2xx_mmci.c	2007-11-12 14:59:24.000000000 +0100
+++ qemu/hw/pxa2xx_mmci.c	2007-11-12 14:59:45.000000000 +0100
@@ -537,7 +537,8 @@ struct pxa2xx_mmci_s *pxa2xx_mmci_init(t
     cpu_register_physical_memory(base, 0x00100000, iomemtype);
=20
     /* Instantiate the actual storage */
-    s->card =3D sd_init(sd_bdrv);
+
+    s->card =3D sd_init(drives_table[drive_get_index(IF_SD, 0, 0)].bdrv)=
;
=20
     register_savevm("pxa2xx_mmci", 0, 0,
                     pxa2xx_mmci_save, pxa2xx_mmci_load, s);
Index: qemu/hw/spitz.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/spitz.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/spitz.c	2007-11-12 14:59:45.000000000 +0100
@@ -928,9 +928,14 @@ static void spitz_ssp_attach(struct pxa2
 static void spitz_microdrive_attach(struct pxa2xx_state_s *cpu)
 {
     struct pcmcia_card_s *md;
-    BlockDriverState *bs =3D bs_table[0];
+    int index;
+    BlockDriverState *bs;
=20
-    if (bs && bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
+    index =3D drive_get_index(IF_IDE, 0, 0);
+    if (index =3D=3D -1)
+        return;
+    bs =3D drives_table[index].bdrv;
+    if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
         md =3D dscm1xxxx_init(bs);
         pxa2xx_pcmcia_attach(cpu->pcmcia[1], md);
     }
Index: qemu/hw/mips_malta.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/mips_malta.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/mips_malta.c	2007-11-12 14:59:45.000000000 +0100
@@ -42,6 +42,8 @@
 #define ENVP_NB_ENTRIES	 	16
 #define ENVP_ENTRY_SIZE	 	256
=20
+#define MAX_IDE_BUS 2
+
 extern FILE *logfile;
=20
 typedef struct {
@@ -765,6 +767,8 @@ void mips_malta_init (int ram_size, int=20
     uint8_t *eeprom_buf;
     i2c_bus *smbus;
     int i;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
=20
     /* init CPUs */
     if (cpu_model =3D=3D NULL) {
@@ -851,8 +855,17 @@ void mips_malta_init (int ram_size, int=20
     pci_bus =3D pci_gt64120_init(i8259);
=20
     /* Southbridge */
+
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+        if (index !=3D -1)
+            hd[i] =3D drives_table[index].bdrv;
+        else
+            hd[i] =3D NULL;
+    }
+
     piix4_devfn =3D piix4_init(pci_bus, 80);
-    pci_piix4_ide_init(pci_bus, bs_table, piix4_devfn + 1, i8259);
+    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1, i8259);
     usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);
     smbus =3D piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100);
     eeprom_buf =3D qemu_mallocz(8 * 256); /* XXX: make this persistent *=
/
Index: qemu/hw/sun4u.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/sun4u.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/sun4u.c	2007-11-12 14:59:45.000000000 +0100
@@ -320,6 +320,9 @@ static void sun4u_init(int ram_size, int
     PCIBus *pci_bus;
     QEMUBH *bh;
     qemu_irq *irq;
+    int index;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    BlockDriverState *fd[MAX_FD];
=20
     linux_boot =3D (kernel_filename !=3D NULL);
=20
@@ -422,11 +425,26 @@ static void sun4u_init(int ram_size, int
     }
=20
     irq =3D qemu_allocate_irqs(dummy_cpu_set_irq, NULL, 32);
-    // XXX pci_cmd646_ide_init(pci_bus, bs_table, 1);
-    pci_piix3_ide_init(pci_bus, bs_table, -1, irq);
+    for(i =3D 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
+        index =3D drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_=
DEVS);
+       if (index !=3D -1)
+           hd[i] =3D drives_table[index].bdrv;
+       else
+           hd[i] =3D NULL;
+    }
+
+    // XXX pci_cmd646_ide_init(pci_bus, hd, 1);
+    pci_piix3_ide_init(pci_bus, hd, -1, irq);
     /* FIXME: wire up interrupts.  */
     i8042_init(NULL/*1*/, NULL/*12*/, 0x60);
-    floppy_controller =3D fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd_table);
+    for(i =3D 0; i < MAX_FD; i++) {
+        index =3D drive_get_index(IF_FLOPPY, 0, i);
+       if (index !=3D -1)
+           fd[i] =3D drives_table[index].bdrv;
+       else
+           fd[i] =3D NULL;
+    }
+    floppy_controller =3D fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd);
     nvram =3D m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59);
     sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", ram_size, boot_de=
vice[0],
                          KERNEL_LOAD_ADDR, kernel_size,
Index: qemu/hw/ppc_oldworld.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu.orig/hw/ppc_oldworld.c	2007-11-12 14:59:27.000000000 +0100
+++ qemu/hw/ppc_oldworld.c	2007-11-12 14:59:45.000000000 +0100
@@ -25,6 +25,8 @@
 #include "vl.h"
 #include "ppc_mac.h"
=20
+#define MAX_IDE_BUS 2
+
 /* temporary frame buffer OSI calls for the video.x driver. The right
    solution is to modify the driver to use VGA PCI I/Os */
 /* XXX: to be removed. This is no way related to emulation */
@@ -114,6 +116,8 @@ static void ppc_heathrow_init (int ram_s
     int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
     int ide_mem_index[2];
     int ppc_boot_device;
+    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    int index;
=20
     linux_boot =3D (kernel_filename !=3D NULL);
=20
@@ -283,10 +287,33 @@ static void ppc_heathrow_init (int ram_s
     }
=20
     /* First IDE channel is a CMD646 on the PCI bus */
-    pci_cmd646_ide_init(pci_bus, &bs_table[0], 0);
+
+    index =3D drive_get_index(IF_IDE, 0, 0);
+    if (index =3D=3D -1)
+        hd[0] =3D NULL;
+    else
+        hd[0] =3D  drives_table[index].bdrv;
+    index =3D drive_get_index(IF_IDE, 0, 1);
+    if (index =3D=3D -1)
+        hd[1] =3D NULL;
+    else
+        hd[1] =3D  drives_table[index].bdrv;
+    hd[3] =3D hd[2] =3D NULL;
+    pci_cmd646_ide_init(pci_bus, hd, 0);
+
     /* Second IDE channel is a MAC IDE on the MacIO bus */
+    index =3D drive_get_index(IF_IDE, 1, 0);
+    if (index =3D=3D -1)
+        hd[0] =3D NULL;
+    else
+        hd[0] =3D  drives_table[index].bdrv;
+    index =3D drive_get_index(IF_IDE, 1, 1);
+    if (index =3D=3D -1)
+        hd[1] =3D NULL;
+    else
+        hd[1] =3D  drives_table[index].bdrv;
     ide_mem_index[0] =3D -1;
-    ide_mem_index[1] =3D pmac_ide_init(&bs_table[2], pic[0x0D]);
+    ide_mem_index[1] =3D pmac_ide_init(hd, pic[0x0D]);
=20
     /* cuda also initialize ADB */
     cuda_init(&cuda_mem_index, pic[0x12]);