[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/38] chardev: use QEMUChrEvent instead of int
From: |
Paolo Bonzini |
Subject: |
[PULL 37/38] chardev: use QEMUChrEvent instead of int |
Date: |
Wed, 8 Jan 2020 13:32:54 +0100 |
This uses the QEMUChrEvent enum everywhere except in IOEventHandler.
The IOEventHandler change needs to happen at once for all front ends and
is done with Coccinelle in the next patch.
(Extracted from a patch by Philippe Mathieu-Daudé).
Signed-off-by: Paolo Bonzini <address@hidden>
---
chardev/char-mux.c | 6 +++---
chardev/char.c | 4 ++--
include/chardev/char-mux.h | 2 +-
include/chardev/char.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 200c62a..2675ae0 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -117,7 +117,7 @@ static void mux_print_help(Chardev *chr)
}
}
-static void mux_chr_send_event(MuxChardev *d, int mux_nr, int event)
+static void mux_chr_send_event(MuxChardev *d, int mux_nr, QEMUChrEvent event)
{
CharBackend *be = d->backends[mux_nr];
@@ -126,7 +126,7 @@ static void mux_chr_send_event(MuxChardev *d, int mux_nr,
int event)
}
}
-static void mux_chr_be_event(Chardev *chr, int event)
+static void mux_chr_be_event(Chardev *chr, QEMUChrEvent event)
{
MuxChardev *d = MUX_CHARDEV(chr);
@@ -232,7 +232,7 @@ static void mux_chr_read(void *opaque, const uint8_t *buf,
int size)
}
}
-void mux_chr_send_all_event(Chardev *chr, int event)
+void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event)
{
MuxChardev *d = MUX_CHARDEV(chr);
int i;
diff --git a/chardev/char.c b/chardev/char.c
index 739da11..4f598f8 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -48,7 +48,7 @@ static Object *get_chardevs_root(void)
return container_get(object_get_root(), "/chardevs");
}
-static void chr_be_event(Chardev *s, int event)
+static void chr_be_event(Chardev *s, QEMUChrEvent event)
{
CharBackend *be = s->be;
@@ -59,7 +59,7 @@ static void chr_be_event(Chardev *s, int event)
be->chr_event(be->opaque, event);
}
-void qemu_chr_be_event(Chardev *s, int event)
+void qemu_chr_be_event(Chardev *s, QEMUChrEvent event)
{
/* Keep track if the char device is open */
switch (event) {
diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h
index 572cefd..417fe32 100644
--- a/include/chardev/char-mux.h
+++ b/include/chardev/char-mux.h
@@ -56,6 +56,6 @@ typedef struct MuxChardev {
object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
void mux_set_focus(Chardev *chr, int focus);
-void mux_chr_send_all_event(Chardev *chr, int event);
+void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event);
#endif /* CHAR_MUX_H */
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 087b202..00589a6 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -210,7 +210,7 @@ void qemu_chr_be_update_read_handlers(Chardev *s,
*
* Send an event from the back end to the front end.
*/
-void qemu_chr_be_event(Chardev *s, int event);
+void qemu_chr_be_event(Chardev *s, QEMUChrEvent event);
int qemu_chr_add_client(Chardev *s, int fd);
Chardev *qemu_chr_find(const char *name);
@@ -273,7 +273,7 @@ typedef struct ChardevClass {
void (*chr_accept_input)(Chardev *chr);
void (*chr_set_echo)(Chardev *chr, bool echo);
void (*chr_set_fe_open)(Chardev *chr, int fe_open);
- void (*chr_be_event)(Chardev *s, int event);
+ void (*chr_be_event)(Chardev *s, QEMUChrEvent event);
/* Return 0 if succeeded, 1 if failed */
int (*chr_machine_done)(Chardev *chr);
} ChardevClass;
--
1.8.3.1
- [PULL 24/38] hw/ipmi: Remove unnecessary declarations, (continued)
- [PULL 24/38] hw/ipmi: Remove unnecessary declarations, Paolo Bonzini, 2020/01/08
- [PULL 26/38] hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 27/38] hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 28/38] hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 29/38] ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 30/38] vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 31/38] vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 32/38] vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 34/38] monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 33/38] virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 37/38] chardev: use QEMUChrEvent instead of int,
Paolo Bonzini <=
- [PULL 35/38] monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 36/38] chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 38/38] chardev: Use QEMUChrEvent enum in IOEventHandler typedef, Paolo Bonzini, 2020/01/08
- Re: [PULL 00/38] Misc patches for 2020-01-08, no-reply, 2020/01/08
- Re: [PULL 00/38] Misc patches for 2020-01-08, Peter Maydell, 2020/01/13