ia64/xen-unstable

changeset 11569:317e8516d464

[qemu patches] Update patches for changeset 11561:c742b2ae920c.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Sep 21 19:28:35 2006 +0100 (2006-09-21)
parents ebb1982c03a1
children 7706696ff532
files tools/ioemu/patches/fix-vga-scanning-code-overflow tools/ioemu/patches/series tools/ioemu/patches/vnc-access-monitor-vt tools/ioemu/patches/vnc-cleanup tools/ioemu/patches/vnc-display-find-unused tools/ioemu/patches/vnc-fixes tools/ioemu/patches/vnc-start-vncviewer tools/ioemu/patches/vnc-title-domain-name
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/tools/ioemu/patches/fix-vga-scanning-code-overflow	Thu Sep 21 19:28:35 2006 +0100
     1.3 @@ -0,0 +1,45 @@
     1.4 +Index: ioemu/hw/vga.c
     1.5 +===================================================================
     1.6 +--- ioemu.orig/hw/vga.c	2006-09-21 19:07:52.000000000 +0100
     1.7 ++++ ioemu/hw/vga.c	2006-09-21 19:08:09.000000000 +0100
     1.8 +@@ -1463,14 +1463,15 @@
     1.9 +  */
    1.10 + static void vga_draw_graphic(VGAState *s, int full_update)
    1.11 + {
    1.12 +-    int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
    1.13 ++    int y1, y, update, linesize, y_start, double_scan, mask;
    1.14 +     int width, height, shift_control, line_offset, bwidth;
    1.15 +     ram_addr_t page0, page1;
    1.16 +     int disp_width, multi_scan, multi_run;
    1.17 +     uint8_t *d;
    1.18 +     uint32_t v, addr1, addr;
    1.19 +     vga_draw_line_func *vga_draw_line;
    1.20 +-    
    1.21 ++    ram_addr_t page_min, page_max;
    1.22 ++
    1.23 +     full_update |= update_basic_params(s);
    1.24 + 
    1.25 +     s->get_resolution(s, &width, &height);
    1.26 +@@ -1561,8 +1562,8 @@
    1.27 +     addr1 = (s->start_addr * 4);
    1.28 +     bwidth = width * 4;
    1.29 +     y_start = -1;
    1.30 +-    page_min = 0x7fffffff;
    1.31 +-    page_max = -1;
    1.32 ++    page_min = 0;
    1.33 ++    page_max = 0;
    1.34 +     d = s->ds->data;
    1.35 +     linesize = s->ds->linesize;
    1.36 +     y1 = 0;
    1.37 +@@ -1592,9 +1593,9 @@
    1.38 +         if (update) {
    1.39 +             if (y_start < 0)
    1.40 +                 y_start = y;
    1.41 +-            if (page0 < page_min)
    1.42 ++            if (page_min == 0 || page0 < page_min)
    1.43 +                 page_min = page0;
    1.44 +-            if (page1 > page_max)
    1.45 ++            if (page_max == 0 || page1 > page_max)
    1.46 +                 page_max = page1;
    1.47 +             vga_draw_line(s, d, s->vram_ptr + addr, width);
    1.48 +             if (s->cursor_draw_line)
     2.1 --- a/tools/ioemu/patches/series	Thu Sep 21 18:58:17 2006 +0100
     2.2 +++ b/tools/ioemu/patches/series	Thu Sep 21 19:28:35 2006 +0100
     2.3 @@ -29,6 +29,7 @@ domain-timeoffset
     2.4  acpi-support
     2.5  acpi-timer-support
     2.6  acpi-poweroff-support
     2.7 +fix-vga-scanning-code-overflow
     2.8  vnc-cleanup
     2.9  vnc-fixes
    2.10  vnc-start-vncviewer
     3.1 --- a/tools/ioemu/patches/vnc-access-monitor-vt	Thu Sep 21 18:58:17 2006 +0100
     3.2 +++ b/tools/ioemu/patches/vnc-access-monitor-vt	Thu Sep 21 19:28:35 2006 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Index: ioemu/vnc.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/vnc.c	2006-08-17 19:50:14.623519661 +0100
     3.7 -+++ ioemu/vnc.c	2006-08-17 19:50:15.956372339 +0100
     3.8 +--- ioemu.orig/vnc.c	2006-09-21 19:10:57.000000000 +0100
     3.9 ++++ ioemu/vnc.c	2006-09-21 19:11:00.000000000 +0100
    3.10  @@ -32,6 +32,10 @@
    3.11   #include "vnc_keysym.h"
    3.12   #include "keymaps.c"
    3.13 @@ -22,7 +22,7 @@ Index: ioemu/vnc.c
    3.14   };
    3.15   
    3.16   #define DIRTY_PIXEL_BITS 64
    3.17 -@@ -794,16 +800,80 @@
    3.18 +@@ -790,16 +796,80 @@
    3.19   
    3.20   static void do_key_event(VncState *vs, int down, uint32_t sym)
    3.21   {
     4.1 --- a/tools/ioemu/patches/vnc-cleanup	Thu Sep 21 18:58:17 2006 +0100
     4.2 +++ b/tools/ioemu/patches/vnc-cleanup	Thu Sep 21 19:28:35 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/vnc.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/vnc.c	2006-08-17 19:37:36.091553839 +0100
     4.7 -+++ ioemu/vnc.c	2006-08-17 19:50:10.313996001 +0100
     4.8 +--- ioemu.orig/vnc.c	2006-09-21 18:54:22.000000000 +0100
     4.9 ++++ ioemu/vnc.c	2006-09-21 19:05:39.000000000 +0100
    4.10  @@ -143,13 +143,16 @@
    4.11   static void vnc_dpy_update(DisplayState *ds, int x, int y, int w, int h)
    4.12   {
    4.13 @@ -30,7 +30,16 @@ Index: ioemu/vnc.c
    4.14   
    4.15       if (vs->need_update && vs->csock != -1) {
    4.16   	int y;
    4.17 -@@ -390,7 +394,7 @@
    4.18 +@@ -383,6 +387,8 @@
    4.19 + 	int saved_offset;
    4.20 + 	int has_dirty = 0;
    4.21 + 
    4.22 ++	qemu_mod_timer(vs->timer, now + VNC_REFRESH_INTERVAL);
    4.23 ++
    4.24 +         vnc_set_bits(width_mask, (vs->width / 16), VNC_DIRTY_WORDS);
    4.25 + 
    4.26 + 	/* Walk through the dirty map and eliminate tiles that
    4.27 +@@ -390,7 +396,7 @@
    4.28   	row = vs->ds->data;
    4.29   	old_row = vs->old_data;
    4.30   
    4.31 @@ -39,34 +48,50 @@ Index: ioemu/vnc.c
    4.32   	    if (vnc_and_bits(vs->dirty_row[y], width_mask, VNC_DIRTY_WORDS)) {
    4.33   		int x;
    4.34   		char *ptr, *old_ptr;
    4.35 -@@ -415,10 +419,8 @@
    4.36 +@@ -415,10 +421,8 @@
    4.37   	    old_row += vs->ds->linesize;
    4.38   	}
    4.39   
    4.40  -	if (!has_dirty) {
    4.41  -	    qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock) + VNC_REFRESH_INTERVAL);
    4.42 --	    return;
    4.43 ++	if (!has_dirty)
    4.44 + 	    return;
    4.45  -	}
    4.46 -+	if (!has_dirty)
    4.47 -+	    goto out;
    4.48   
    4.49   	/* Count rectangles */
    4.50   	n_rectangles = 0;
    4.51 -@@ -456,7 +458,9 @@
    4.52 +@@ -454,17 +458,13 @@
    4.53 + 	vs->output.buffer[saved_offset] = (n_rectangles >> 8) & 0xFF;
    4.54 + 	vs->output.buffer[saved_offset + 1] = n_rectangles & 0xFF;
    4.55   	vnc_flush(vs);
    4.56 - 
    4.57 +-
    4.58       }
    4.59  -    qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock) + VNC_REFRESH_INTERVAL);
    4.60 -+
    4.61 -+ out:
    4.62 -+    qemu_mod_timer(vs->timer, now + VNC_REFRESH_INTERVAL);
    4.63   }
    4.64   
    4.65   static void vnc_timer_init(VncState *vs)
    4.66 + {
    4.67 +-    if (vs->timer == NULL) {
    4.68 ++    if (vs->timer == NULL)
    4.69 + 	vs->timer = qemu_new_timer(rt_clock, vnc_update_client, vs);
    4.70 +-	qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock));
    4.71 +-    }
    4.72 + }
    4.73 + 
    4.74 + static void vnc_dpy_refresh(DisplayState *ds)
    4.75 +@@ -736,6 +736,8 @@
    4.76 + 	    old_row += vs->ds->linesize;
    4.77 + 	}
    4.78 +     }
    4.79 ++
    4.80 ++    qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock));
    4.81 + }
    4.82 + 
    4.83 + static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
    4.84  Index: ioemu/vl.c
    4.85  ===================================================================
    4.86 ---- ioemu.orig/vl.c	2006-08-17 19:50:02.410869542 +0100
    4.87 -+++ ioemu/vl.c	2006-08-17 19:50:10.316995669 +0100
    4.88 +--- ioemu.orig/vl.c	2006-09-21 18:55:38.000000000 +0100
    4.89 ++++ ioemu/vl.c	2006-09-21 19:00:48.000000000 +0100
    4.90  @@ -5120,10 +5120,10 @@
    4.91           /* XXX: better handling of removal */
    4.92           for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
     5.1 --- a/tools/ioemu/patches/vnc-display-find-unused	Thu Sep 21 18:58:17 2006 +0100
     5.2 +++ b/tools/ioemu/patches/vnc-display-find-unused	Thu Sep 21 19:28:35 2006 +0100
     5.3 @@ -1,8 +1,8 @@
     5.4  Index: ioemu/vnc.c
     5.5  ===================================================================
     5.6 ---- ioemu.orig/vnc.c	2006-08-17 19:50:15.956372339 +0100
     5.7 -+++ ioemu/vnc.c	2006-08-17 19:50:17.083247783 +0100
     5.8 -@@ -1183,7 +1183,7 @@
     5.9 +--- ioemu.orig/vnc.c	2006-09-21 19:11:00.000000000 +0100
    5.10 ++++ ioemu/vnc.c	2006-09-21 19:11:03.000000000 +0100
    5.11 +@@ -1181,7 +1181,7 @@
    5.12       }
    5.13   }
    5.14   
    5.15 @@ -11,7 +11,7 @@ Index: ioemu/vnc.c
    5.16   {
    5.17       struct sockaddr_in addr;
    5.18       int reuse_addr, ret;
    5.19 -@@ -1214,10 +1214,6 @@
    5.20 +@@ -1212,10 +1212,6 @@
    5.21   	exit(1);
    5.22       }
    5.23   
    5.24 @@ -22,7 +22,7 @@ Index: ioemu/vnc.c
    5.25       reuse_addr = 1;
    5.26       ret = setsockopt(vs->lsock, SOL_SOCKET, SO_REUSEADDR,
    5.27   		     (const char *)&reuse_addr, sizeof(reuse_addr));
    5.28 -@@ -1226,7 +1222,16 @@
    5.29 +@@ -1224,7 +1220,16 @@
    5.30   	exit(1);
    5.31       }
    5.32   
    5.33 @@ -39,7 +39,7 @@ Index: ioemu/vnc.c
    5.34   	fprintf(stderr, "bind() failed\n");
    5.35   	exit(1);
    5.36       }
    5.37 -@@ -1247,6 +1252,8 @@
    5.38 +@@ -1245,6 +1250,8 @@
    5.39       vs->ds->dpy_refresh = vnc_dpy_refresh;
    5.40   
    5.41       vnc_dpy_resize(vs->ds, 640, 400);
    5.42 @@ -50,8 +50,8 @@ Index: ioemu/vnc.c
    5.43   int vnc_start_viewer(int port)
    5.44  Index: ioemu/vl.c
    5.45  ===================================================================
    5.46 ---- ioemu.orig/vl.c	2006-08-17 19:50:13.152682236 +0100
    5.47 -+++ ioemu/vl.c	2006-08-17 19:50:17.086247452 +0100
    5.48 +--- ioemu.orig/vl.c	2006-09-21 19:10:53.000000000 +0100
    5.49 ++++ ioemu/vl.c	2006-09-21 19:11:03.000000000 +0100
    5.50  @@ -121,6 +121,7 @@
    5.51   static DisplayState display_state;
    5.52   int nographic;
    5.53 @@ -115,8 +115,8 @@ Index: ioemu/vl.c
    5.54       } else {
    5.55  Index: ioemu/vl.h
    5.56  ===================================================================
    5.57 ---- ioemu.orig/vl.h	2006-08-17 19:50:13.153682125 +0100
    5.58 -+++ ioemu/vl.h	2006-08-17 19:50:17.087247341 +0100
    5.59 +--- ioemu.orig/vl.h	2006-09-21 19:10:53.000000000 +0100
    5.60 ++++ ioemu/vl.h	2006-09-21 19:11:03.000000000 +0100
    5.61  @@ -785,7 +785,7 @@
    5.62   void cocoa_display_init(DisplayState *ds, int full_screen);
    5.63   
     6.1 --- a/tools/ioemu/patches/vnc-fixes	Thu Sep 21 18:58:17 2006 +0100
     6.2 +++ b/tools/ioemu/patches/vnc-fixes	Thu Sep 21 19:28:35 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/vl.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/vl.c	2006-08-17 19:50:10.316995669 +0100
     6.7 -+++ ioemu/vl.c	2006-08-17 19:50:12.100798502 +0100
     6.8 +--- ioemu.orig/vl.c	2006-09-21 19:08:18.000000000 +0100
     6.9 ++++ ioemu/vl.c	2006-09-21 19:26:24.000000000 +0100
    6.10  @@ -6534,8 +6534,10 @@
    6.11           }
    6.12       }
    6.13 @@ -17,8 +17,8 @@ Index: ioemu/vl.c
    6.14       if (use_gdbstub) {
    6.15  Index: ioemu/vnc.c
    6.16  ===================================================================
    6.17 ---- ioemu.orig/vnc.c	2006-08-17 19:50:10.313996001 +0100
    6.18 -+++ ioemu/vnc.c	2006-08-17 19:50:12.101798392 +0100
    6.19 +--- ioemu.orig/vnc.c	2006-09-21 19:08:18.000000000 +0100
    6.20 ++++ ioemu/vnc.c	2006-09-21 19:26:38.000000000 +0100
    6.21  @@ -3,6 +3,7 @@
    6.22    * 
    6.23    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
    6.24 @@ -240,7 +240,7 @@ Index: ioemu/vnc.c
    6.25   {
    6.26       VncState *vs = opaque;
    6.27       int64_t now = qemu_get_clock(rt_clock);
    6.28 -@@ -382,12 +445,16 @@
    6.29 +@@ -382,14 +445,18 @@
    6.30   	int y;
    6.31   	char *row;
    6.32   	char *old_row;
    6.33 @@ -252,6 +252,8 @@ Index: ioemu/vnc.c
    6.34  +	int maxx, maxy;
    6.35  +	int tile_bytes = vs->depth * DP2X(vs, 1);
    6.36   
    6.37 + 	qemu_mod_timer(vs->timer, now + VNC_REFRESH_INTERVAL);
    6.38 + 
    6.39  -        vnc_set_bits(width_mask, (vs->width / 16), VNC_DIRTY_WORDS);
    6.40  +	if (vs->width != DP2X(vs, DIRTY_PIXEL_BITS))
    6.41  +	    width_mask = (1ULL << X2DP_UP(vs, vs->ds->width)) - 1;
    6.42 @@ -260,7 +262,7 @@ Index: ioemu/vnc.c
    6.43   
    6.44   	/* Walk through the dirty map and eliminate tiles that
    6.45   	   really aren't dirty */
    6.46 -@@ -395,23 +462,25 @@
    6.47 +@@ -397,23 +464,25 @@
    6.48   	old_row = vs->old_data;
    6.49   
    6.50   	for (y = 0; y < vs->ds->height; y++) {
    6.51 @@ -295,17 +297,17 @@ Index: ioemu/vnc.c
    6.52   		}
    6.53   	    }
    6.54   
    6.55 -@@ -419,7 +488,8 @@
    6.56 +@@ -421,7 +490,8 @@
    6.57   	    old_row += vs->ds->linesize;
    6.58   	}
    6.59   
    6.60  -	if (!has_dirty)
    6.61  +	if (!vs->has_update || vs->visible_y >= vs->ds->height ||
    6.62  +	    vs->visible_x >= vs->ds->width)
    6.63 - 	    goto out;
    6.64 + 	    return;
    6.65   
    6.66   	/* Count rectangles */
    6.67 -@@ -429,40 +499,61 @@
    6.68 +@@ -431,34 +501,56 @@
    6.69   	saved_offset = vs->output.offset;
    6.70   	vnc_write_u16(vs, 0);
    6.71   
    6.72 @@ -354,32 +356,26 @@ Index: ioemu/vnc.c
    6.73   	}
    6.74   	vs->output.buffer[saved_offset] = (n_rectangles >> 8) & 0xFF;
    6.75   	vs->output.buffer[saved_offset + 1] = n_rectangles & 0xFF;
    6.76 --	vnc_flush(vs);
    6.77 - 
    6.78 --    }
    6.79 ++
    6.80  +	vs->has_update = 0;
    6.81  +	vs->need_update = 0;
    6.82 -+	vnc_flush(vs);
    6.83 + 	vnc_flush(vs);
    6.84 +-    }
    6.85  +	vs->slow_client = 0;
    6.86  +    } else
    6.87  +	vs->slow_client = 1;
    6.88 - 
    6.89 -  out:
    6.90 -     qemu_mod_timer(vs->timer, now + VNC_REFRESH_INTERVAL);
    6.91 - }
    6.92 - 
    6.93 ++}
    6.94 ++
    6.95  +static void vnc_update_client(void *opaque)
    6.96  +{
    6.97  +    VncState *vs = opaque;
    6.98  +
    6.99  +    vs->ds->dpy_refresh(vs->ds);
   6.100  +    _vnc_update_client(vs);
   6.101 -+}
   6.102 -+
   6.103 + }
   6.104 + 
   6.105   static void vnc_timer_init(VncState *vs)
   6.106 - {
   6.107 -     if (vs->timer == NULL) {
   6.108 -@@ -473,8 +564,6 @@
   6.109 +@@ -469,8 +561,6 @@
   6.110   
   6.111   static void vnc_dpy_refresh(DisplayState *ds)
   6.112   {
   6.113 @@ -388,7 +384,7 @@ Index: ioemu/vnc.c
   6.114       vga_hw_update();
   6.115   }
   6.116   
   6.117 -@@ -510,7 +599,7 @@
   6.118 +@@ -506,7 +596,7 @@
   6.119   
   6.120   static void buffer_reset(Buffer *buffer)
   6.121   {
   6.122 @@ -397,7 +393,7 @@ Index: ioemu/vnc.c
   6.123   }
   6.124   
   6.125   static void buffer_append(Buffer *buffer, const void *data, size_t len)
   6.126 -@@ -551,12 +640,12 @@
   6.127 +@@ -547,12 +637,12 @@
   6.128       if (!ret)
   6.129   	return;
   6.130   
   6.131 @@ -413,7 +409,7 @@ Index: ioemu/vnc.c
   6.132   }
   6.133   
   6.134   static void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
   6.135 -@@ -588,11 +677,11 @@
   6.136 +@@ -584,11 +674,11 @@
   6.137   	    return;
   6.138   
   6.139   	if (!ret) {
   6.140 @@ -428,7 +424,7 @@ Index: ioemu/vnc.c
   6.141       }
   6.142   }
   6.143   
   6.144 -@@ -600,9 +689,9 @@
   6.145 +@@ -596,9 +686,9 @@
   6.146   {
   6.147       buffer_reserve(&vs->output, len);
   6.148   
   6.149 @@ -441,7 +437,7 @@ Index: ioemu/vnc.c
   6.150   
   6.151       buffer_append(&vs->output, data, len);
   6.152   }
   6.153 -@@ -724,22 +813,25 @@
   6.154 +@@ -720,22 +810,25 @@
   6.155       do_key_event(vs, down, sym);
   6.156   }
   6.157   
   6.158 @@ -475,10 +471,10 @@ Index: ioemu/vnc.c
   6.159  +    vs->visible_y = y_position;
   6.160  +    vs->visible_w = w;
   6.161  +    vs->visible_h = h;
   6.162 + 
   6.163 +     qemu_mod_timer(vs->timer, qemu_get_clock(rt_clock));
   6.164   }
   6.165 - 
   6.166 - static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
   6.167 -@@ -845,8 +937,6 @@
   6.168 +@@ -843,8 +936,6 @@
   6.169       }
   6.170   
   6.171       vnc_dpy_resize(vs->ds, vs->ds->width, vs->ds->height);
   6.172 @@ -487,7 +483,7 @@ Index: ioemu/vnc.c
   6.173   
   6.174       vga_hw_invalidate();
   6.175       vga_hw_update();
   6.176 -@@ -1012,11 +1102,11 @@
   6.177 +@@ -1010,11 +1101,11 @@
   6.178   	vnc_write(vs, "RFB 003.003\n", 12);
   6.179   	vnc_flush(vs);
   6.180   	vnc_read_when(vs, protocol_version, 12);
   6.181 @@ -501,7 +497,7 @@ Index: ioemu/vnc.c
   6.182       }
   6.183   }
   6.184   
   6.185 -@@ -1073,17 +1163,15 @@
   6.186 +@@ -1071,17 +1162,15 @@
   6.187   	exit(1);
   6.188       }
   6.189   
   6.190 @@ -524,8 +520,8 @@ Index: ioemu/vnc.c
   6.191   }
   6.192  Index: ioemu/vl.h
   6.193  ===================================================================
   6.194 ---- ioemu.orig/vl.h	2006-08-17 19:50:02.411869432 +0100
   6.195 -+++ ioemu/vl.h	2006-08-17 19:50:12.102798281 +0100
   6.196 +--- ioemu.orig/vl.h	2006-09-21 19:00:48.000000000 +0100
   6.197 ++++ ioemu/vl.h	2006-09-21 19:26:24.000000000 +0100
   6.198  @@ -319,6 +319,7 @@
   6.199   int is_graphic_console(void);
   6.200   CharDriverState *text_console_init(DisplayState *ds);
     7.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Thu Sep 21 18:58:17 2006 +0100
     7.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Thu Sep 21 19:28:35 2006 +0100
     7.3 @@ -1,8 +1,8 @@
     7.4  Index: ioemu/vnc.c
     7.5  ===================================================================
     7.6 ---- ioemu.orig/vnc.c	2006-08-17 19:50:12.101798392 +0100
     7.7 -+++ ioemu/vnc.c	2006-08-17 19:50:13.149682567 +0100
     7.8 -@@ -1175,3 +1175,25 @@
     7.9 +--- ioemu.orig/vnc.c	2006-09-21 19:10:45.000000000 +0100
    7.10 ++++ ioemu/vnc.c	2006-09-21 19:10:53.000000000 +0100
    7.11 +@@ -1173,3 +1173,25 @@
    7.12   
    7.13       vnc_dpy_resize(vs->ds, 640, 400);
    7.14   }
    7.15 @@ -30,8 +30,8 @@ Index: ioemu/vnc.c
    7.16  +}
    7.17  Index: ioemu/vl.c
    7.18  ===================================================================
    7.19 ---- ioemu.orig/vl.c	2006-08-17 19:50:12.100798502 +0100
    7.20 -+++ ioemu/vl.c	2006-08-17 19:50:13.152682236 +0100
    7.21 +--- ioemu.orig/vl.c	2006-09-21 19:08:38.000000000 +0100
    7.22 ++++ ioemu/vl.c	2006-09-21 19:10:53.000000000 +0100
    7.23  @@ -120,6 +120,7 @@
    7.24   int bios_size;
    7.25   static DisplayState display_state;
    7.26 @@ -93,8 +93,8 @@ Index: ioemu/vl.c
    7.27           sdl_display_init(ds, full_screen);
    7.28  Index: ioemu/vl.h
    7.29  ===================================================================
    7.30 ---- ioemu.orig/vl.h	2006-08-17 19:50:12.102798281 +0100
    7.31 -+++ ioemu/vl.h	2006-08-17 19:50:13.153682125 +0100
    7.32 +--- ioemu.orig/vl.h	2006-09-21 19:08:38.000000000 +0100
    7.33 ++++ ioemu/vl.h	2006-09-21 19:10:53.000000000 +0100
    7.34  @@ -786,6 +786,7 @@
    7.35   
    7.36   /* vnc.c */
     8.1 --- a/tools/ioemu/patches/vnc-title-domain-name	Thu Sep 21 18:58:17 2006 +0100
     8.2 +++ b/tools/ioemu/patches/vnc-title-domain-name	Thu Sep 21 19:28:35 2006 +0100
     8.3 @@ -1,8 +1,8 @@
     8.4  Index: ioemu/vnc.c
     8.5  ===================================================================
     8.6 ---- ioemu.orig/vnc.c	2006-08-17 19:50:13.149682567 +0100
     8.7 -+++ ioemu/vnc.c	2006-08-17 19:50:14.623519661 +0100
     8.8 -@@ -1014,6 +1014,7 @@
     8.9 +--- ioemu.orig/vnc.c	2006-09-21 19:10:53.000000000 +0100
    8.10 ++++ ioemu/vnc.c	2006-09-21 19:10:57.000000000 +0100
    8.11 +@@ -1012,6 +1012,7 @@
    8.12   
    8.13   static int protocol_client_init(VncState *vs, char *data, size_t len)
    8.14   {
    8.15 @@ -10,7 +10,7 @@ Index: ioemu/vnc.c
    8.16       char pad[3] = { 0, 0, 0 };
    8.17   
    8.18       vs->width = vs->ds->width;
    8.19 -@@ -1059,8 +1060,10 @@
    8.20 +@@ -1057,8 +1058,10 @@
    8.21   	
    8.22       vnc_write(vs, pad, 3);           /* padding */
    8.23