From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55803 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVkVb-0006N3-FB for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:43:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVkVa-0000qp-F7 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:43:03 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:62702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVkVa-0000nZ-9L for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:43:02 -0500 Received: by mail-ww0-f53.google.com with SMTP id 18so5979050wwi.10 for ; Thu, 23 Dec 2010 04:43:01 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Dec 2010 13:42:53 +0100 Message-Id: <1293108174-24895-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> References: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 7/8] remove text_console_opts List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- console.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/console.c b/console.c index 60b80ee..57d6eb5 100644 --- a/console.c +++ b/console.c @@ -1437,7 +1437,6 @@ void console_color_init(DisplayState *ds) static int n_text_consoles; static CharDriverState *text_consoles[128]; -static QemuOpts *text_console_opts[128]; static void text_console_set_echo(CharDriverState *chr, bool echo) { @@ -1446,7 +1445,7 @@ static void text_console_set_echo(CharDriverState *chr, bool echo) s->echo = echo; } -static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpts *opts) +static void text_console_do_init(CharDriverState *chr, DisplayState *ds) { TextConsole *s; static int color_inited; @@ -1520,7 +1519,6 @@ CharDriverState *text_console_init(QemuOpts *opts) exit(1); } text_consoles[n_text_consoles] = chr; - text_console_opts[n_text_consoles] = opts; n_text_consoles++; width = qemu_opt_get_number(opts, "width", 0); @@ -1555,9 +1553,7 @@ void text_consoles_set_display(DisplayState *ds) int i; for (i = 0; i < n_text_consoles; i++) { - text_console_do_init(text_consoles[i], ds, text_console_opts[i]); - qemu_opts_del(text_console_opts[i]); - text_console_opts[i] = NULL; + text_console_do_init(text_consoles[i], ds); } n_text_consoles = 0; -- 1.7.3.2