[Qemu-devel] [6840] remove is_graphic_console from vga.c (Stefano Stabellini)

[Anthony Liguori]

Revision: 6840
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6840
Author:   aliguori
Date:     2009-03-13 15:02:18 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
remove is_graphic_console from vga.c (Stefano Stabellini)

Hi all,
since vga_draw_graphic is only called by vga_hw_update when the console
associated with the graphic card is active, we don't need to check if
the current console is active using is_graphic_console.

I suspect I introduced these checks when the console switching mechanism
didn't work as it does now.

Signed-off-by: Stefano Stabellini <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/vga.c

Modified: trunk/hw/vga.c
===================================================================
--- trunk/hw/vga.c      2009-03-13 15:02:13 UTC (rev 6839)
+++ trunk/hw/vga.c      2009-03-13 15:02:18 UTC (rev 6840)
@@ -1629,18 +1629,14 @@
 #else
         if (depth == 32) {
 #endif
-            if (is_graphic_console()) {
-                qemu_free_displaysurface(s->ds);
-                s->ds->surface = qemu_create_displaysurface_from(disp_width, 
height, depth,
-                                                               s->line_offset,
-                                                               s->vram_ptr + 
(s->start_addr * 4));
+            qemu_free_displaysurface(s->ds);
+            s->ds->surface = qemu_create_displaysurface_from(disp_width, 
height, depth,
+                    s->line_offset,
+                    s->vram_ptr + (s->start_addr * 4));
 #if defined(WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
-                s->ds->surface->pf = 
qemu_different_endianness_pixelformat(depth);
+            s->ds->surface->pf = qemu_different_endianness_pixelformat(depth);
 #endif
-                dpy_resize(s->ds);
-            } else {
-                qemu_console_resize(s->ds, disp_width, height);
-            }
+            dpy_resize(s->ds);
         } else {
             qemu_console_resize(s->ds, disp_width, height);
         }
@@ -1651,7 +1647,7 @@
         s->last_line_offset = s->line_offset;
         s->last_depth = depth;
         full_update = 1;
-    } else if (is_graphic_console() && is_buffer_shared(s->ds->surface) &&
+    } else if (is_buffer_shared(s->ds->surface) &&
                (full_update || s->ds->surface->data != s->vram_ptr + 
(s->start_addr * 4))) {
         s->ds->surface->data = s->vram_ptr + (s->start_addr * 4);
         dpy_setdata(s->ds);