[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/38] char: introduce CharBackend
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 09/38] char: introduce CharBackend |
Date: |
Sat, 22 Oct 2016 12:52:49 +0300 |
This new structure is meant to keep the details associated with a char
driver usage. On initialization, it gets a tag from the mux backend.
It can change its handlers thanks to qemu_chr_fe_set_handlers().
This structure is introduced so that all frontend will be moved to hold
and use a CharBackend. This will allow to better track char usage and
allocation, and help prevent some memory leaks or corruption.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
include/sysemu/char.h | 50 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 29b339f..9722fb6 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -910,6 +910,63 @@ static CharDriverState *qemu_chr_open_mux(const char *id,
return chr;
}
+CharDriverState *qemu_chr_fe_get_driver(CharBackend *be)
+{
+ assert(be);
+
+ return be->chr;
+}
+
+bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s, Error **errp)
+{
+ int tag = 0;
+
+ assert(b);
+ assert(s);
+
+ if (s->is_mux) {
+ tag = mux_chr_new_handler_tag(s, errp);
+ if (tag < 0) {
+ return false;
+ }
+ }
+
+ b->tag = tag;
+ b->chr = s;
+
+ return true;
+}
+
+void qemu_chr_fe_set_handlers(CharBackend *b,
+ IOCanReadHandler *fd_can_read,
+ IOReadHandler *fd_read,
+ IOEventHandler *fd_event,
+ void *opaque,
+ GMainContext *context)
+{
+ assert(b);
+
+ if (!b->chr) {
+ return;
+ }
+
+ qemu_chr_set_handlers(b->chr, fd_can_read, fd_read,
+ fd_event, opaque, context, b->tag);
+
+ if (b->chr->is_mux) {
+ mux_chr_set_handlers(b->chr, context);
+ }
+}
+
+void qemu_chr_fe_take_focus(CharBackend *b)
+{
+ assert(b);
+ assert(b->chr);
+
+ if (b->chr->is_mux) {
+ mux_set_focus(b->chr->opaque, b->tag);
+ }
+}
typedef struct IOWatchPoll
{
@@ -4184,6 +4241,9 @@ void qemu_chr_disconnect(CharDriverState *chr)
static void qemu_chr_free_common(CharDriverState *chr)
{
+ if (chr->be) {
+ chr->be->chr = NULL;
+ }
g_free(chr->filename);
g_free(chr->label);
if (chr->logfd != -1) {
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index f0abbac..01cf0cc 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -72,6 +72,12 @@ typedef enum {
QEMU_CHAR_FEATURE_LAST,
} CharDriverFeature;
+/* This is the backend as seen by frontend, the actual backend is
+ * CharDriverState */
+typedef struct CharBackend {
+ CharDriverState *chr;
+ int tag;
+} CharBackend;
struct CharDriverState {
QemuMutex chr_write_lock;
@@ -156,6 +162,8 @@ void qemu_chr_parse_common(QemuOpts *opts, ChardevCommon
*backend);
* Returns: a new character backend
*/
CharDriverState *qemu_chr_new(const char *label, const char *filename);
+
+
/**
* @qemu_chr_disconnect:
*
@@ -425,6 +433,48 @@ void qemu_chr_be_write_impl(CharDriverState *s, uint8_t
*buf, int len);
*/
void qemu_chr_be_event(CharDriverState *s, int event);
+/**
+ * @qemu_chr_fe_init:
+ *
+ * Initializes a front end for the given CharBackend and CharDriver.
+ *
+ * Returns: false on error.
+ */
+bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s, Error **errp);
+
+/**
+ * @qemu_chr_fe_get_driver:
+ *
+ * Returns the driver associated with a CharBackend or NULL.
+ */
+CharDriverState *qemu_chr_fe_get_driver(CharBackend *be);
+
+/**
+ * @qemu_chr_fe_set_handlers:
+ * @b: a CharBackend
+ * @fd_can_read: callback to get the amount of data the frontend may
+ * receive
+ * @fd_read: callback to receive data from char
+ * @fd_event: event callback
+ * @opaque: an opaque pointer for the callbacks
+ * @context: a main loop context or NULL for the default
+ *
+ * Set the front end char handlers.
+ */
+void qemu_chr_fe_set_handlers(CharBackend *b,
+ IOCanReadHandler *fd_can_read,
+ IOReadHandler *fd_read,
+ IOEventHandler *fd_event,
+ void *opaque,
+ GMainContext *context);
+
+/**
+ * @qemu_chr_fe_take_focus:
+ *
+ * Take the focus (if the front end is muxed)
+ */
+void qemu_chr_fe_take_focus(CharBackend *b);
+
void qemu_chr_add_handlers(CharDriverState *s,
IOCanReadHandler *fd_can_read,
IOReadHandler *fd_read,
--
2.10.0
- [Qemu-devel] [PATCH 01/38] rng: remove unused included header, (continued)
- [Qemu-devel] [PATCH 01/38] rng: remove unused included header, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 02/38] char: remove use-after-free on win-stdio, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 04/38] sun4uv: fix serial initialization regression, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 03/38] ringbuf: fix chr_write return value, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 05/38] malta: replace chr init by CHR_EVENT_OPENED handler, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 07/38] xilinx: fix buffer overflow on realize, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 06/38] char: remove init callback, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 08/38] mux: split mux_chr_update_read_handler(), Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 10/38] char: start converting mux driver to use CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 09/38] char: introduce CharBackend,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 11/38] char: replace PROP_CHR with CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 14/38] colo: claim in find_and_check_chardev, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 12/38] char: remaining switch to CharBackend in frontend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 13/38] char: rename some frontend functions, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 16/38] char: fold qemu_chr_set_handlers in qemu_chr_fe_set_handlers, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 17/38] vhost-user: only initialize queue 0 CharBackend, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 15/38] char: use qemu_chr_fe* functions with CharBackend argument, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 18/38] char: replace qemu_chr_claim/release with qemu_chr_fe_init/deinit, Marc-André Lureau, 2016/10/22
- [Qemu-devel] [PATCH 19/38] char: make some qemu_chr_fe skip if no driver, Marc-André Lureau, 2016/10/22