[Qemu-devel] qemu/hw mips_malta.c

[Qemu-devel] qemu/hw mips_malta.c

[Thiemo Seufer]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Thiemo Seufer <ths>	07/02/20 13:39:32

Modified files:
	hw             : mips_malta.c 

Log message:
	2nd serial port for Malta, by Jason Wessel.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemu&r1=1.8&r2=1.9

Re: [Qemu-devel][PATCH] qemu/hw mips_malta.c

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

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


[-- Attachment #2: mips_malta.patch --]
[-- Type: text/x-diff, Size: 1124 bytes --]

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.

Re: [Qemu-devel][PATCH] qemu/hw mips_malta.c

[Thiemo Seufer]

Stefan Weil wrote:
> 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.

Thanks. I expanded it slightly ...

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

... and made that a separate patch.

> 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?

Apparently fell through the cracks, please resend.


Thiemo