ia64/xen-unstable

changeset 17568:e309f53f3f83

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 <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri May 02 13:48:10 2008 +0100 (2008-05-02)
parents 26f394079b6c
children 5b994ca498de
files tools/ioemu/hw/vga.c
line diff
     1.1 --- a/tools/ioemu/hw/vga.c	Fri May 02 13:47:46 2008 +0100
     1.2 +++ b/tools/ioemu/hw/vga.c	Fri May 02 13:48:10 2008 +0100
     1.3 @@ -1075,7 +1075,7 @@ static rgb_to_pixel_dup_func *rgb_to_pix
     1.4   */
     1.5  static void vga_draw_text(VGAState *s, int full_update)
     1.6  {
     1.7 -    int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr, depth;
     1.8 +    int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
     1.9      int cx_min, cx_max, linesize, x_incr;
    1.10      uint32_t offset, fgcol, bgcol, v, cursor_offset;
    1.11      uint8_t *d1, *d, *src, *s1, *dest, *cursor_ptr;
    1.12 @@ -1086,9 +1086,8 @@ static void vga_draw_text(VGAState *s, i
    1.13      vga_draw_glyph8_func *vga_draw_glyph8;
    1.14      vga_draw_glyph9_func *vga_draw_glyph9;
    1.15  
    1.16 -    depth = s->get_bpp(s);
    1.17 -    if (s->ds->dpy_colourdepth != NULL && s->ds->depth != depth)
    1.18 -        s->ds->dpy_colourdepth(s->ds, depth);
    1.19 +    if (s->ds->dpy_colourdepth != NULL && s->ds->depth != 0)
    1.20 +        s->ds->dpy_colourdepth(s->ds, 0);
    1.21      s->rgb_to_pixel = 
    1.22          rgb_to_pixel_dup_table[get_depth_index(s->ds)];
    1.23