This allows to remove the "is_mux" field from CharDriverState. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- monitor.c | 2 +- qemu-char.c | 19 +++++++++---------- include/sysemu/char.h | 15 +++++++++++++-- 3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/monitor.c b/monitor.c index b73a999..3084175 100644 --- a/monitor.c +++ b/monitor.c @@ -3196,7 +3196,7 @@ static void ringbuf_completion(ReadLineState *rs, const char *str) if (!strncmp(chr_info->label, str, len)) { CharDriverState *chr = qemu_chr_find(chr_info->label); - if (chr && chr_is_ringbuf(chr)) { + if (chr && qemu_chr_is_ringbuf(chr)) { readline_add_completion(rs, chr_info->label); } } diff --git a/qemu-char.c b/qemu-char.c index 735a518..654d6a6 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -776,7 +776,7 @@ static void muxes_realize_done(Notifier *notifier, void *unused) CharDriverState *chr; QTAILQ_FOREACH(chr, &chardevs, next) { - if (chr->is_mux) { + if (qemu_chr_get_kind(chr) == CHARDEV_BACKEND_KIND_MUX) { MuxDriver *d = chr->opaque; int i; @@ -880,7 +880,6 @@ static CharDriverState *qemu_chr_open_mux(const CharDriver *driver, * set of muxes */ *be_opened = muxes_realized; - chr->is_mux = 1; if (!qemu_chr_fe_init(&d->chr, drv, errp)) { qemu_chr_free(chr); return NULL; @@ -903,7 +902,7 @@ bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s, Error **errp) assert(b); assert(s); - if (s->is_mux) { + if (qemu_chr_get_kind(s) == CHARDEV_BACKEND_KIND_MUX) { MuxDriver *d = s->opaque; if (d->mux_cnt >= MAX_MUX) { @@ -935,7 +934,7 @@ void qemu_chr_fe_deinit(CharBackend *b) if (b->chr) { qemu_chr_fe_set_handlers(b, NULL, NULL, NULL, NULL, NULL, true); b->chr->be = NULL; - if (b->chr->is_mux) { + if (qemu_chr_get_kind(b->chr) == CHARDEV_BACKEND_KIND_MUX) { MuxDriver *d = b->chr->opaque; d->backends[b->tag] = NULL; } @@ -988,7 +987,7 @@ void qemu_chr_fe_set_handlers(CharBackend *b, } } - if (s->is_mux) { + if (qemu_chr_get_kind(s) == CHARDEV_BACKEND_KIND_MUX) { mux_chr_set_handlers(s, context); } } @@ -1001,7 +1000,7 @@ void qemu_chr_fe_take_focus(CharBackend *b) return; } - if (b->chr->is_mux) { + if (qemu_chr_get_kind(b->chr) == CHARDEV_BACKEND_KIND_MUX) { mux_set_focus(b->chr->opaque, b->tag); } } @@ -3497,9 +3496,9 @@ fail: return NULL; } -bool chr_is_ringbuf(const CharDriverState *chr) +ChardevBackendKind qemu_chr_get_kind(const CharDriverState *chr) { - return chr->driver->chr_write == ringbuf_chr_write; + return chr->driver->kind; } void qmp_ringbuf_write(const char *device, const char *data, @@ -3517,7 +3516,7 @@ void qmp_ringbuf_write(const char *device, const char *data, return; } - if (!chr_is_ringbuf(chr)) { + if (!qemu_chr_is_ringbuf(chr)) { error_setg(errp,"%s is not a ringbuf device", device); return; } @@ -3561,7 +3560,7 @@ char *qmp_ringbuf_read(const char *device, int64_t size, return NULL; } - if (!chr_is_ringbuf(chr)) { + if (!qemu_chr_is_ringbuf(chr)) { error_setg(errp,"%s is not a ringbuf device", device); return NULL; } diff --git a/include/sysemu/char.h b/include/sysemu/char.h index fb2e6ff..29ebf2e 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -96,7 +96,6 @@ struct CharDriverState { char *filename; int logfd; int be_open; - int is_mux; guint fd_in_tag; bool replay; DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST); @@ -453,7 +452,19 @@ void qemu_chr_be_generic_open(CharDriverState *s); void qemu_chr_fe_accept_input(CharBackend *be); int qemu_chr_add_client(CharDriverState *s, int fd); CharDriverState *qemu_chr_find(const char *name); -bool chr_is_ringbuf(const CharDriverState *chr); + +/** + * @qemu_chr_get_kind: + * + * Returns the kind of char backend, or -1 if unspecified. + */ +ChardevBackendKind qemu_chr_get_kind(const CharDriverState *chr); + +static inline bool qemu_chr_is_ringbuf(const CharDriverState *chr) +{ + return qemu_chr_get_kind(chr) == CHARDEV_BACKEND_KIND_RINGBUF || + qemu_chr_get_kind(chr) == CHARDEV_BACKEND_KIND_MEMORY; +} bool qemu_chr_has_feature(CharDriverState *chr, CharDriverFeature feature); -- 2.10.0