[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/20] char: introduce generic qemu_chr_get_kind()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 09/20] char: introduce generic qemu_chr_get_kind() |
Date: |
Thu, 5 Jan 2017 17:53:18 +0100 |
This allows to remove the "is_mux" field from CharDriverState.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/sysemu/char.h | 15 +++++++++++++--
monitor.c | 2 +-
qemu-char.c | 21 ++++++++++-----------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 450d979c92..38a98621f3 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);
@@ -455,7 +454,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);
diff --git a/monitor.c b/monitor.c
index 0841d436b0..17948f5289 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3194,7 +3194,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 3dd692a55f..575873391e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -781,7 +781,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;
@@ -885,7 +885,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)
{
int tag = 0;
- if (s->is_mux) {
+ if (qemu_chr_get_kind(s) == CHARDEV_BACKEND_KIND_MUX) {
MuxDriver *d = s->opaque;
if (d->mux_cnt >= MAX_MUX) {
@@ -930,7 +929,7 @@ unavailable:
static bool qemu_chr_is_busy(CharDriverState *s)
{
- if (s->is_mux) {
+ if (qemu_chr_get_kind(s) == CHARDEV_BACKEND_KIND_MUX) {
MuxDriver *d = s->opaque;
return d->mux_cnt >= 0;
} else {
@@ -945,7 +944,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;
}
@@ -996,7 +995,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);
}
}
@@ -1007,7 +1006,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);
}
}
@@ -3552,9 +3551,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,
@@ -3572,7 +3571,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;
}
@@ -3616,7 +3615,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;
}
--
2.11.0
- Re: [Qemu-devel] [PATCH 03/20] char: add qemu_chr_fe_add_watch() Returns description, (continued)
- [Qemu-devel] [PATCH 04/20] doc: fix spelling, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 05/20] char: use a const CharDriver, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 06/20] char: use a static array for backends, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 08/20] char: fold single-user functions in caller, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 09/20] char: introduce generic qemu_chr_get_kind(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 10/20] char: use a feature bit for replay, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 12/20] bt: use qemu_chr_alloc(), Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 07/20] char: move callbacks in CharDriver, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 14/20] char: rename TCPChardev and NetChardev, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 11/20] char: allocate CharDriverState as a single object, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 15/20] spice-char: improve error reporting, Marc-André Lureau, 2017/01/05
- [Qemu-devel] [PATCH 16/20] char: use error_report(), Marc-André Lureau, 2017/01/05