From patchwork Mon Dec 12 22:42:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 705177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tcyvH1dN1z9t0J for ; Tue, 13 Dec 2016 09:59:07 +1100 (AEDT) Received: from localhost ([::1]:33982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGZYm-0007bJ-Tn for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2016 17:59:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGZKh-0003oX-6k for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:44:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGZKf-0003aI-Sa for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:44:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cGZKf-0003Zf-Jy for qemu-devel@nongnu.org; Mon, 12 Dec 2016 17:44:29 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B7035C04B320 for ; Mon, 12 Dec 2016 22:44:28 +0000 (UTC) Received: from localhost (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBCMiQJm031485; Mon, 12 Dec 2016 17:44:27 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 13 Dec 2016 01:42:45 +0300 Message-Id: <20161212224325.20790-15-marcandre.lureau@redhat.com> In-Reply-To: <20161212224325.20790-1-marcandre.lureau@redhat.com> References: <20161212224325.20790-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 12 Dec 2016 22:44:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/54] gtk: overwrite the console.c char driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instead of registering a vc handler to allocate the Gtk VC Chardev, overwrite the console.c char driver. A later patch, when switching to QOM, will register a default console vc QOM class if none has been registered before. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- ui/console.c | 24 +++++++----------------- ui/gtk.c | 30 +++++++++++++++++++++--------- include/sysemu/char.h | 4 +--- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ui/console.c b/ui/console.c index 80d10c7a4c..9a16e1b743 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2047,8 +2047,12 @@ static void text_console_do_init(Chardev *chr, DisplayState *ds) static const CharDriver vc_driver; -static Chardev *text_console_init(ChardevVC *vc, Error **errp) +static Chardev *vc_init(const CharDriver *driver, + const char *id, ChardevBackend *backend, + ChardevReturn *ret, bool *be_opened, + Error **errp) { + ChardevVC *vc = backend->u.vc.data; ChardevCommon *common = qapi_ChardevVC_base(vc); Chardev *chr; VCChardev *drv; @@ -2094,26 +2098,13 @@ static Chardev *text_console_init(ChardevVC *vc, Error **errp) if (display_state) { text_console_do_init(chr, display_state); } - return chr; -} -static VcHandler *vc_handler = text_console_init; - -static Chardev *vc_init(const CharDriver *driver, - const char *id, ChardevBackend *backend, - ChardevReturn *ret, bool *be_opened, - Error **errp) -{ /* console/chardev init sometimes completes elsewhere in a 2nd * stage, so defer OPENED events until they are fully initialized */ *be_opened = false; - return vc_handler(backend->u.vc.data, errp); -} -void register_vc_handler(VcHandler *handler) -{ - vc_handler = handler; + return chr; } void qemu_console_resize(QemuConsole *s, int width, int height) @@ -2151,8 +2142,7 @@ PixelFormat qemu_default_pixelformat(int bpp) return pf; } -static void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp) { int val; ChardevVC *vc; diff --git a/ui/gtk.c b/ui/gtk.c index 32df26e5d7..efa50524bf 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1702,16 +1702,14 @@ static void gd_vc_chr_set_echo(Chardev *chr, bool echo) static int nb_vcs; static Chardev *vcs[MAX_VCS]; +static const CharDriver gd_vc_driver; -static Chardev *gd_vc_handler(ChardevVC *vc, Error **errp) +static Chardev *vc_init(const CharDriver *driver, + const char *id, ChardevBackend *backend, + ChardevReturn *ret, bool *be_opened, + Error **errp) { - static const CharDriver gd_vc_driver = { - .instance_size = sizeof(VCChardev), - .kind = CHARDEV_BACKEND_KIND_VC, - .chr_write = gd_vc_chr_write, - .chr_set_echo = gd_vc_chr_set_echo, - }; - + ChardevVC *vc = backend->u.vc.data; ChardevCommon *common = qapi_ChardevVC_base(vc); Chardev *chr; @@ -1727,9 +1725,22 @@ static Chardev *gd_vc_handler(ChardevVC *vc, Error **errp) vcs[nb_vcs++] = chr; + /* console/chardev init sometimes completes elsewhere in a 2nd + * stage, so defer OPENED events until they are fully initialized + */ + *be_opened = false; + return chr; } +static const CharDriver gd_vc_driver = { + .instance_size = sizeof(VCChardev), + .kind = CHARDEV_BACKEND_KIND_VC, + .parse = qemu_chr_parse_vc, .create = vc_init, + .chr_write = gd_vc_chr_write, + .chr_set_echo = gd_vc_chr_set_echo, +}; + static gboolean gd_vc_in(VteTerminal *terminal, gchar *text, guint size, gpointer user_data) { @@ -2317,6 +2328,7 @@ void early_gtk_display_init(int opengl) } #if defined(CONFIG_VTE) - register_vc_handler(gd_vc_handler); + /* overwrite the console.c vc driver */ + register_char_driver(&gd_vc_driver); #endif } diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 029b14c8b6..384f3ce9b7 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -505,9 +505,7 @@ void register_char_driver(const CharDriver *driver); extern int term_escape_char; - /* console.c */ -typedef Chardev *(VcHandler)(ChardevVC *vc, Error **errp); -void register_vc_handler(VcHandler *handler); +void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp); #endif