motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

chardev: use bool for fe_is_open

Browse source 
The function qemu_chr_fe_init already treats be->fe_open as a bool and
if it acts like a bool it should be one. While we are at it make the
variable name more descriptive and add kdoc decorations.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231211145959.93759-1-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-12-11 14:59:59 +00:00
parent 2d41bf0fe1
commit 67b5595d3b
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
chardev/char-fe.c
View file

@ -211,7 +211,7 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Error **errp)
} }
} }
b->fe_open = false; b->fe_is_open = false;
b->tag = tag; b->tag = tag;
b->chr = s; b->chr = s;
return true; return true;
@ -257,7 +257,7 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b,
bool sync_state) bool sync_state)
{ {
Chardev *s; Chardev *s;
int fe_open; bool fe_open;
s = b->chr; s = b->chr;
if (!s) { if (!s) {
@ -265,10 +265,10 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b,
} }
if (!opaque && !fd_can_read && !fd_read && !fd_event) { if (!opaque && !fd_can_read && !fd_read && !fd_event) {
fe_open = 0; fe_open = false;
remove_fd_in_watch(s); remove_fd_in_watch(s);
} else { } else {
fe_open = 1; fe_open = true;
} }
b->chr_can_read = fd_can_read; b->chr_can_read = fd_can_read;
b->chr_read = fd_read; b->chr_read = fd_read;
@ -336,7 +336,7 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo)
} }
} }
void qemu_chr_fe_set_open(CharBackend *be, int fe_open) void qemu_chr_fe_set_open(CharBackend *be, bool is_open)
{ {
Chardev *chr = be->chr; Chardev *chr = be->chr;
@ -344,12 +344,12 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open)
return; return;
} }
if (be->fe_open == fe_open) { if (be->fe_is_open == is_open) {
return; return;
} }
be->fe_open = fe_open; be->fe_is_open = is_open;
if (CHARDEV_GET_CLASS(chr)->chr_set_fe_open) { if (CHARDEV_GET_CLASS(chr)->chr_set_fe_open) {
CHARDEV_GET_CLASS(chr)->chr_set_fe_open(chr, fe_open); CHARDEV_GET_CLASS(chr)->chr_set_fe_open(chr, is_open);
} }
} }

2
chardev/char.c
View file

@ -762,7 +762,7 @@ static int qmp_query_chardev_foreach(Object *obj, void *data)
value->label = g_strdup(chr->label); value->label = g_strdup(chr->label);
value->filename = g_strdup(chr->filename); value->filename = g_strdup(chr->filename);
value->frontend_open = chr->be && chr->be->fe_open; value->frontend_open = chr->be && chr->be->fe_is_open;
QAPI_LIST_PREPEND(*list, value); QAPI_LIST_PREPEND(*list, value);

19
include/chardev/char-fe.h
View file

@ -7,8 +7,12 @@
typedef void IOEventHandler(void *opaque, QEMUChrEvent event); typedef void IOEventHandler(void *opaque, QEMUChrEvent event);
typedef int BackendChangeHandler(void *opaque); typedef int BackendChangeHandler(void *opaque);
/* This is the backend as seen by frontend, the actual backend is /**
* Chardev */ * struct CharBackend - back end as seen by front end
* @fe_is_open: the front end is ready for IO
*
* The actual backend is Chardev
*/
struct CharBackend { struct CharBackend {
Chardev *chr; Chardev *chr;
IOEventHandler *chr_event; IOEventHandler *chr_event;
@ -17,7 +21,7 @@ struct CharBackend {
BackendChangeHandler *chr_be_change; BackendChangeHandler *chr_be_change;
void *opaque; void *opaque;
int tag; int tag;
int fe_open; bool fe_is_open;
}; };
/** /**
@ -156,12 +160,13 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo);
/** /**
* qemu_chr_fe_set_open: * qemu_chr_fe_set_open:
* @be: a CharBackend
* @is_open: the front end open status
* *
* Set character frontend open status. This is an indication that the * This is an indication that the front end is ready (or not) to begin
* front end is ready (or not) to begin doing I/O. * doing I/O. Without associated Chardev, do nothing.
* Without associated Chardev, do nothing.
*/ */
void qemu_chr_fe_set_open(CharBackend *be, int fe_open); void qemu_chr_fe_set_open(CharBackend *be, bool is_open);
/** /**
* qemu_chr_fe_printf: * qemu_chr_fe_printf: