On 1/7/07, Thiemo Seufer <[EMAIL PROTECTED]> wrote:

CVSROOT:        /sources/qemu
Module name:    qemu
Changes by:     Thiemo Seufer <ths>     07/01/07 20:42:14

Modified files:
        .              : qemu-doc.texi vl.c vl.h
        hw             : pc.c sun4m.c

Log message:
        Revert -disk patch, as requested by Fabrice. The general idea of
this
        patch is sound, but the implementation is just too ugly.

CVSWeb URLs:

http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemu&r1=1.120&r2=1.121

http://cvs.savannah.gnu.org/viewcvs/qemu/vl.c?cvsroot=qemu&r1=1.233&r2=1.234

http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.165&r2=1.166

http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pc.c?cvsroot=qemu&r1=1.65&r2=1.66

http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4m.c?cvsroot=qemu&r1=1.22&r2=1.23


_______________________________________________
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


That sun4m.c change breaks disk/cdrom attachment to esp scsi.
Please see the patch to make it work again.

--
Kind regards,
Igor V. Kovalenko
Index: hw/sun4m.c
===================================================================
RCS file: /cvsroot/qemu/qemu/hw/sun4m.c,v
retrieving revision 1.23
diff -u -r1.23 sun4m.c
--- hw/sun4m.c	7 Jan 2007 20:42:14 -0000	1.23
+++ hw/sun4m.c	9 Jan 2007 21:23:53 -0000
@@ -262,6 +262,13 @@
     slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[1], serial_hds[0]);
     fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table);
     main_esp = esp_init(bs_table, PHYS_JJ_ESP, dma);
+
+    for (i = 0; i < MAX_DISKS; i++) {
+        if (bs_table[i]) {
+            esp_scsi_attach(main_esp, bs_table[i], i);
+        }
+    }
+
     slavio_misc = slavio_misc_init(PHYS_JJ_SLAVIO, PHYS_JJ_ME_IRQ);
     cs_init(PHYS_JJ_CS, PHYS_JJ_CS_IRQ, slavio_intctl);
     sparc32_dma_set_reset_data(dma, main_esp, main_lance);
_______________________________________________
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel

Reply via email to