diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /tools/ioemu/patches/fix-vga-scanning-code-overflow | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'tools/ioemu/patches/fix-vga-scanning-code-overflow')
| -rw-r--r-- | tools/ioemu/patches/fix-vga-scanning-code-overflow | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/tools/ioemu/patches/fix-vga-scanning-code-overflow b/tools/ioemu/patches/fix-vga-scanning-code-overflow new file mode 100644 index 0000000000..6d934fe3f7 --- /dev/null +++ b/tools/ioemu/patches/fix-vga-scanning-code-overflow @@ -0,0 +1,45 @@ +Index: ioemu/hw/vga.c +=================================================================== +--- ioemu.orig/hw/vga.c 2006-09-21 19:07:52.000000000 +0100 ++++ ioemu/hw/vga.c 2006-09-21 19:08:09.000000000 +0100 +@@ -1463,14 +1463,15 @@ + */ + static void vga_draw_graphic(VGAState *s, int full_update) + { +- int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask; ++ int y1, y, update, linesize, y_start, double_scan, mask; + int width, height, shift_control, line_offset, bwidth; + ram_addr_t page0, page1; + int disp_width, multi_scan, multi_run; + uint8_t *d; + uint32_t v, addr1, addr; + vga_draw_line_func *vga_draw_line; +- ++ ram_addr_t page_min, page_max; ++ + full_update |= update_basic_params(s); + + s->get_resolution(s, &width, &height); +@@ -1561,8 +1562,8 @@ + addr1 = (s->start_addr * 4); + bwidth = width * 4; + y_start = -1; +- page_min = 0x7fffffff; +- page_max = -1; ++ page_min = 0; ++ page_max = 0; + d = s->ds->data; + linesize = s->ds->linesize; + y1 = 0; +@@ -1592,9 +1593,9 @@ + if (update) { + if (y_start < 0) + y_start = y; +- if (page0 < page_min) ++ if (page_min == 0 || page0 < page_min) + page_min = page0; +- if (page1 > page_max) ++ if (page_max == 0 || page1 > page_max) + page_max = page1; + vga_draw_line(s, d, s->vram_ptr + addr, width); + if (s->cursor_draw_line) |