ia64/xen-unstable

changeset 10808:b4d5a36e380b

[qemu] Initialize vga from within qemu for when the bios doesn't do so.
On xen/x86, vga bios is copied to 0xC0000 by guest firmware.
However on ia64 platform, native firmware depends on some
initialization vga state at power on and so does guest firmware.
That's why that vga bios initialization stub is required for vti
domain, to match platform requirement.

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Jul 26 15:20:30 2006 +0100 (2006-07-26)
parents 3e07ec30c445
children 21918b22746e 5d76b22f80e4
files tools/ioemu/hw/vga.c tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/qemu-init-vgabios tools/ioemu/patches/series tools/ioemu/patches/shadow-vram tools/ioemu/patches/shared-vram
line diff
     1.1 --- a/tools/ioemu/hw/vga.c	Wed Jul 26 14:52:47 2006 +0100
     1.2 +++ b/tools/ioemu/hw/vga.c	Wed Jul 26 15:20:30 2006 +0100
     1.3 @@ -1773,6 +1773,136 @@ static void vga_map(PCIDevice *pci_dev, 
     1.4      }
     1.5  }
     1.6  
     1.7 +/* do the same job as vgabios before vgabios get ready - yeah */
     1.8 +void vga_bios_init(VGAState *s)
     1.9 +{
    1.10 +    uint8_t palette_model[192] = {
    1.11 +        0,   0,   0,   0,   0, 170,   0, 170,
    1.12 +	0,   0, 170, 170, 170,   0,   0, 170,
    1.13 +        0, 170, 170,  85,   0, 170, 170, 170,
    1.14 +       85,  85,  85,  85,  85, 255,  85, 255,
    1.15 +       85,  85, 255, 255, 255,  85,  85, 255, 
    1.16 +       85, 255, 255, 255,  85, 255, 255, 255,
    1.17 +        0,  21,   0,   0,  21,  42,   0,  63,
    1.18 +        0,   0,  63,  42,  42,  21,   0,  42,
    1.19 +       21,  42,  42,  63,   0,  42,  63,  42,
    1.20 +        0,  21,  21,   0,  21,  63,   0,  63, 
    1.21 +       21,   0,  63,  63,  42,  21,  21,  42,
    1.22 +       21,  63,  42,  63,  21,  42,  63,  63,
    1.23 +       21,   0,   0,  21,   0,  42,  21,  42,
    1.24 +        0,  21,  42,  42,  63,   0,   0,  63,
    1.25 +        0,  42,  63,  42,   0,  63,  42,  42,
    1.26 +       21,   0,  21,  21,   0,  63,  21,  42,
    1.27 +       21,  21,  42,  63,  63,   0,  21,  63,
    1.28 +        0,  63,  63,  42,  21,  63,  42,  63,
    1.29 +       21,  21,   0,  21,  21,  42,  21,  63,
    1.30 +        0,  21,  63,  42,  63,  21,   0,  63,
    1.31 +       21,  42,  63,  63,   0,  63,  63,  42,
    1.32 +       21,  21,  21,  21,  21,  63,  21,  63,
    1.33 +       21,  21,  63,  63,  63,  21,  21,  63,
    1.34 +       21,  63,  63,  63,  21,  63,  63,  63
    1.35 +    };
    1.36 +
    1.37 +    s->latch = 0; 
    1.38 +
    1.39 +    s->sr_index = 3; 
    1.40 +    s->sr[0] = 3;
    1.41 +    s->sr[1] = 0;
    1.42 +    s->sr[2] = 3;
    1.43 +    s->sr[3] = 0;
    1.44 +    s->sr[4] = 2;
    1.45 +    s->sr[5] = 0;
    1.46 +    s->sr[6] = 0;
    1.47 +    s->sr[7] = 0;
    1.48 +
    1.49 +    s->gr_index = 5; 
    1.50 +    s->gr[0] = 0;
    1.51 +    s->gr[1] = 0;
    1.52 +    s->gr[2] = 0;
    1.53 +    s->gr[3] = 0;
    1.54 +    s->gr[4] = 0;
    1.55 +    s->gr[5] = 16;
    1.56 +    s->gr[6] = 14;
    1.57 +    s->gr[7] = 15;
    1.58 +    s->gr[8] = 255;
    1.59 +
    1.60 +    /* changed by out 0x03c0 */
    1.61 +    s->ar_index = 32;
    1.62 +    s->ar[0] = 0;
    1.63 +    s->ar[1] = 1;
    1.64 +    s->ar[2] = 2;
    1.65 +    s->ar[3] = 3;
    1.66 +    s->ar[4] = 4;
    1.67 +    s->ar[5] = 5;
    1.68 +    s->ar[6] = 6;
    1.69 +    s->ar[7] = 7;
    1.70 +    s->ar[8] = 8;
    1.71 +    s->ar[9] = 9;
    1.72 +    s->ar[10] = 10;
    1.73 +    s->ar[11] = 11;
    1.74 +    s->ar[12] = 12;
    1.75 +    s->ar[13] = 13;
    1.76 +    s->ar[14] = 14;
    1.77 +    s->ar[15] = 15;
    1.78 +    s->ar[16] = 12;
    1.79 +    s->ar[17] = 0;
    1.80 +    s->ar[18] = 15;
    1.81 +    s->ar[19] = 8;
    1.82 +    s->ar[20] = 0;
    1.83 +
    1.84 +    s->ar_flip_flop = 1; 
    1.85 +
    1.86 +    s->cr_index = 15; 
    1.87 +    s->cr[0] = 95;
    1.88 +    s->cr[1] = 79;
    1.89 +    s->cr[2] = 80;
    1.90 +    s->cr[3] = 130;
    1.91 +    s->cr[4] = 85;
    1.92 +    s->cr[5] = 129;
    1.93 +    s->cr[6] = 191;
    1.94 +    s->cr[7] = 31;
    1.95 +    s->cr[8] = 0;
    1.96 +    s->cr[9] = 79;
    1.97 +    s->cr[10] = 14;
    1.98 +    s->cr[11] = 15;
    1.99 +    s->cr[12] = 0;
   1.100 +    s->cr[13] = 0;
   1.101 +    s->cr[14] = 5;
   1.102 +    s->cr[15] = 160;
   1.103 +    s->cr[16] = 156;
   1.104 +    s->cr[17] = 142;
   1.105 +    s->cr[18] = 143;
   1.106 +    s->cr[19] = 40;
   1.107 +    s->cr[20] = 31;
   1.108 +    s->cr[21] = 150;
   1.109 +    s->cr[22] = 185;
   1.110 +    s->cr[23] = 163;
   1.111 +    s->cr[24] = 255;
   1.112 +
   1.113 +    s->msr = 103; 
   1.114 +    s->fcr = 0; 
   1.115 +    s->st00 = 0; 
   1.116 +    s->st01 = 0; 
   1.117 +
   1.118 +    /* dac_* & palette will be initialized by os through out 0x03c8 &
   1.119 +     * out 0c03c9(1:3) */
   1.120 +    s->dac_state = 0; 
   1.121 +    s->dac_sub_index = 0; 
   1.122 +    s->dac_read_index = 0; 
   1.123 +    s->dac_write_index = 16; 
   1.124 +    s->dac_cache[0] = 255;
   1.125 +    s->dac_cache[1] = 255;
   1.126 +    s->dac_cache[2] = 255;
   1.127 +
   1.128 +    /* palette */
   1.129 +    memcpy(s->palette, palette_model, 192);
   1.130 +
   1.131 +    s->bank_offset = 0;
   1.132 +    s->graphic_mode = -1;
   1.133 +
   1.134 +    /* TODO: add vbe support if enabled */
   1.135 +}
   1.136 +
   1.137  /* when used on xen environment, the vga_ram_base is not used */
   1.138  void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 
   1.139                       unsigned long vga_ram_offset, int vga_ram_size)
     2.1 --- a/tools/ioemu/patches/domain-timeoffset	Wed Jul 26 14:52:47 2006 +0100
     2.2 +++ b/tools/ioemu/patches/domain-timeoffset	Wed Jul 26 15:20:30 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/mc146818rtc.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/mc146818rtc.c	2006-07-26 14:33:00.461515790 +0100
     2.7 -+++ ioemu/hw/mc146818rtc.c	2006-07-26 14:33:07.689716710 +0100
     2.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-07-26 15:17:35.110819901 +0100
     2.9 ++++ ioemu/hw/mc146818rtc.c	2006-07-26 15:17:40.292255496 +0100
    2.10  @@ -178,10 +178,27 @@
    2.11       }
    2.12   }
    2.13 @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
    2.14   static void rtc_copy_date(RTCState *s)
    2.15  Index: ioemu/hw/pc.c
    2.16  ===================================================================
    2.17 ---- ioemu.orig/hw/pc.c	2006-07-26 14:33:07.435744787 +0100
    2.18 -+++ ioemu/hw/pc.c	2006-07-26 14:33:07.690716600 +0100
    2.19 +--- ioemu.orig/hw/pc.c	2006-07-26 15:17:39.820306906 +0100
    2.20 ++++ ioemu/hw/pc.c	2006-07-26 15:17:40.293255388 +0100
    2.21  @@ -151,7 +151,7 @@
    2.22   }
    2.23   
    2.24 @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
    2.25   QEMUMachine pc_machine = {
    2.26  Index: ioemu/vl.c
    2.27  ===================================================================
    2.28 ---- ioemu.orig/vl.c	2006-07-26 14:33:07.566730307 +0100
    2.29 -+++ ioemu/vl.c	2006-07-26 14:33:07.692716379 +0100
    2.30 +--- ioemu.orig/vl.c	2006-07-26 15:17:40.169268893 +0100
    2.31 ++++ ioemu/vl.c	2006-07-26 15:17:40.296255061 +0100
    2.32  @@ -164,6 +164,8 @@
    2.33   
    2.34   int xc_handle;
    2.35 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
    2.36       qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
    2.37  Index: ioemu/vl.h
    2.38  ===================================================================
    2.39 ---- ioemu.orig/vl.h	2006-07-26 14:33:07.439744345 +0100
    2.40 -+++ ioemu/vl.h	2006-07-26 14:33:07.693716268 +0100
    2.41 +--- ioemu.orig/vl.h	2006-07-26 15:17:39.825306361 +0100
    2.42 ++++ ioemu/vl.h	2006-07-26 15:17:40.297254952 +0100
    2.43  @@ -556,7 +556,7 @@
    2.44                                    int boot_device,
    2.45                DisplayState *ds, const char **fd_filename, int snapshot,
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/tools/ioemu/patches/qemu-init-vgabios	Wed Jul 26 15:20:30 2006 +0100
     3.3 @@ -0,0 +1,141 @@
     3.4 +Index: ioemu/hw/vga.c
     3.5 +===================================================================
     3.6 +--- ioemu.orig/hw/vga.c	2006-07-26 15:16:41.955609165 +0100
     3.7 ++++ ioemu/hw/vga.c	2006-07-26 15:17:16.910802283 +0100
     3.8 +@@ -1669,6 +1669,136 @@
     3.9 +     }
    3.10 + }
    3.11 + 
    3.12 ++/* do the same job as vgabios before vgabios get ready - yeah */
    3.13 ++void vga_bios_init(VGAState *s)
    3.14 ++{
    3.15 ++    uint8_t palette_model[192] = {
    3.16 ++        0,   0,   0,   0,   0, 170,   0, 170,
    3.17 ++	0,   0, 170, 170, 170,   0,   0, 170,
    3.18 ++        0, 170, 170,  85,   0, 170, 170, 170,
    3.19 ++       85,  85,  85,  85,  85, 255,  85, 255,
    3.20 ++       85,  85, 255, 255, 255,  85,  85, 255, 
    3.21 ++       85, 255, 255, 255,  85, 255, 255, 255,
    3.22 ++        0,  21,   0,   0,  21,  42,   0,  63,
    3.23 ++        0,   0,  63,  42,  42,  21,   0,  42,
    3.24 ++       21,  42,  42,  63,   0,  42,  63,  42,
    3.25 ++        0,  21,  21,   0,  21,  63,   0,  63, 
    3.26 ++       21,   0,  63,  63,  42,  21,  21,  42,
    3.27 ++       21,  63,  42,  63,  21,  42,  63,  63,
    3.28 ++       21,   0,   0,  21,   0,  42,  21,  42,
    3.29 ++        0,  21,  42,  42,  63,   0,   0,  63,
    3.30 ++        0,  42,  63,  42,   0,  63,  42,  42,
    3.31 ++       21,   0,  21,  21,   0,  63,  21,  42,
    3.32 ++       21,  21,  42,  63,  63,   0,  21,  63,
    3.33 ++        0,  63,  63,  42,  21,  63,  42,  63,
    3.34 ++       21,  21,   0,  21,  21,  42,  21,  63,
    3.35 ++        0,  21,  63,  42,  63,  21,   0,  63,
    3.36 ++       21,  42,  63,  63,   0,  63,  63,  42,
    3.37 ++       21,  21,  21,  21,  21,  63,  21,  63,
    3.38 ++       21,  21,  63,  63,  63,  21,  21,  63,
    3.39 ++       21,  63,  63,  63,  21,  63,  63,  63
    3.40 ++    };
    3.41 ++
    3.42 ++    s->latch = 0; 
    3.43 ++
    3.44 ++    s->sr_index = 3; 
    3.45 ++    s->sr[0] = 3;
    3.46 ++    s->sr[1] = 0;
    3.47 ++    s->sr[2] = 3;
    3.48 ++    s->sr[3] = 0;
    3.49 ++    s->sr[4] = 2;
    3.50 ++    s->sr[5] = 0;
    3.51 ++    s->sr[6] = 0;
    3.52 ++    s->sr[7] = 0;
    3.53 ++
    3.54 ++    s->gr_index = 5; 
    3.55 ++    s->gr[0] = 0;
    3.56 ++    s->gr[1] = 0;
    3.57 ++    s->gr[2] = 0;
    3.58 ++    s->gr[3] = 0;
    3.59 ++    s->gr[4] = 0;
    3.60 ++    s->gr[5] = 16;
    3.61 ++    s->gr[6] = 14;
    3.62 ++    s->gr[7] = 15;
    3.63 ++    s->gr[8] = 255;
    3.64 ++
    3.65 ++    /* changed by out 0x03c0 */
    3.66 ++    s->ar_index = 32;
    3.67 ++    s->ar[0] = 0;
    3.68 ++    s->ar[1] = 1;
    3.69 ++    s->ar[2] = 2;
    3.70 ++    s->ar[3] = 3;
    3.71 ++    s->ar[4] = 4;
    3.72 ++    s->ar[5] = 5;
    3.73 ++    s->ar[6] = 6;
    3.74 ++    s->ar[7] = 7;
    3.75 ++    s->ar[8] = 8;
    3.76 ++    s->ar[9] = 9;
    3.77 ++    s->ar[10] = 10;
    3.78 ++    s->ar[11] = 11;
    3.79 ++    s->ar[12] = 12;
    3.80 ++    s->ar[13] = 13;
    3.81 ++    s->ar[14] = 14;
    3.82 ++    s->ar[15] = 15;
    3.83 ++    s->ar[16] = 12;
    3.84 ++    s->ar[17] = 0;
    3.85 ++    s->ar[18] = 15;
    3.86 ++    s->ar[19] = 8;
    3.87 ++    s->ar[20] = 0;
    3.88 ++
    3.89 ++    s->ar_flip_flop = 1; 
    3.90 ++
    3.91 ++    s->cr_index = 15; 
    3.92 ++    s->cr[0] = 95;
    3.93 ++    s->cr[1] = 79;
    3.94 ++    s->cr[2] = 80;
    3.95 ++    s->cr[3] = 130;
    3.96 ++    s->cr[4] = 85;
    3.97 ++    s->cr[5] = 129;
    3.98 ++    s->cr[6] = 191;
    3.99 ++    s->cr[7] = 31;
   3.100 ++    s->cr[8] = 0;
   3.101 ++    s->cr[9] = 79;
   3.102 ++    s->cr[10] = 14;
   3.103 ++    s->cr[11] = 15;
   3.104 ++    s->cr[12] = 0;
   3.105 ++    s->cr[13] = 0;
   3.106 ++    s->cr[14] = 5;
   3.107 ++    s->cr[15] = 160;
   3.108 ++    s->cr[16] = 156;
   3.109 ++    s->cr[17] = 142;
   3.110 ++    s->cr[18] = 143;
   3.111 ++    s->cr[19] = 40;
   3.112 ++    s->cr[20] = 31;
   3.113 ++    s->cr[21] = 150;
   3.114 ++    s->cr[22] = 185;
   3.115 ++    s->cr[23] = 163;
   3.116 ++    s->cr[24] = 255;
   3.117 ++
   3.118 ++    s->msr = 103; 
   3.119 ++    s->fcr = 0; 
   3.120 ++    s->st00 = 0; 
   3.121 ++    s->st01 = 0; 
   3.122 ++
   3.123 ++    /* dac_* & palette will be initialized by os through out 0x03c8 &
   3.124 ++     * out 0c03c9(1:3) */
   3.125 ++    s->dac_state = 0; 
   3.126 ++    s->dac_sub_index = 0; 
   3.127 ++    s->dac_read_index = 0; 
   3.128 ++    s->dac_write_index = 16; 
   3.129 ++    s->dac_cache[0] = 255;
   3.130 ++    s->dac_cache[1] = 255;
   3.131 ++    s->dac_cache[2] = 255;
   3.132 ++
   3.133 ++    /* palette */
   3.134 ++    memcpy(s->palette, palette_model, 192);
   3.135 ++
   3.136 ++    s->bank_offset = 0;
   3.137 ++    s->graphic_mode = -1;
   3.138 ++
   3.139 ++    /* TODO: add vbe support if enabled */
   3.140 ++}
   3.141 ++
   3.142 + void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 
   3.143 +                      unsigned long vga_ram_offset, int vga_ram_size)
   3.144 + {
     4.1 --- a/tools/ioemu/patches/series	Wed Jul 26 14:52:47 2006 +0100
     4.2 +++ b/tools/ioemu/patches/series	Wed Jul 26 15:20:30 2006 +0100
     4.3 @@ -14,6 +14,7 @@ ioemu-ia64
     4.4  qemu-smp
     4.5  qemu-no-apic
     4.6  qemu-nobios
     4.7 +qemu-init-vgabios
     4.8  xen-network
     4.9  qemu-timer
    4.10  domain-reset
     5.1 --- a/tools/ioemu/patches/shadow-vram	Wed Jul 26 14:52:47 2006 +0100
     5.2 +++ b/tools/ioemu/patches/shadow-vram	Wed Jul 26 15:20:30 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/hw/vga.c
     5.5  ===================================================================
     5.6 ---- ioemu.orig/hw/vga.c	2006-07-26 13:20:34.464363234 +0100
     5.7 -+++ ioemu/hw/vga.c	2006-07-26 13:20:34.660342784 +0100
     5.8 +--- ioemu.orig/hw/vga.c	2006-07-26 15:17:39.821306797 +0100
     5.9 ++++ ioemu/hw/vga.c	2006-07-26 15:17:40.017285449 +0100
    5.10  @@ -1287,6 +1287,105 @@
    5.11       }
    5.12   }
    5.13 @@ -120,7 +120,7 @@ Index: ioemu/hw/vga.c
    5.14       addr1 = (s->start_addr * 4);
    5.15       bwidth = width * 4;
    5.16       y_start = -1;
    5.17 -@@ -1700,6 +1804,14 @@
    5.18 +@@ -1830,6 +1934,14 @@
    5.19   
    5.20       vga_reset(s);
    5.21   
    5.22 @@ -137,8 +137,8 @@ Index: ioemu/hw/vga.c
    5.23       s->vram_size = vga_ram_size;
    5.24  Index: ioemu/hw/vga_int.h
    5.25  ===================================================================
    5.26 ---- ioemu.orig/hw/vga_int.h	2006-07-26 13:20:34.464363234 +0100
    5.27 -+++ ioemu/hw/vga_int.h	2006-07-26 13:20:34.661342680 +0100
    5.28 +--- ioemu.orig/hw/vga_int.h	2006-07-26 15:17:39.822306688 +0100
    5.29 ++++ ioemu/hw/vga_int.h	2006-07-26 15:17:40.017285449 +0100
    5.30  @@ -76,6 +76,7 @@
    5.31   
    5.32   #define VGA_STATE_COMMON                                                \
     6.1 --- a/tools/ioemu/patches/shared-vram	Wed Jul 26 14:52:47 2006 +0100
     6.2 +++ b/tools/ioemu/patches/shared-vram	Wed Jul 26 15:20:30 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/hw/cirrus_vga.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/hw/cirrus_vga.c	2006-07-26 13:18:13.906013141 +0100
     6.7 -+++ ioemu/hw/cirrus_vga.c	2006-07-26 13:20:34.462363443 +0100
     6.8 +--- ioemu.orig/hw/cirrus_vga.c	2006-07-26 15:17:35.230806831 +0100
     6.9 ++++ ioemu/hw/cirrus_vga.c	2006-07-26 15:17:39.819307015 +0100
    6.10  @@ -28,6 +28,9 @@
    6.11    */
    6.12   #include "vl.h"
    6.13 @@ -176,8 +176,8 @@ Index: ioemu/hw/cirrus_vga.c
    6.14   }
    6.15  Index: ioemu/hw/pc.c
    6.16  ===================================================================
    6.17 ---- ioemu.orig/hw/pc.c	2006-07-26 13:20:34.396370329 +0100
    6.18 -+++ ioemu/hw/pc.c	2006-07-26 13:20:34.463363339 +0100
    6.19 +--- ioemu.orig/hw/pc.c	2006-07-26 15:17:39.752314312 +0100
    6.20 ++++ ioemu/hw/pc.c	2006-07-26 15:17:39.820306906 +0100
    6.21  @@ -783,14 +783,14 @@
    6.22       if (cirrus_vga_enabled) {
    6.23           if (pci_enabled) {
    6.24 @@ -198,17 +198,17 @@ Index: ioemu/hw/pc.c
    6.25   
    6.26  Index: ioemu/hw/vga.c
    6.27  ===================================================================
    6.28 ---- ioemu.orig/hw/vga.c	2006-07-26 13:20:33.293485412 +0100
    6.29 -+++ ioemu/hw/vga.c	2006-07-26 13:20:34.464363234 +0100
    6.30 -@@ -1669,6 +1669,7 @@
    6.31 -     }
    6.32 +--- ioemu.orig/hw/vga.c	2006-07-26 15:17:39.352357879 +0100
    6.33 ++++ ioemu/hw/vga.c	2006-07-26 15:17:39.821306797 +0100
    6.34 +@@ -1799,6 +1799,7 @@
    6.35 +     /* TODO: add vbe support if enabled */
    6.36   }
    6.37   
    6.38  +/* when used on xen environment, the vga_ram_base is not used */
    6.39   void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, 
    6.40                        unsigned long vga_ram_offset, int vga_ram_size)
    6.41   {
    6.42 -@@ -1699,7 +1700,7 @@
    6.43 +@@ -1829,7 +1830,7 @@
    6.44   
    6.45       vga_reset(s);
    6.46   
    6.47 @@ -217,7 +217,7 @@ Index: ioemu/hw/vga.c
    6.48       s->vram_offset = vga_ram_offset;
    6.49       s->vram_size = vga_ram_size;
    6.50       s->ds = ds;
    6.51 -@@ -1811,6 +1812,31 @@
    6.52 +@@ -1941,6 +1942,31 @@
    6.53       return 0;
    6.54   }
    6.55   
    6.56 @@ -251,8 +251,8 @@ Index: ioemu/hw/vga.c
    6.57   
    6.58  Index: ioemu/hw/vga_int.h
    6.59  ===================================================================
    6.60 ---- ioemu.orig/hw/vga_int.h	2006-07-26 13:20:33.063509409 +0100
    6.61 -+++ ioemu/hw/vga_int.h	2006-07-26 13:20:34.464363234 +0100
    6.62 +--- ioemu.orig/hw/vga_int.h	2006-07-26 15:17:38.201483242 +0100
    6.63 ++++ ioemu/hw/vga_int.h	2006-07-26 15:17:39.822306688 +0100
    6.64  @@ -166,5 +166,6 @@
    6.65                                unsigned int color0, unsigned int color1,
    6.66                                unsigned int color_xor);
    6.67 @@ -262,8 +262,8 @@ Index: ioemu/hw/vga_int.h
    6.68   extern const uint8_t gr_mask[16];
    6.69  Index: ioemu/vl.c
    6.70  ===================================================================
    6.71 ---- ioemu.orig/vl.c	2006-07-26 13:20:34.398370121 +0100
    6.72 -+++ ioemu/vl.c	2006-07-26 13:20:34.466363026 +0100
    6.73 +--- ioemu.orig/vl.c	2006-07-26 15:17:39.755313985 +0100
    6.74 ++++ ioemu/vl.c	2006-07-26 15:17:39.824306470 +0100
    6.75  @@ -5148,6 +5148,78 @@
    6.76   
    6.77   #define MAX_NET_CLIENTS 32
    6.78 @@ -345,8 +345,8 @@ Index: ioemu/vl.c
    6.79   #ifdef CONFIG_GDBSTUB
    6.80  Index: ioemu/vl.h
    6.81  ===================================================================
    6.82 ---- ioemu.orig/vl.h	2006-07-26 13:20:34.268383684 +0100
    6.83 -+++ ioemu/vl.h	2006-07-26 13:20:34.467362921 +0100
    6.84 +--- ioemu.orig/vl.h	2006-07-26 15:17:39.621328580 +0100
    6.85 ++++ ioemu/vl.h	2006-07-26 15:17:39.825306361 +0100
    6.86  @@ -136,6 +136,13 @@
    6.87   
    6.88   void main_loop_wait(int timeout);