[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/21] char: remove qemu_chr_be_generic_open
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 01/21] char: remove qemu_chr_be_generic_open |
Date: |
Mon, 27 Feb 2017 17:41:42 +0400 |
The function simply alias and hides the real event function.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/sysemu/char.h | 1 -
chardev/char-pty.c | 2 +-
chardev/char-socket.c | 2 +-
chardev/char.c | 10 ++--------
ui/console.c | 2 +-
ui/gtk.c | 2 +-
6 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 450881d42c..a30ff3fa80 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -427,7 +427,6 @@ void qemu_chr_fe_set_handlers(CharBackend *b,
*/
void qemu_chr_fe_take_focus(CharBackend *b);
-void qemu_chr_be_generic_open(Chardev *s);
void qemu_chr_fe_accept_input(CharBackend *be);
int qemu_chr_add_client(Chardev *s, int fd);
Chardev *qemu_chr_find(const char *name);
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index ecf2c7a5c4..41c9095189 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -185,7 +185,7 @@ static gboolean qemu_chr_be_generic_open_func(gpointer
opaque)
PtyChardev *s = PTY_CHARDEV(opaque);
s->open_tag = 0;
- qemu_chr_be_generic_open(chr);
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
return FALSE;
}
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 865c52762e..d201f869f8 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -486,7 +486,7 @@ static void tcp_chr_connect(void *opaque)
tcp_chr_read,
chr, NULL);
}
- qemu_chr_be_generic_open(chr);
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void tcp_chr_update_read_handler(Chardev *chr,
diff --git a/chardev/char.c b/chardev/char.c
index 54cd5f4081..0f9d42980d 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -66,12 +66,6 @@ void qemu_chr_be_event(Chardev *s, int event)
be->chr_event(be->opaque, event);
}
-void qemu_chr_be_generic_open(Chardev *s)
-{
- qemu_chr_be_event(s, CHR_EVENT_OPENED);
-}
-
-
/* Not reporting errors from writing to logfile, as logs are
* defined to be "best effort" only */
static void qemu_chr_fe_write_log(Chardev *s,
@@ -469,7 +463,7 @@ static void muxes_realize_done(Notifier *notifier, void
*unused)
/* mark mux as OPENED so any new FEs will immediately receive
* OPENED event
*/
- qemu_chr_be_generic_open(chr);
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
}
muxes_realized = true;
@@ -581,7 +575,7 @@ void qemu_chr_fe_set_handlers(CharBackend *b,
/* 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_be_generic_open(s);
+ qemu_chr_be_event(s, CHR_EVENT_OPENED);
}
}
diff --git a/ui/console.c b/ui/console.c
index 49d0740b40..992f35a5e7 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2056,7 +2056,7 @@ static void text_console_do_init(Chardev *chr,
DisplayState *ds)
s->t_attrib = s->t_attrib_default;
}
- qemu_chr_be_generic_open(chr);
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void vc_chr_open(Chardev *chr,
diff --git a/ui/gtk.c b/ui/gtk.c
index f21e9e7f7b..08cac2f47b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1867,7 +1867,7 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s,
VirtualConsole *vc,
gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), vc->tab_item,
gtk_label_new(vc->label));
- qemu_chr_be_generic_open(vc->vte.chr);
+ qemu_chr_be_event(vc->vte.chr, CHR_EVENT_OPENED);
return group;
}
--
2.12.0.rc2.3.gc93709801
- [Qemu-devel] [PATCH v2 00/21] chardev clean-ups & tests, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 01/21] char: remove qemu_chr_be_generic_open,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 02/21] mux: simplfy muxes_realize_done, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 03/21] xen: use a better chardev type check, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 04/21] container: don't leak container reference, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 06/21] vl: add todo note about root container cleanup, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 05/21] char: add a /chardevs container, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 07/21] char: use /chardevs container instead of chardevs list, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 08/21] char: remove qemu_chardev_add, Marc-André Lureau, 2017/02/27