[Qemu-devel] [6353] Remove assumption about a single graphic console.

[Anthony Liguori]

Revision: 6353
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6353
Author:   aliguori
Date:     2009-01-16 21:01:48 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------
Remove assumption about a single graphic console.

This fixes a fault with the jazz_led since it has two graphic consoles.

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

Modified Paths:
--------------
    trunk/console.c

Modified: trunk/console.c
===================================================================
--- trunk/console.c     2009-01-16 20:23:27 UTC (rev 6352)
+++ trunk/console.c     2009-01-16 21:01:48 UTC (rev 6353)
@@ -1190,13 +1190,13 @@
     }
 }
 
-static TextConsole *get_graphic_console(void)
+static TextConsole *get_graphic_console(DisplayState *ds)
 {
     int i;
     TextConsole *s;
     for (i = 0; i < nb_consoles; i++) {
         s = consoles[i];
-        if (s->console_type == GRAPHIC_CONSOLE)
+        if (s->console_type == GRAPHIC_CONSOLE && s->ds == ds)
             return s;
     }
     return NULL;
@@ -1394,7 +1394,7 @@
 
 void qemu_console_resize(DisplayState *ds, int width, int height)
 {
-    TextConsole *s = get_graphic_console();
+    TextConsole *s = get_graphic_console(ds);
     s->g_width = width;
     s->g_height = height;
     if (is_graphic_console()) {