[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 43/50] char: move fe_open in CharBackend
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 43/50] char: move fe_open in CharBackend |
Date: |
Mon, 24 Oct 2016 15:47:28 +0200 |
From: Marc-André Lureau <address@hidden>
The fe_open state belongs to front end.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/sysemu/char.h | 2 +-
qemu-char.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index ae32e1c..2c3060c 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -81,6 +81,7 @@ typedef struct CharBackend {
IOReadHandler *chr_read;
void *opaque;
int tag;
+ int fe_open;
} CharBackend;
struct CharDriverState {
@@ -108,7 +109,6 @@ struct CharDriverState {
char *filename;
int logfd;
int be_open;
- int fe_open;
int explicit_be_open;
int avail_connections;
int is_mux;
diff --git a/qemu-char.c b/qemu-char.c
index a1517a4..3b98acf 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -910,6 +910,7 @@ bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s,
Error **errp)
s->be = b;
}
+ b->fe_open = false;
b->tag = tag;
b->chr = s;
@@ -4216,10 +4217,10 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open)
return;
}
- if (chr->fe_open == fe_open) {
+ if (be->fe_open == fe_open) {
return;
}
- chr->fe_open = fe_open;
+ be->fe_open = fe_open;
if (chr->chr_set_fe_open) {
chr->chr_set_fe_open(chr, fe_open);
}
@@ -4304,7 +4305,7 @@ ChardevInfoList *qmp_query_chardev(Error **errp)
info->value = g_malloc0(sizeof(*info->value));
info->value->label = g_strdup(chr->label);
info->value->filename = g_strdup(chr->filename);
- info->value->frontend_open = chr->fe_open;
+ info->value->frontend_open = chr->be && chr->be->fe_open;
info->next = chr_list;
chr_list = info;
--
1.8.3.1
- [Qemu-devel] [PULL 27/50] mux: split mux_chr_update_read_handler(), (continued)
- [Qemu-devel] [PULL 27/50] mux: split mux_chr_update_read_handler(), Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 29/50] char: start converting mux driver to use CharBackend, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 33/50] colo: claim in find_and_check_chardev, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 32/50] char: rename some frontend functions, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 35/50] char: fold qemu_chr_set_handlers in qemu_chr_fe_set_handlers, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 36/50] vhost-user: only initialize queue 0 CharBackend, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 30/50] char: replace PROP_CHR with CharBackend, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 31/50] char: remaining switch to CharBackend in frontend, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 37/50] char: replace qemu_chr_claim/release with qemu_chr_fe_init/deinit, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 41/50] char: rename chr_close/chr_free, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 43/50] char: move fe_open in CharBackend,
Paolo Bonzini <=
- [Qemu-devel] [PULL 39/50] tests: start chardev unit tests, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 45/50] char: use an enum for CHR_EVENT, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 38/50] char: make some qemu_chr_fe skip if no driver, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 40/50] char: move front end handlers in CharBackend, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 46/50] char: remove unused qemu_chr_fe_event, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 42/50] char: remove explicit_fe_open, use a set_handlers argument, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 34/50] char: use qemu_chr_fe* functions with CharBackend argument, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 44/50] char: remove unused CHR_EVENT_FOCUS, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 47/50] char: replace avail_connections, Paolo Bonzini, 2016/10/24
- [Qemu-devel] [PULL 48/50] char: use common error path in qmp_chardev_add, Paolo Bonzini, 2016/10/24