mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-char: Rename qemu_chr_generic_open to qemu_chr_be_generic_open

Browse Source 
To better reflect that it is for handling a backend being opened.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Message-id: 1364292483-16564-3-git-send-email-hdegoede@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hans de Goede 2013-03-26 11:07:54 +01:00 committed by Anthony Liguori
parent 16665b943b
commit fee204fd46
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/baum.c
View File

@ -611,7 +611,7 @@ CharDriverState *chr_baum_init(void)
qemu_set_fd_handler(baum->brlapi_fd, baum_chr_read, NULL, baum); 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; return chr;

2
include/char/char.h
View File

@ -250,7 +250,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
IOEventHandler *fd_event, IOEventHandler *fd_event,
void *opaque); void *opaque);
void qemu_chr_generic_open(CharDriverState *s); void qemu_chr_be_generic_open(CharDriverState *s);
void qemu_chr_accept_input(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s);
int qemu_chr_add_client(CharDriverState *s, int fd); int qemu_chr_add_client(CharDriverState *s, int fd);
void qemu_chr_info_print(Monitor *mon, const QObject *ret_data); void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);

24
qemu-char.c
View File

@ -120,7 +120,7 @@ void qemu_chr_be_event(CharDriverState *s, int event)
s->chr_event(s->handler_opaque, 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; CharDriverState *s = opaque;
qemu_chr_be_event(s, CHR_EVENT_OPENED); qemu_chr_be_event(s, CHR_EVENT_OPENED);
@ -128,10 +128,10 @@ static gboolean qemu_chr_generic_open_bh(gpointer opaque)
return FALSE; return FALSE;
} }
void qemu_chr_generic_open(CharDriverState *s) void qemu_chr_be_generic_open(CharDriverState *s)
{ {
if (s->idle_tag == 0) { 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);
} }
} }
@ -235,7 +235,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
/* We're connecting to an already opened device, so let's make sure we /* We're connecting to an already opened device, so let's make sure we
also get the open event */ also get the open event */
if (s->be_open) { if (s->be_open) {
qemu_chr_generic_open(s); qemu_chr_be_generic_open(s);
} }
} }
@ -509,7 +509,7 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
chr->chr_guest_close = NULL; chr->chr_guest_close = NULL;
/* Muxes are always open on creation */ /* Muxes are always open on creation */
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -863,7 +863,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_update_read_handler = fd_chr_update_read_handler;
chr->chr_close = fd_chr_close; chr->chr_close = fd_chr_close;
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -1160,7 +1160,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
pty_chr_rearm_timer(chr, 1000); pty_chr_rearm_timer(chr, 1000);
} else { } else {
if (!s->connected) if (!s->connected)
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
s->connected = 1; s->connected = 1;
} }
} }
@ -1576,7 +1576,7 @@ static CharDriverState *qemu_chr_open_pp_fd(int fd)
chr->chr_close = pp_close; chr->chr_close = pp_close;
chr->opaque = drv; chr->opaque = drv;
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -1861,7 +1861,7 @@ static CharDriverState *qemu_chr_open_win_path(const char *filename)
g_free(chr); g_free(chr);
return NULL; return NULL;
} }
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -1961,7 +1961,7 @@ static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts)
g_free(chr); g_free(chr);
return NULL; return NULL;
} }
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -1975,7 +1975,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
s->hcom = fd_out; s->hcom = fd_out;
chr->opaque = s; chr->opaque = s;
chr->chr_write = win_chr_write; chr->chr_write = win_chr_write;
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
return chr; return chr;
} }
@ -2540,7 +2540,7 @@ static void tcp_chr_connect(void *opaque)
if (s->chan) { if (s->chan) {
s->tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, tcp_chr_read, chr); 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; #define IACSET(x,a,b,c) x[0] = a; x[1] = b; x[2] = c;

2
ui/console.c
View File

@ -1600,7 +1600,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
s->t_attrib = s->t_attrib_default; s->t_attrib = s->t_attrib_default;
} }
qemu_chr_generic_open(chr); qemu_chr_be_generic_open(chr);
if (chr->init) if (chr->init)
chr->init(chr); chr->init(chr);
} }

2
ui/gtk.c
View File

@ -1163,7 +1163,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); 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) { if (vc->chr->init) {
vc->chr->init(vc->chr); vc->chr->init(vc->chr);
} }