From: Keir Fraser Date: Fri, 2 May 2008 12:48:10 +0000 (+0100) Subject: ioemu: always disable shared buffer in text mode X-Git-Tag: 3.3.0-rc1~238^2~28 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bc1336bae6b9ab1a8850bd3df1916f67204804d8;p=xen.git ioemu: always disable shared buffer in text mode by not calling get_bpp() (which only makes sense in graphical mode) and always use 0 instead. Signed-off-by: Samuel Thibault --- diff --git a/tools/ioemu/hw/vga.c b/tools/ioemu/hw/vga.c index fb64036468..9a6922aa54 100644 --- a/tools/ioemu/hw/vga.c +++ b/tools/ioemu/hw/vga.c @@ -1075,7 +1075,7 @@ static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS]; */ static void vga_draw_text(VGAState *s, int full_update) { - int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr, depth; + int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr; int cx_min, cx_max, linesize, x_incr; uint32_t offset, fgcol, bgcol, v, cursor_offset; uint8_t *d1, *d, *src, *s1, *dest, *cursor_ptr; @@ -1086,9 +1086,8 @@ static void vga_draw_text(VGAState *s, int full_update) vga_draw_glyph8_func *vga_draw_glyph8; vga_draw_glyph9_func *vga_draw_glyph9; - depth = s->get_bpp(s); - if (s->ds->dpy_colourdepth != NULL && s->ds->depth != depth) - s->ds->dpy_colourdepth(s->ds, depth); + if (s->ds->dpy_colourdepth != NULL && s->ds->depth != 0) + s->ds->dpy_colourdepth(s->ds, 0); s->rgb_to_pixel = rgb_to_pixel_dup_table[get_depth_index(s->ds)];