From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HJxv1-000759-Vb
	for qemu-devel@nongnu.org; Wed, 21 Feb 2007 15:18:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HJxuz-000748-7p
	for qemu-devel@nongnu.org; Wed, 21 Feb 2007 15:18:27 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HJxuz-000745-1U
	for qemu-devel@nongnu.org; Wed, 21 Feb 2007 15:18:25 -0500
Received: from moutng.kundenserver.de ([212.227.126.186])
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1HJxuy-0005PT-Hy
	for qemu-devel@nongnu.org; Wed, 21 Feb 2007 15:18:24 -0500
Received: from localhost ([127.0.0.1] ident=stefan)
	by localhost.localdomain with esmtp (Exim 4.63)
	(envelope-from <Stefan.Weil@weilnetz.de>) id 1HJxue-0001oH-Mk
	for qemu-devel@nongnu.org; Wed, 21 Feb 2007 21:18:04 +0100
Message-ID: <45DCA8FB.7000809@weilnetz.de>
Date: Wed, 21 Feb 2007 21:18:03 +0100
From: Stefan Weil <Stefan.Weil@weilnetz.de>
MIME-Version: 1.0
Subject: Re: [Qemu-devel][PATCH] qemu/hw mips_malta.c
References: <E1HJVDQ-0002cL-6P@savannah.gnu.org>
In-Reply-To: <E1HJVDQ-0002cL-6P@savannah.gnu.org>
Content-Type: multipart/mixed; boundary="------------090106040604050205060002"
Reply-To: 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>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------090106040604050205060002
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

With your change, both serial ports are connected to
the same virtual console which results in a funny
but unwanted behaviour.

My patch fixes this.

The patch also modifies the BIOS check. It is now
possible to load a BIOS with less than 4 MiB.

What about my patch for EEPROM 24C01 / 24C02
emulation needed for SDRAM SPD (dated 2007-01-23)?
Is there any reason why it cannot be included in
CVS HEAD?

Without it, Malta won't run Redboot BIOS...

Stefan


--------------090106040604050205060002
Content-Type: text/x-diff;
 name="mips_malta.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mips_malta.patch"

Index: hw/mips_malta.c
===================================================================
--- hw/mips_malta.c	(Revision 467)
+++ hw/mips_malta.c	(Arbeitskopie)
@@ -533,7 +533,7 @@
     } else {
         snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
         ret = load_image(buf, phys_ram_base + bios_offset);
-        if (ret != BIOS_SIZE) {
+        if (ret < 0 || ret > BIOS_SIZE) {
             fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
                     buf);
             exit(1);
@@ -569,8 +569,12 @@
     /* Super I/O */
     kbd_init();
     rtc_state = rtc_init(0x70, 8);
-    serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
-    serial_init(&pic_set_irq_new, isa_pic, 0x2f8, 4, serial_hds[0]);
+    if (serial_hds[0]) {
+        serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
+    }
+    if (serial_hds[1]) {
+        serial_init(&pic_set_irq_new, isa_pic, 0x2f8, 4, serial_hds[1]);
+    }
     parallel_init(0x378, 7, parallel_hds[0]);
     /* XXX: The floppy controller does not work correctly, something is
        probably wrong.

--------------090106040604050205060002--