OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

char: update the mux handlers in class callback 

Instead of handling mux chardev in a special way in
qemu_chr_fe_set_handlers(), we may use the chr_update_read_handler
class callback instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190206174328.9736-2-marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-02-06 18:43:23 +01:00
parent 129263c6c0
commit 3d9e232240
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chardev/char-fe.c
View File

@ -290,10 +290,6 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b,
qemu_chr_be_event(s, CHR_EVENT_OPENED); qemu_chr_be_event(s, CHR_EVENT_OPENED);
} }
} }
if (CHARDEV_IS_MUX(s)) {
mux_chr_set_handlers(s, context);
}
} }
void qemu_chr_fe_set_handlers(CharBackend *b, void qemu_chr_fe_set_handlers(CharBackend *b,

5
chardev/char-mux.c
View File

@ -278,7 +278,7 @@ static void char_mux_finalize(Object *obj)
qemu_chr_fe_deinit(&d->chr, false); qemu_chr_fe_deinit(&d->chr, false);
} }
void mux_chr_set_handlers(Chardev *chr, GMainContext *context) static void mux_chr_update_read_handlers(Chardev *chr)
{ {
MuxChardev *d = MUX_CHARDEV(chr); MuxChardev *d = MUX_CHARDEV(chr);
@ -289,7 +289,7 @@ void mux_chr_set_handlers(Chardev *chr, GMainContext *context)
mux_chr_event, mux_chr_event,
NULL, NULL,
chr, chr,
context, true, false); chr->gcontext, true, false);
} }
void mux_set_focus(Chardev *chr, int focus) void mux_set_focus(Chardev *chr, int focus)
@ -383,6 +383,7 @@ static void char_mux_class_init(ObjectClass *oc, void *data)
cc->chr_add_watch = mux_chr_add_watch; cc->chr_add_watch = mux_chr_add_watch;
cc->chr_be_event = mux_chr_be_event; cc->chr_be_event = mux_chr_be_event;
cc->chr_machine_done = open_muxes; cc->chr_machine_done = open_muxes;
cc->chr_update_read_handler = mux_chr_update_read_handlers;
} }
static const TypeInfo char_mux_type_info = { static const TypeInfo char_mux_type_info = {

1
include/chardev/char-mux.h
View File

@ -55,7 +55,6 @@ typedef struct MuxChardev {
#define CHARDEV_IS_MUX(chr) \ #define CHARDEV_IS_MUX(chr) \
object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX) object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
void mux_chr_set_handlers(Chardev *chr, GMainContext *context);
void mux_set_focus(Chardev *chr, int focus); void mux_set_focus(Chardev *chr, int focus);
void mux_chr_send_all_event(Chardev *chr, int event); void mux_chr_send_all_event(Chardev *chr, int event);