diff mbox

[3/3] Switch isa vga to seavgabios too.

Message ID 1334657499-20105-4-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann April 17, 2012, 10:11 a.m. UTC
Note: untested as 'qemu -M isapc' is broken.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vga-isa.c               |    2 +-
 hw/vga_int.h               |    1 -
 pc-bios/vgabios-isavga.bin |  Bin 0 -> 37888 bytes
 3 files changed, 1 insertions(+), 2 deletions(-)
 create mode 100644 pc-bios/vgabios-isavga.bin

diff --git a/pc-bios/vgabios-isavga.bin b/pc-bios/vgabios-isavga.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eb50c59c50373fcfe28bf0ccb861bdb2176afb95
GIT binary patch

[ zapped to not spam the list ]

Comments

Andreas Färber April 17, 2012, 3:48 p.m. UTC | #1
Am 17.04.2012 12:11, schrieb Gerd Hoffmann:
> Note: untested as 'qemu -M isapc' is broken.

I thought Jan fixed isapc at some point? What's broken now?

qemu-system-i386 btw. ;)

Andreas
Jan Kiszka April 17, 2012, 3:57 p.m. UTC | #2
On 2012-04-17 17:48, Andreas Färber wrote:
> Am 17.04.2012 12:11, schrieb Gerd Hoffmann:
>> Note: untested as 'qemu -M isapc' is broken.
> 
> I thought Jan fixed isapc at some point? What's broken now?

TCG is broken due to Seabios assuming it could write to read-only RAM
areas. -enable-kvm works as KVM lacks read-only slot support.

Jan
diff mbox

Patch

diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 4bcc4db..6dfc28d 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -65,7 +65,7 @@  static int vga_initfn(ISADevice *dev)
 
     vga_init_vbe(s, isa_address_space(dev));
     /* ROM BIOS */
-    rom_add_vga(VGABIOS_FILENAME);
+    rom_add_vga("vgabios-isavga.bin");
     return 0;
 }
 
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 7685b2b..ab5826f 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -209,7 +209,6 @@  extern const uint8_t sr_mask[8];
 extern const uint8_t gr_mask[16];
 
 #define VGA_RAM_SIZE (8192 * 1024)
-#define VGABIOS_FILENAME "vgabios.bin"
 #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
 
 extern const MemoryRegionOps vga_mem_ops;