From patchwork Sun Mar 24 12:39:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 230441 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F2E512C00A5 for ; Sun, 24 Mar 2013 23:37:11 +1100 (EST) Received: from localhost ([::1]:41589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkAg-0007jI-4o for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2013 08:37:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA6-0007fb-BW for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJkA4-0000KN-Ej for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA4-0000KI-6z for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:32 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2OCaVPm031342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 24 Mar 2013 08:36:31 -0400 Received: from shalem.localdomain.com (vpn1-5-143.ams2.redhat.com [10.36.5.143]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2OCaRiF014234; Sun, 24 Mar 2013 08:36:30 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Sun, 24 Mar 2013 13:39:47 +0100 Message-Id: <1364128793-12689-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> References: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Hans de Goede Subject: [Qemu-devel] [PATCH 2/8] qemu-char: Rename qemu_chr_generic_open to qemu_chr_be_generic_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To better reflect that it is for handling a backend being opened. Signed-off-by: Hans de Goede --- backends/baum.c | 2 +- include/char/char.h | 2 +- qemu-char.c | 24 ++++++++++++------------ ui/console.c | 2 +- ui/gtk.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/backends/baum.c b/backends/baum.c index d7d658c..ea9ffe8 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -611,7 +611,7 @@ CharDriverState *chr_baum_init(void) qemu_set_fd_handler(baum->brlapi_fd, baum_chr_read, NULL, baum); - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; diff --git a/include/char/char.h b/include/char/char.h index d801f92..dd8f39a 100644 --- a/include/char/char.h +++ b/include/char/char.h @@ -235,7 +235,7 @@ void qemu_chr_add_handlers(CharDriverState *s, IOEventHandler *fd_event, void *opaque); -void qemu_chr_generic_open(CharDriverState *s); +void qemu_chr_be_generic_open(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); int qemu_chr_add_client(CharDriverState *s, int fd); void qemu_chr_info_print(Monitor *mon, const QObject *ret_data); diff --git a/qemu-char.c b/qemu-char.c index 32a05af..55795d7 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -120,7 +120,7 @@ void qemu_chr_be_event(CharDriverState *s, int event) s->chr_event(s->handler_opaque, event); } -static gboolean qemu_chr_generic_open_bh(gpointer opaque) +static gboolean qemu_chr_be_generic_open_bh(gpointer opaque) { CharDriverState *s = opaque; qemu_chr_be_event(s, CHR_EVENT_OPENED); @@ -128,10 +128,10 @@ static gboolean qemu_chr_generic_open_bh(gpointer opaque) return FALSE; } -void qemu_chr_generic_open(CharDriverState *s) +void qemu_chr_be_generic_open(CharDriverState *s) { if (s->idle_tag == 0) { - s->idle_tag = g_idle_add(qemu_chr_generic_open_bh, s); + s->idle_tag = g_idle_add(qemu_chr_be_generic_open_bh, s); } } @@ -208,7 +208,7 @@ void qemu_chr_add_handlers(CharDriverState *s, /* We're connecting to an already opened device, so let's make sure we also get the open event */ if (s->be_open) { - qemu_chr_generic_open(s); + qemu_chr_be_generic_open(s); } } @@ -482,7 +482,7 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv) chr->chr_guest_close = NULL; /* Muxes are always open on creation */ - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -836,7 +836,7 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out) chr->chr_update_read_handler = fd_chr_update_read_handler; chr->chr_close = fd_chr_close; - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -1133,7 +1133,7 @@ static void pty_chr_state(CharDriverState *chr, int connected) pty_chr_rearm_timer(chr, 1000); } else { if (!s->connected) - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); s->connected = 1; } } @@ -1549,7 +1549,7 @@ static CharDriverState *qemu_chr_open_pp_fd(int fd) chr->chr_close = pp_close; chr->opaque = drv; - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -1834,7 +1834,7 @@ static CharDriverState *qemu_chr_open_win_path(const char *filename) g_free(chr); return NULL; } - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -1934,7 +1934,7 @@ static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts) g_free(chr); return NULL; } - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -1948,7 +1948,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out) s->hcom = fd_out; chr->opaque = s; chr->chr_write = win_chr_write; - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); return chr; } @@ -2513,7 +2513,7 @@ static void tcp_chr_connect(void *opaque) if (s->chan) { s->tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr); } - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); } #define IACSET(x,a,b,c) x[0] = a; x[1] = b; x[2] = c; diff --git a/ui/console.c b/ui/console.c index eb7a2bc..e84ba8b 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1600,7 +1600,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds) s->t_attrib = s->t_attrib_default; } - qemu_chr_generic_open(chr); + qemu_chr_be_generic_open(chr); if (chr->init) chr->init(chr); } diff --git a/ui/gtk.c b/ui/gtk.c index 305940d..903b4d4 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1116,7 +1116,7 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), vc->menu_item); - qemu_chr_generic_open(vc->chr); + qemu_chr_be_generic_open(vc->chr); if (vc->chr->init) { vc->chr->init(vc->chr); }