Revert -disk patch, as requested by Fabrice. The general idea of this

patch is sound, but the implementation is just too ugly.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2309 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 14 insertions, 12 deletions

diff --git a/hw/pc.c b/hw/pc.c
index 917d9724a..1c141ae6a 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -705,21 +705,23 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     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) {
         void *scsi;
-
-        if (scsi_hba_lsi > 0) {
-            if (!(scsi = lsi_scsi_init(pci_bus, -1))) {
-                 exit(1);
-            }
-            for(i = 0; i < MAX_SCSI_DISKS; i++) {
-                if (scsi_disks_info[i].adapter == SCSI_LSI_53C895A &&
-                    scsi_disks_info[i].device_type != SCSI_NONE) {
-                    lsi_scsi_attach(scsi, bs_scsi_table[i], scsi_disks_info[i].id);
-                }
-            }
-        }
+        BlockDriverState *bdrv;
+
+        scsi = lsi_scsi_init(pci_bus, -1);
+        bdrv = bdrv_new("scsidisk");
+        bdrv_open(bdrv, "scsi_disk.img", 0);
+        lsi_scsi_attach(scsi, bdrv, -1);
+        bdrv = bdrv_new("scsicd");
+        bdrv_open(bdrv, "scsi_cd.iso", 0);
+        bdrv_set_type_hint(bdrv, BDRV_TYPE_CDROM);
+        lsi_scsi_attach(scsi, bdrv, -1);
     }
+#endif
 }
 
 static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device,