ia64/xen-unstable

changeset 5188:f5f2c67044b5

bitkeeper revision 1.1579 (429831c4g3vltIzzOokMmu5rtSZAcQ)

[PATCH] [PATCH] ioemu: enable Cirrus VGA emulation

At some point the Cirrus VGA driver was commented out. Probably
for debugging. The patch below adds it back in. It works just fine.

Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com>
author leendert@watson.ibm.com[kaf24]
date Sat May 28 08:54:28 2005 +0000 (2005-05-28)
parents 7d7ad3d01377
children 7d0a21c7ba33
files tools/ioemu/hw/pc.c tools/ioemu/hw/vga.c tools/ioemu/target-i386-dm/Makefile
line diff
     1.1 --- a/tools/ioemu/hw/pc.c	Sat May 28 08:54:12 2005 +0000
     1.2 +++ b/tools/ioemu/hw/pc.c	Sat May 28 08:54:28 2005 +0000
     1.3 @@ -389,7 +389,7 @@ void pc_init(int ram_size, int vga_ram_s
     1.4      linux_boot = (kernel_filename != NULL);
     1.5  
     1.6      /* allocate RAM */
     1.7 -//    cpu_register_physical_memory(0, ram_size, 0);
     1.8 +//  cpu_register_physical_memory(0, ram_size, 0);
     1.9  
    1.10  #ifndef NOBIOS
    1.11      /* BIOS load */
    1.12 @@ -436,9 +436,9 @@ void pc_init(int ram_size, int vga_ram_s
    1.13      /* map all the bios at the top of memory */
    1.14      cpu_register_physical_memory((uint32_t)(-bios_size), 
    1.15                                   bios_size, bios_offset | IO_MEM_ROM);
    1.16 +#endif
    1.17      
    1.18      bochs_bios_init();
    1.19 -#endif
    1.20  
    1.21      if (linux_boot) {
    1.22          uint8_t bootsect[512];
    1.23 @@ -508,9 +508,6 @@ void pc_init(int ram_size, int vga_ram_s
    1.24  
    1.25      register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
    1.26  
    1.27 -#ifdef NOBIOS
    1.28 -    cirrus_vga_enabled = 0;
    1.29 -#endif
    1.30      if (cirrus_vga_enabled) {
    1.31          if (pci_enabled) {
    1.32              pci_cirrus_vga_init(pci_bus, 
     2.1 --- a/tools/ioemu/hw/vga.c	Sat May 28 08:54:12 2005 +0000
     2.2 +++ b/tools/ioemu/hw/vga.c	Sat May 28 08:54:28 2005 +0000
     2.3 @@ -1877,7 +1877,7 @@ void vga_common_init(VGAState *s, Displa
     2.4  
     2.5      /* qemu's vga mem is not detached from phys_ram_base and can cause DM abort
     2.6       * when guest write vga mem, so allocate a new one */
     2.7 -    s->vram_ptr = qemu_mallocz(256 * 1024);
     2.8 +    s->vram_ptr = qemu_mallocz(vga_ram_size);
     2.9  
    2.10      s->vram_offset = vga_ram_offset;
    2.11      s->vram_size = vga_ram_size;
     3.1 --- a/tools/ioemu/target-i386-dm/Makefile	Sat May 28 08:54:12 2005 +0000
     3.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Sat May 28 08:54:28 2005 +0000
     3.3 @@ -272,6 +272,7 @@ endif
     3.4  # Hardware support
     3.5  VL_OBJS+= ide.o ne2000.o pckbd.o vga.o dma.o
     3.6  VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o port-e9.o
     3.7 +VL_OBJS+= cirrus_vga.o
     3.8  
     3.9  ifeq ($(TARGET_ARCH), ppc)
    3.10  VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)