From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NodK2-0005Gr-Se
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 08:48:38 -0500
Received: from [199.232.76.173] (port=48405 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NodK2-0005Gf-F5
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 08:48:38 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <roytam@gmail.com>) id 1NodK1-0005FR-Jz
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 08:48:38 -0500
Received: from mail-pw0-f45.google.com ([209.85.160.45]:59997)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <roytam@gmail.com>) id 1NodK1-0005FB-7P
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 08:48:37 -0500
Received: by pwi4 with SMTP id 4so3382911pwi.4
	for <qemu-devel@nongnu.org>; Mon, 08 Mar 2010 05:48:36 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <473191351003080308x1dcded56ted4fde0458767f8c@mail.gmail.com>
References: <473191351003071804x62acae0bk3f967b6be1f22a54@mail.gmail.com>
	<20100308100538.GD2869@shareable.org>
	<473191351003080308x1dcded56ted4fde0458767f8c@mail.gmail.com>
From: Roy Tam <roytam@gmail.com>
Date: Mon, 8 Mar 2010 21:48:11 +0800
Message-ID: <473191351003080548h72dbfbdaje5e10f7aa7bdf08b@mail.gmail.com>
Subject: Re: [Qemu-devel] Regression: more 0.12 regression (SeaBIOS related?)
Content-Type: text/plain; charset=ISO-8859-1
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: Jamie Lokier <jamie@shareable.org>
Cc: qemu-devel <qemu-devel@nongnu.org>

2010/3/8 Roy Tam <roytam@gmail.com>:
> the following hack reenables QEMU/Bochs BIOS booting with -vga std
> (for both pc and isapc):

a more complete hack, cirrus vga will work too:
---
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 9f61a01..3a12eaa 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3131,6 +3131,11 @@ void isa_cirrus_vga_init(void)
                                      &s->vga);
     vmstate_register(0, &vmstate_cirrus_vga, s);
     rom_add_vga(VGABIOS_CIRRUS_FILENAME);
+
+    /* XXX Bochs BIOS re-enable hack */
+#ifdef TARGET_I386
+    rom_add_file_fixed(VGABIOS_CIRRUS_FILENAME, 0xc0000);
+#endif
     /* XXX ISA-LFB support */
 }

@@ -3217,6 +3222,11 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
 void pci_cirrus_vga_init(PCIBus *bus)
 {
     pci_create_simple(bus, -1, "cirrus-vga");
+
+    /* XXX Bochs BIOS re-enable hack */
+#ifdef TARGET_I386
+    rom_add_file_fixed(VGABIOS_CIRRUS_FILENAME, 0xc0000);
+#endif
 }

 static PCIDeviceInfo cirrus_vga_info = {
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 7937144..5ef91a6 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -45,5 +45,10 @@ int isa_vga_init(void)
     vga_init_vbe(s);
     /* ROM BIOS */
     rom_add_vga(VGABIOS_FILENAME);
+
+    /* XXX Bochs BIOS re-enable hack */
+#ifdef TARGET_I386
+    rom_add_file_fixed(VGABIOS_FILENAME, 0xc0000);
+#endif
     return 0;
 }
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index eef78ed..105a277 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -109,6 +109,11 @@ static int pci_vga_initfn(PCIDevice *dev)
     vga_init_vbe(s);
      /* ROM BIOS */
      rom_add_vga(VGABIOS_FILENAME);
+
+    /* XXX Bochs BIOS re-enable hack */
+#ifdef TARGET_I386
+     rom_add_file_fixed(VGABIOS_FILENAME, 0xc0000);
+#endif
      return 0;
 }