OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

console: Eliminate text_consoles[]

Browse Source 
Simply use consoles[] instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2012-02-07 15:09:21 +01:00 committed by Anthony Liguori
parent 877691f96f
commit 8811e1e174
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
console.c
View File

@ -1441,9 +1441,6 @@ void console_color_init(DisplayState *ds)
} }
} }
static int n_text_consoles;
static CharDriverState *text_consoles[128];
static void text_console_set_echo(CharDriverState *chr, bool echo) static void text_console_set_echo(CharDriverState *chr, bool echo)
{ {
TextConsole *s = chr->opaque; TextConsole *s = chr->opaque;
@ -1519,13 +1516,6 @@ CharDriverState *text_console_init(QemuOpts *opts)
chr = g_malloc0(sizeof(CharDriverState)); chr = g_malloc0(sizeof(CharDriverState));
if (n_text_consoles == 128) {
fprintf(stderr, "Too many text consoles\n");
exit(1);
}
text_consoles[n_text_consoles] = chr;
n_text_consoles++;
width = qemu_opt_get_number(opts, "width", 0); width = qemu_opt_get_number(opts, "width", 0);
if (width == 0) if (width == 0)
width = qemu_opt_get_number(opts, "cols", 0) * FONT_WIDTH; width = qemu_opt_get_number(opts, "cols", 0) * FONT_WIDTH;
@ -1557,11 +1547,11 @@ void text_consoles_set_display(DisplayState *ds)
{ {
int i; int i;
for (i = 0; i < n_text_consoles; i++) { for (i = 0; i < nb_consoles; i++) {
text_console_do_init(text_consoles[i], ds); if (consoles[i]->console_type != GRAPHIC_CONSOLE) {
text_console_do_init(consoles[i]->chr, ds);
}
} }
n_text_consoles = 0;
} }
void qemu_console_resize(DisplayState *ds, int width, int height) void qemu_console_resize(DisplayState *ds, int width, int height)