chardev: Use QEMUChrEvent enum in IOEventHandler typedef
Subsystems (6)
v2 cover chardev: Use QEMUChrEvent enum in IOEventHandler typedef
Hi,
After this chat on #qemu IRC:
13:20 <stsquad> so what is the difference between a IOReadHandler and IOEventHandler? 13:25 <f4bug> stsquad: one is in-band and the other out-of-band?
13:26 <stsquad> f4bug: ahh yes it seems so - connect/disconnect etc... 13:27 <f4bug> see QEMUChrEvent for IOEventHandler
I thought it might be a good opportunity to make the IOEventHandler typedef meaning more obvious, by using the QEMUChrEvent enum.
To be able to build I had to explicit all enums ignored in the switch(event) statement by these frontends.
Then I used a coccinelle spatch to change the various IOEventHandler. I don't think the last patch can be split, but suggestions are welcome!
Regards,
Phil.
v2:
- do blindly ignore all events using a 'default' case.
Philippe Mathieu-Daudé (14):
hw/ipmi: Remove unnecessary declarations
hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler
ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler
vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler
vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler
vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler
virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler
chardev: Use QEMUChrEvent enum in IOEventHandler typedef
include/chardev/char-fe.h | 2 +- include/chardev/char-mux.h | 2 +- include/chardev/char.h | 4 ++-- backends/cryptodev-vhost-user.c | 7 ++++++- chardev/char-mux.c | 8 ++++---- chardev/char.c | 9 +++++++-- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/vhost-user-blk.c | 7 ++++++- hw/char/cadence_uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/terminal3270.c | 7 ++++++- hw/char/virtio-console.c | 7 ++++++- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 12 +++++++----- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 7 ++++++- hw/usb/dev-serial.c | 6 +++++- hw/usb/redirect.c | 7 ++++++- monitor/hmp.c | 6 +++++- monitor/qmp.c | 7 ++++++- net/filter-mirror.c | 2 +- net/vhost-user.c | 9 +++++++-- qtest.c | 2 +- tests/test-char.c | 6 +++--- tests/vhost-user-test.c | 2 +- 44 files changed, 111 insertions(+), 56 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/14 hw/ipmi: Remove unnecessary declarations
Since we don't use these methods before defining them, no need to forward-declare them.
---
Cc: Corey Minyard <[email protected]>
In case the other patches are rejected:
Cc: [email protected]
--- hw/ipmi/ipmi_bmc_extern.c | 4 ---- 1 file changed, 4 deletions(-)
hw/ipmi/ipmi_bmc_extern.c +0 -4
@@ -87,10 +87,6 @@ typedef struct IPMIBmcExtern {bool send_reset; } IPMIBmcExtern; -static int can_receive (void *opaque); -static void receive (void *opaque,const uint8_t *buf,int size); -static void chr_event (void *opaque,int event); -static unsigned char ipmb_checksum (const unsigned char *data,int size,unsigned char start) {
Signature · 1 line
2.21.0
RFC PATCH v2 2/14 hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
hw/ipmi/ipmi_bmc_extern.c: In function ‘chr_event’:
hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
389 | switch (event) {
| ^~~~~~ hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/ipmi/ipmi_bmc_extern.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/ipmi/ipmi_bmc_extern.c +6 -0
@@ -435,6 +435,12 @@ static void chr_event(void *opaque, int event) k->handle_rsp (s, ibe->outbuf[0 ], ibe->inbuf +1 ,3 ); }break ; + +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 02/14] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler
Quoted 5 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
Quoted 7 lines
hw/ipmi/ipmi_bmc_extern.c: In function ‘chr_event’:
hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]389 | switch (event) { | ^~~~~~
hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]hw/ipmi/ipmi_bmc_extern.c:389:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
Obviously a no-op, but better style. This is fine.
Quoted 30 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Add all missing enumsCc Corey Minyard <[email protected]>--- hw/ipmi/ipmi_bmc_extern.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/ipmi/ipmi_bmc_extern.c +6
-0@@ -435,6 +435,12 @@ static void chr_event(void *opaque, int event) k->handle_rsp (s, ibe->outbuf[0 ], ibe->inbuf +1 ,3 ); }break ; + +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }Signature · 1 line
2.21.0
Re: [RFC PATCH v2 02/14] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
In the title, s/Explicit we/Explicitly/.
Here in the body, "need to be explicit about all the events ignored", "to silence".
This same grammar cleanup applies to patches 2-13.
Otherwise,
for all of 2-13.
r~
Re: [RFC PATCH v2 02/14] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler
Quoted 11 lines · Richard Henderson
Quoted 4 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
In the title, s/Explicit we/Explicitly/.
Here in the body, "need to be explicit about all the events ignored", "to silence".
This same grammar cleanup applies to patches 2-13.
OK I'll fix that.
Quoted 4 lines
Otherwise,
Reviewed-by Richard Henderson <[email protected]>for all of 2-13.
Thanks!
RFC PATCH v2 3/14 hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC s390x-softmmu/hw/char/terminal3270.o
hw/char/terminal3270.c: In function ‘chr_event’:
hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
156 | switch (event) {
| ^~~~~~ hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/char/terminal3270.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/char/terminal3270.c +5 -0
@@ -166,6 +166,11 @@ static void chr_event(void *opaque, int event) sch->curr_status.scsw.dstat =SCSW_DSTAT_DEVICE_END ;css_conditional_io_interrupt (sch);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 03/14] hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler
Quoted 34 lines · On Wed, 18 Dec 2019 18:19:58 +0100 Philippe Mathieu-Daudé <[email protected]>…
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC s390x-softmmu/hw/char/terminal3270.o hw/char/terminal3270.c: In function ‘chr_event’: hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch] 156 | switch (event) { | ^~~~~~
hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]hw/char/terminal3270.c:156:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errorsSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Add all missing enumsCc Cornelia Huck <[email protected]>Cc Halil Pasic <[email protected]>Cc Christian Borntraeger <[email protected]>Cc "Marc-André Lureau" <[email protected]>Cc Paolo Bonzini <[email protected]>--- hw/char/terminal3270.c | 5 +++++ 1 file changed, 5 insertions(+)hw/char/terminal3270.c +0
-0@@ -166,6 +166,11 @@ static void chr_event(void *opaque, int event) sch->curr_status.scsw.dstat =SCSW_DSTAT_DEVICE_END ;
hw/char/terminal3270.c static void chr_event(void *opaque, int event) · line 176
Quoted 10 lines
hw/char/terminal3270.c +5
-0css_conditional_io_interrupt (sch);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
It indeed seems sane to ignore all of these.
RFC PATCH v2 4/14 hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
hw/usb/dev-serial.c: In function ‘usb_serial_event’:
hw/usb/dev-serial.c:468:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]
468 | switch (event) {
| ^~~~~~ hw/usb/dev-serial.c:468:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/usb/dev-serial.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/usb/dev-serial.c +4 -0
@@ -479,6 +479,10 @@ static void usb_serial_event(void *opaque, int event)usb_device_detach (&s->dev); }break ; +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
RFC PATCH v2 5/14 hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC hw/usb/redirect.o
hw/usb/redirect.c: In function ‘usbredir_chardev_event’:
hw/usb/redirect.c:1361:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
1361 | switch (event) {
| ^~~~~~ hw/usb/redirect.c:1361:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] hw/usb/redirect.c:1361:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/usb/redirect.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/usb/redirect.c +5 -0
@@ -1370,6 +1370,11 @@ static void usbredir_chardev_event(void *opaque, int event)DPRINTF ("chardev close\n" );qemu_bh_schedule (dev->chardev_close_bh);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
RFC PATCH v2 6/14 ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
hw/usb/ccid-card-passthru.c: In function ‘ccid_card_vscard_event’:
hw/usb/ccid-card-passthru.c:314:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]
314 | switch (event) {
| ^~~~~~ hw/usb/ccid-card-passthru.c:314:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch] hw/usb/ccid-card-passthru.c:314:5: error: enumeration value ‘CHR_EVENT_CLOSED’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/usb/ccid-card-passthru.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/usb/ccid-card-passthru.c +5 -0
@@ -318,6 +318,11 @@ static void ccid_card_vscard_event(void *opaque, int event)case CHR_EVENT_OPENED :DPRINTF (card,D_INFO ,"%s: CHR_EVENT_OPENED\n" , __func__);break ; +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +case CHR_EVENT_CLOSED : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
RFC PATCH v2 7/14 vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC backends/cryptodev-vhost-user.o
backends/cryptodev-vhost-user.c: In function ‘cryptodev_vhost_user_event’:
backends/cryptodev-vhost-user.c:163:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
163 | switch (event) {
| ^~~~~~ backends/cryptodev-vhost-user.c:163:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] backends/cryptodev-vhost-user.c:163:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- backends/cryptodev-vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+)
backends/cryptodev-vhost-user.c +5 -0
@@ -171,6 +171,11 @@ static void cryptodev_vhost_user_event(void *opaque, int event) b->ready = false;cryptodev_vhost_user_stop (queues, s);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
RFC PATCH v2 8/14 vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC net/vhost-user.o
net/vhost-user.c: In function ‘net_vhost_user_event’:
net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
269 | switch (event) {
| ^~~~~~ net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- net/vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+)
net/vhost-user.c +5 -0
@@ -294,6 +294,11 @@ static void net_vhost_user_event(void *opaque, int event)aio_bh_schedule_oneshot (ctx, chr_closed_bh, opaque); }break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; }if (err) {
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 08/14] vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler
Quoted 14 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC
net/vhost-user.o
net/vhost-user.c: In function ‘net_vhost_user_event’:
net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]269 | switch (event) { | ^~~~~~
net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]net/vhost-user.c:269:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
Quoted 6 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Add all missing enumsCc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>
Quoted 22 lines
--- net/vhost-user.c | 5 +++++ 1 file changed, 5 insertions(+)net/vhost-user.c +5
-0@@ -294,6 +294,11 @@ static void net_vhost_user_event(void *opaque, int event)aio_bh_schedule_oneshot (ctx, chr_closed_bh, opaque); }break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; }if (err) {Signature · 1 line
2.21.0
RFC PATCH v2 9/14 vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC s390x-softmmu/hw/block/vhost-user-blk.o
hw/block/vhost-user-blk.c: In function ‘vhost_user_blk_event’:
hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
370 | switch (event) {
| ^~~~~~ hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/block/vhost-user-blk.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/block/vhost-user-blk.c +5 -0
@@ -383,6 +383,11 @@ static void vhost_user_blk_event(void *opaque, int event) s->watch =0 ; }break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 09/14] vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler
Quoted 14 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC s390x-softmmu/hw/block/vhost-user-blk.o hw/block/vhost-user-blk.c: In function ‘vhost_user_blk_event’: hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch] 370 | switch (event) { | ^~~~~~
hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]hw/block/vhost-user-blk.c:370:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
Quoted 8 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Add all missing enumsCc "Michael S. Tsirkin" <[email protected]>Cc Kevin Wolf <[email protected]>Cc Max Reitz <[email protected]>
Quoted 22 lines
--- hw/block/vhost-user-blk.c | 5 +++++ 1 file changed, 5 insertions(+)hw/block/vhost-user-blk.c +5
-0@@ -383,6 +383,11 @@ static void vhost_user_blk_event(void *opaque, int event) s->watch =0 ; }break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }Signature · 1 line
2.21.0
RFC PATCH v2 10/14 virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC hw/char/virtio-console.o
hw/char/virtio-console.c: In function ‘chr_event’:
hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
154 | switch (event) {
| ^~~~~~ hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- hw/char/virtio-console.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/char/virtio-console.c +5 -0
@@ -162,6 +162,11 @@ static void chr_event(void *opaque, int event) }virtio_serial_close (port);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 10/14] virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler
Quoted 15 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC
hw/char/virtio-console.o
hw/char/virtio-console.c: In function ‘chr_event’:
hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]154 | switch (event) { | ^~~~~~
hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]hw/char/virtio-console.c:154:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errorsSigned-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 8 lines
---
v2: Add all missing enumsCc "Michael S. Tsirkin" <[email protected]>Cc Laurent Vivier <[email protected]>Cc Amit Shah <[email protected]>Cc "Marc-André Lureau" <[email protected]>Cc Paolo Bonzini <[email protected]>
Quoted 22 lines
--- hw/char/virtio-console.c | 5 +++++ 1 file changed, 5 insertions(+)hw/char/virtio-console.c +5
-0@@ -162,6 +162,11 @@ static void chr_event(void *opaque, int event) }virtio_serial_close (port);break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }Signature · 1 line
2.21.0
RFC PATCH v2 11/14 monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC monitor/qmp.o
monitor/qmp.c: In function ‘monitor_qmp_event’:
monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
345 | switch (event) {
| ^~~~~~ monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- monitor/qmp.c | 5 +++++ 1 file changed, 5 insertions(+)
monitor/qmp.c +5 -0
@@ -365,6 +365,11 @@ static void monitor_qmp_event(void *opaque, int event) mon_refcount--;monitor_fdsets_cleanup ();break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
Signature · 1 line
2.21.0
Re: [RFC PATCH v2 11/14] monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler
Quoted 28 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
CC
monitor/qmp.o
monitor/qmp.c: In function ‘monitor_qmp_event’:
monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]345 | switch (event) { | ^~~~~~
monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch]monitor/qmp.c:345:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errorsSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: Add all missing enumsCc Markus Armbruster <[email protected]>--- monitor/qmp.c | 5 +++++ 1 file changed, 5 insertions(+)monitor/qmp.c +0
-0
monitor/qmp.c static void monitor_qmp_event(void *opaque, int event) · line 374
Quoted 10 lines
monitor/qmp.c +5
-0@@ -365,6 +365,11 @@ static void monitor_qmp_event(void *opaque, int event) mon_refcount--;monitor_fdsets_cleanup ();break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; } }
With the comment dropped:
PATCH v2 12/14 monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit an event ignored by this frontend, to silent the following GCC warning:
CC monitor/hmp.o
monitor/hmp.c: In function ‘monitor_event’:
monitor/hmp.c:1330:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
1330 | switch (event) {
| ^~~~~~cc1: all warnings being treated as errors
---
v2: Add all missing values
--- monitor/hmp.c | 4 ++++ 1 file changed, 4 insertions(+)
monitor/hmp.c +4 -0
@@ -1371,6 +1371,10 @@ static void monitor_event(void *opaque, int event) mon_refcount--;monitor_fdsets_cleanup ();break ; + +case CHR_EVENT_BREAK : +/* Ignored */ +break ; } }
Signature · 1 line
2.21.0
RFC PATCH v2 13/14 chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum. To be able to use this enum in the IOEventHandler typedef, we need to explicit all the events ignored by this frontend, to silent the following GCC warning:
chardev/char.c: In function ‘qemu_chr_be_event’:
chardev/char.c:65:5: error: enumeration value ‘CHR_EVENT_BREAK’ not handled in switch [-Werror=switch]
65 | switch (event) {
| ^~~~~~ chardev/char.c:65:5: error: enumeration value ‘CHR_EVENT_MUX_IN’ not handled in switch [-Werror=switch] chardev/char.c:65:5: error: enumeration value ‘CHR_EVENT_MUX_OUT’ not handled in switch [-Werror=switch]
cc1: all warnings being treated as errors
---
v2: Add all missing enums
--- chardev/char.c | 5 +++++ 1 file changed, 5 insertions(+)
chardev/char.c +5 -0
@@ -69,6 +69,11 @@ void qemu_chr_be_event(Chardev *s, int event)case CHR_EVENT_CLOSED : s->be_open =0 ;break ; +case CHR_EVENT_BREAK : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_MUX_OUT : +/* Ignore */ +break ; }CHARDEV_GET_CLASS (s)->chr_be_event (s, event);
Signature · 1 line
2.21.0
RFC PATCH v2 14/14 chardev: Use QEMUChrEvent enum in IOEventHandler typedef
In reply to Philippe Mathieu-DaudéThe Chardev events are listed in the QEMUChrEvent enum.
By using the enum in the IOEventHandler typedef we:
- make the IOEventHandler type more explicit (this handler process out-of-band information, while the IOReadHandler is in-band),
- help static code analyzers.
This patch was produced with the following spatch script:
@match@
expression backend, opaque, context, set_open; identifier fd_can_read, fd_read, fd_event, be_change; @@
qemu_chr_fe_set_handlers(backend, fd_can_read, fd_read, fd_event,
be_change, opaque, context, set_open);
@depends on match@
identifier opaque, event;
identifier match.fd_event;
@@
static
-void fd_event(void *opaque, int event)
+void fd_event(void *opaque, QEMUChrEvent event)
{
...
}Then the following files were manually modified:
- include/chardev/char-fe.h
- include/chardev/char.h
- include/chardev/char-mux.h
- chardev/char.c
- chardev/char-mux.c
---
Cc: "Gonglei (Arei)" <[email protected]>
Cc: "Marc-André Lureau" <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Alex Bennée" <[email protected]>
Cc: "Philippe Mathieu-Daudé" <[email protected]>
Cc: Andrzej Zaborowski <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: Max Reitz <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: Antony Pavlov <[email protected]>
Cc: Igor Mitsyanko <[email protected]>
Cc: Fabien Chouteau <[email protected]>
Cc: KONRAD Frederic <[email protected]>
Cc: Peter Chubb <[email protected]>
Cc: Alberto Garcia <[email protected]>
Cc: Michael Walle <[email protected]>
Cc: Thomas Huth <[email protected]>
Cc: Joel Stanley <[email protected]>
Cc: Cornelia Huck <[email protected]>
Cc: Halil Pasic <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: Laurent Vivier <[email protected]>
Cc: Amit Shah <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Aleksandar Rikalo <[email protected]>
Cc: Aurelien Jarno <[email protected]>
Cc: Aleksandar Markovic <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Sagar Karandikar <[email protected]>
Cc: Bastian Koppelmann <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Samuel Thibault <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Markus Armbruster <[email protected]>
Cc: Zhang Chen <[email protected]>
Cc: Li Zhijian <[email protected]>
Cc: Jason Wang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/chardev/char-fe.h | 2 +- include/chardev/char-mux.h | 2 +- include/chardev/char.h | 4 ++-- backends/cryptodev-vhost-user.c | 2 +- chardev/char-mux.c | 8 ++++---- chardev/char.c | 4 ++-- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/redirect.c | 2 +- monitor/hmp.c | 2 +- monitor/qmp.c | 2 +- net/filter-mirror.c | 2 +- net/vhost-user.c | 4 ++-- qtest.c | 2 +- tests/test-char.c | 6 +++--- tests/vhost-user-test.c | 2 +- 44 files changed, 52 insertions(+), 52 deletions(-)
include/chardev/char-fe.h +1 -1
@@ -4,7 +4,7 @@#include "chardev/char.h" #include "qemu/main-loop.h" -typedef void IOEventHandler (void *opaque,int event); +typedef void IOEventHandler (void *opaque,QEMUChrEvent event);typedef int BackendChangeHandler (void *opaque);/* This is the backend as seen by frontend, the actual backend is
include/chardev/char-mux.h +1 -1
@@ -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 */
include/chardev/char.h +2 -2
@@ -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;
backends/cryptodev-vhost-user.c +1 -1
@@ -152,7 +152,7 @@ cryptodev_vhost_claim_chardev(CryptoDevBackendVhostUser *s,return chr; } -static void cryptodev_vhost_user_event (void *opaque,int event) +static void cryptodev_vhost_user_event (void *opaque,QEMUChrEvent event) {CryptoDevBackendVhostUser *s = opaque;CryptoDevBackend *b =CRYPTODEV_BACKEND (s);
chardev/char-mux.c +4 -4
@@ -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;
@@ -247,7 +247,7 @@ void mux_chr_send_all_event(Chardev *chr, int event) } } -static void mux_chr_event (void *opaque,int event) +static void mux_chr_event (void *opaque,QEMUChrEvent event) {mux_chr_send_all_event (CHARDEV (opaque), event); }
chardev/char.c +2 -2
@@ -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) {
gdbstub.c +1 -1
@@ -3171,7 +3171,7 @@ static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size) } } -static void gdb_chr_event (void *opaque,int event) +static void gdb_chr_event (void *opaque,QEMUChrEvent event) {int i;GDBState *s = (GDBState *) opaque;
hw/arm/pxa2xx.c +1 -1
@@ -1955,7 +1955,7 @@ static void pxa2xx_fir_rx(void *opaque, const uint8_t *buf, int size)pxa2xx_fir_update (s); } -static void pxa2xx_fir_event (void *opaque,int event) +static void pxa2xx_fir_event (void *opaque,QEMUChrEvent event) { }
hw/arm/strongarm.c +1 -1
@@ -1093,7 +1093,7 @@ static void strongarm_uart_receive(void *opaque, const uint8_t *buf, int size)strongarm_uart_update_int_status (s); } -static void strongarm_uart_event (void *opaque,int event) +static void strongarm_uart_event (void *opaque,QEMUChrEvent event) {StrongARMUARTState *s = opaque;if (event ==CHR_EVENT_BREAK ) {
hw/block/vhost-user-blk.c +1 -1
@@ -361,7 +361,7 @@ static gboolean vhost_user_blk_watch(GIOChannel *chan, GIOCondition cond,return true; } -static void vhost_user_blk_event (void *opaque,int event) +static void vhost_user_blk_event (void *opaque,QEMUChrEvent event) {DeviceState *dev = opaque;VirtIODevice *vdev =VIRTIO_DEVICE (dev);
hw/char/cadence_uart.c +1 -1
@@ -348,7 +348,7 @@ static void uart_receive(void *opaque, const uint8_t *buf, int size) } } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) {CadenceUARTState *s = opaque;uint8_t buf ='\0' ;
hw/char/digic-uart.c +1 -1
@@ -131,7 +131,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, int size) s->reg_rx = *buf; } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }
hw/char/escc.c +1 -1
@@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)serial_receive_byte (s, buf[0 ]); } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) {ESCCChannelState *s = opaque;if (event ==CHR_EVENT_BREAK )
hw/char/etraxfs_ser.c +1 -1
@@ -202,7 +202,7 @@ static int serial_can_receive(void *opaque)return sizeof (s->rx_fifo) - s->rx_fifo_len; } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) { }
hw/char/exynos4210_uart.c +1 -1
@@ -528,7 +528,7 @@ static void exynos4210_uart_receive(void *opaque, const uint8_t *buf, int size) } -static void exynos4210_uart_event (void *opaque,int event) +static void exynos4210_uart_event (void *opaque,QEMUChrEvent event) {Exynos4210UartState *s = (Exynos4210UartState *)opaque;
hw/char/grlib_apbuart.c +1 -1
@@ -155,7 +155,7 @@ static void grlib_apbuart_receive(void *opaque, const uint8_t *buf, int size) } } -static void grlib_apbuart_event (void *opaque,int event) +static void grlib_apbuart_event (void *opaque,QEMUChrEvent event) {trace_grlib_apbuart_event (event); }
hw/char/imx_serial.c +1 -1
@@ -323,7 +323,7 @@ static void imx_receive(void *opaque, const uint8_t *buf, int size)imx_put_data (opaque, *buf); } -static void imx_event (void *opaque,int event) +static void imx_event (void *opaque,QEMUChrEvent event) {if (event ==CHR_EVENT_BREAK ) {imx_put_data (opaque,URXD_BRK |URXD_FRMERR |URXD_ERR );
hw/char/ipoctal232.c +1 -1
@@ -503,7 +503,7 @@ static void hostdev_receive(void *opaque, const uint8_t *buf, int size) } } -static void hostdev_event (void *opaque,int event) +static void hostdev_event (void *opaque,QEMUChrEvent event) {SCC2698Channel *ch = opaque;switch (event) {
hw/char/lm32_juart.c +1 -1
@@ -104,7 +104,7 @@ static int juart_can_rx(void *opaque)return !(s->jrx &JRX_FULL ); } -static void juart_event (void *opaque,int event) +static void juart_event (void *opaque,QEMUChrEvent event) { }
hw/char/lm32_uart.c +1 -1
@@ -235,7 +235,7 @@ static int uart_can_rx(void *opaque)return !(s->regs[R_LSR ] &LSR_DR ); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }
hw/char/mcf_uart.c +1 -1
@@ -256,7 +256,7 @@ static void mcf_uart_push_byte(mcf_uart_state *s, uint8_t data)mcf_uart_update (s); } -static void mcf_uart_event (void *opaque,int event) +static void mcf_uart_event (void *opaque,QEMUChrEvent event) {mcf_uart_state *s = (mcf_uart_state *)opaque;
hw/char/milkymist-uart.c +1 -1
@@ -180,7 +180,7 @@ static int uart_can_rx(void *opaque)return !(s->regs[R_STAT ] &STAT_RX_EVT ); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }
hw/char/nrf51_uart.c +1 -1
@@ -245,7 +245,7 @@ static int uart_can_receive(void *opaque)return s->rx_started ? (UART_FIFO_LENGTH - s->rx_fifo_len) :0 ; } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) {NRF51UARTState *s =NRF51_UART (opaque);
hw/char/pl011.c +1 -1
@@ -280,7 +280,7 @@ static void pl011_receive(void *opaque, const uint8_t *buf, int size)pl011_put_fifo (opaque, *buf); } -static void pl011_event (void *opaque,int event) +static void pl011_event (void *opaque,QEMUChrEvent event) {if (event ==CHR_EVENT_BREAK )pl011_put_fifo (opaque,0x400 );
hw/char/serial.c +1 -1
@@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)serial_update_irq (s); } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) {SerialState *s = opaque;DPRINTF ("event %x\n" , event);
hw/char/sh_serial.c +1 -1
@@ -358,7 +358,7 @@ static void sh_serial_receive1(void *opaque, const uint8_t *buf, int size) } } -static void sh_serial_event (void *opaque,int event) +static void sh_serial_event (void *opaque,QEMUChrEvent event) {sh_serial_state *s = opaque;if (event ==CHR_EVENT_BREAK )
hw/char/terminal3270.c +1 -1
@@ -142,7 +142,7 @@ static void terminal_read(void *opaque, const uint8_t *buf, int size) } } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {Terminal3270 *t = opaque;CcwDevice *ccw_dev =CCW_DEVICE (t);
hw/char/virtio-console.c +1 -1
@@ -145,7 +145,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)virtio_serial_write (port, buf, size); } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {VirtConsole *vcon = opaque;VirtIOSerialPort *port =VIRTIO_SERIAL_PORT (vcon);
hw/char/xilinx_uartlite.c +1 -1
@@ -206,7 +206,7 @@ static int uart_can_rx(void *opaque)return s->rx_fifo_len <sizeof (s->rx_fifo); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }
hw/ipmi/ipmi_bmc_extern.c +1 -1
@@ -379,7 +379,7 @@ static void receive(void *opaque, const uint8_t *buf, int size)handle_hw_op (ibe, hw_op); } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {IPMIBmcExtern *ibe = opaque;IPMIInterface *s = ibe->parent.intf;
hw/mips/boston.c +1 -1
@@ -98,7 +98,7 @@ enum boston_plat_reg { PLAT_SYS_CTL = 0x48, }; -static void boston_lcd_event (void *opaque,int event) +static void boston_lcd_event (void *opaque,QEMUChrEvent event) {BostonState *s = opaque;if (event ==CHR_EVENT_OPENED && !s->lcd_inited) {
hw/mips/mips_malta.c +1 -1
@@ -545,7 +545,7 @@ static void malta_fpga_reset(void *opaque)snprintf (s->display_text,9 ," " ); } -static void malta_fgpa_display_event (void *opaque,int event) +static void malta_fgpa_display_event (void *opaque,QEMUChrEvent event) {MaltaFPGAState *s = opaque;
hw/riscv/riscv_htif.c +1 -1
@@ -96,7 +96,7 @@ static void htif_recv(void *opaque, const uint8_t *buf, int size)* Called by the char dev to supply special events to the HTIF console. * Not used for HTIF. */ -static void htif_event (void *opaque,int event) +static void htif_event (void *opaque,QEMUChrEvent event) { }
hw/riscv/sifive_uart.c +1 -1
@@ -162,7 +162,7 @@ static int uart_can_rx(void *opaque)return s->rx_fifo_len <sizeof (s->rx_fifo); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }
hw/usb/ccid-card-passthru.c +1 -1
@@ -307,7 +307,7 @@ static void ccid_card_vscard_read(void *opaque, const uint8_t *buf, int size) } } -static void ccid_card_vscard_event (void *opaque,int event) +static void ccid_card_vscard_event (void *opaque,QEMUChrEvent event) {PassthruState *card = opaque;
hw/usb/dev-serial.c +1 -1
@@ -461,7 +461,7 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) s->recv_used += size; } -static void usb_serial_event (void *opaque,int event) +static void usb_serial_event (void *opaque,QEMUChrEvent event) {USBSerialState *s = opaque;
hw/usb/redirect.c +1 -1
@@ -1354,7 +1354,7 @@ static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size)usbredirparser_do_write (dev->parser); } -static void usbredir_chardev_event (void *opaque,int event) +static void usbredir_chardev_event (void *opaque,QEMUChrEvent event) {USBRedirDevice *dev = opaque;
monitor/hmp.c +1 -1
@@ -1322,7 +1322,7 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size) cur_mon = old_mon; } -static void monitor_event (void *opaque,int event) +static void monitor_event (void *opaque,QEMUChrEvent event) {Monitor *mon = opaque;MonitorHMP *hmp_mon =container_of (mon, MonitorHMP, common);
monitor/qmp.c +1 -1
@@ -337,7 +337,7 @@ static QDict *qmp_greeting(MonitorQMP *mon) ver, cap_list); } -static void monitor_qmp_event (void *opaque,int event) +static void monitor_qmp_event (void *opaque,QEMUChrEvent event) {QDict *data;MonitorQMP *mon = opaque;
net/filter-mirror.c +1 -1
@@ -132,7 +132,7 @@ static void redirector_chr_read(void *opaque, const uint8_t *buf, int size) } } -static void redirector_chr_event (void *opaque,int event) +static void redirector_chr_event (void *opaque,QEMUChrEvent event) {NetFilterState *nf = opaque;MirrorState *s =FILTER_REDIRECTOR (nf);
net/vhost-user.c +2 -2
@@ -218,7 +218,7 @@ static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond,return TRUE; } -static void net_vhost_user_event (void *opaque,int event); +static void net_vhost_user_event (void *opaque,QEMUChrEvent event);static void chr_closed_bh (void *opaque) {
@@ -249,7 +249,7 @@ static void chr_closed_bh(void *opaque) } } -static void net_vhost_user_event (void *opaque,int event) +static void net_vhost_user_event (void *opaque,QEMUChrEvent event) {const char *name = opaque;NetClientState *ncs[MAX_QUEUE_NUM ];
qtest.c +1 -1
@@ -722,7 +722,7 @@ static int qtest_can_read(void *opaque)return 1024 ; } -static void qtest_event (void *opaque,int event) +static void qtest_event (void *opaque,QEMUChrEvent event) {int i;
tests/test-char.c +3 -3
@@ -54,7 +54,7 @@ static void fe_read(void *opaque, const uint8_t *buf, int size) quit = true; } -static void fe_event (void *opaque,int event) +static void fe_event (void *opaque,QEMUChrEvent event) {FeHandler *h = opaque;bool new_open_state;
@@ -633,7 +633,7 @@ typedef struct {static void -char_socket_event (void *opaque,int event) +char_socket_event (void *opaque,QEMUChrEvent event) {CharSocketTestData *data = opaque; data->event = event;
@@ -1006,7 +1006,7 @@ static void char_socket_client_test(gconstpointer opaque) }static void -count_closed_event (void *opaque,int event) +count_closed_event (void *opaque,QEMUChrEvent event) {int *count = opaque;if (event ==CHR_EVENT_CLOSED ) {
tests/vhost-user-test.c +1 -1
@@ -499,7 +499,7 @@ static TestServer *test_server_new(const gchar *name)return server; } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {TestServer *s = opaque;
Signature · 1 line
2.21.0
Quoted 8 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum.
By using the enum in the IOEventHandler typedef we:
- make the IOEventHandler type more explicit (this handler process out-of-band information, while the IOReadHandler is in-band),
- help static code analyzers.
For the IPMI part:
Quoted 769 lines
This patch was produced with the following spatch script:
@match@
expression backend, opaque, context,set_open; identifierfd_can_read,fd_read,fd_event,be_change; @@
qemu_chr_fe_set_handlers(backend,fd_can_read,fd_read,fd_event,be_change, opaque, context, set_open);@depends on match@ identifier opaque, event; identifier match.fd_event; @@ static -void fd_event(void *opaque, int event) +void fd_event(void *opaque, QEMUChrEvent event) { ... }Then the following files were manually modified:
-
include/chardev/char-fe.h
-include/chardev/char.h
-include/chardev/char-mux.h
-chardev/char.c
-chardev/char-mux.cSigned-off-by Philippe Mathieu-Daudé <[email protected]>---
Cc: "Gonglei (Arei)" <[email protected]>
Cc: "Marc-André Lureau" <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Alex Bennée" <[email protected]>
Cc: "Philippe Mathieu-Daudé" <[email protected]>
Cc: Andrzej Zaborowski <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: Max Reitz <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: Antony Pavlov <[email protected]>
Cc: Igor Mitsyanko <[email protected]>
Cc: Fabien Chouteau <[email protected]>
Cc: KONRAD Frederic <[email protected]>
Cc: Peter Chubb <[email protected]>
Cc: Alberto Garcia <[email protected]>
Cc: Michael Walle <[email protected]>
Cc: Thomas Huth <[email protected]>
Cc: Joel Stanley <[email protected]>
Cc: Cornelia Huck <[email protected]>
Cc: Halil Pasic <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: Laurent Vivier <[email protected]>
Cc: Amit Shah <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Aleksandar Rikalo <[email protected]>
Cc: Aurelien Jarno <[email protected]>
Cc: Aleksandar Markovic <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Sagar Karandikar <[email protected]>
Cc: Bastian Koppelmann <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Samuel Thibault <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Markus Armbruster <[email protected]>
Cc: Zhang Chen <[email protected]>
Cc: Li Zhijian <[email protected]>
Cc: Jason Wang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- include/chardev/char-fe.h | 2 +- include/chardev/char-mux.h | 2 +- include/chardev/char.h | 4 ++-- backends/cryptodev-vhost-user.c | 2 +- chardev/char-mux.c | 8 ++++---- chardev/char.c | 4 ++-- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/vhost-user-blk.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/redirect.c | 2 +- monitor/hmp.c | 2 +- monitor/qmp.c | 2 +- net/filter-mirror.c | 2 +- net/vhost-user.c | 4 ++-- qtest.c | 2 +- tests/test-char.c | 6 +++--- tests/vhost-user-test.c | 2 +- 44 files changed, 52 insertions(+), 52 deletions(-)include/chardev/char-fe.h +1
-1@@ -4,7 +4,7 @@#include "chardev/char.h" #include "qemu/main-loop.h" -typedef void IOEventHandler (void *opaque,int event); +typedef void IOEventHandler (void *opaque,QEMUChrEvent event);typedef int BackendChangeHandler (void *opaque);/* This is the backend as seen by frontend, the actual backend is include/chardev/char-mux.h +1
-1@@ -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 */ include/chardev/char.h +2
-2@@ -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;backends/cryptodev-vhost-user.c +1
-1@@ -152,7 +152,7 @@ cryptodev_vhost_claim_chardev(CryptoDevBackendVhostUser *s,return chr; } -static void cryptodev_vhost_user_event (void *opaque,int event) +static void cryptodev_vhost_user_event (void *opaque,QEMUChrEvent event) {CryptoDevBackendVhostUser *s = opaque;CryptoDevBackend *b =CRYPTODEV_BACKEND (s);chardev/char-mux.c +4
-4@@ -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;@@ -247,7 +247,7 @@ void mux_chr_send_all_event(Chardev *chr, int event) } } -static void mux_chr_event (void *opaque,int event) +static void mux_chr_event (void *opaque,QEMUChrEvent event) {mux_chr_send_all_event (CHARDEV (opaque), event); }chardev/char.c +2
-2@@ -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) {gdbstub.c +1
-1@@ -3171,7 +3171,7 @@ static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size) } } -static void gdb_chr_event (void *opaque,int event) +static void gdb_chr_event (void *opaque,QEMUChrEvent event) {int i;GDBState *s = (GDBState *) opaque;hw/arm/pxa2xx.c +1
-1@@ -1955,7 +1955,7 @@ static void pxa2xx_fir_rx(void *opaque, const uint8_t *buf, int size)pxa2xx_fir_update (s); } -static void pxa2xx_fir_event (void *opaque,int event) +static void pxa2xx_fir_event (void *opaque,QEMUChrEvent event) { }hw/arm/strongarm.c +1
-1@@ -1093,7 +1093,7 @@ static void strongarm_uart_receive(void *opaque, const uint8_t *buf, int size)strongarm_uart_update_int_status (s); } -static void strongarm_uart_event (void *opaque,int event) +static void strongarm_uart_event (void *opaque,QEMUChrEvent event) {StrongARMUARTState *s = opaque;if (event ==CHR_EVENT_BREAK ) {hw/block/vhost-user-blk.c +1
-1@@ -361,7 +361,7 @@ static gboolean vhost_user_blk_watch(GIOChannel *chan, GIOCondition cond,return true; } -static void vhost_user_blk_event (void *opaque,int event) +static void vhost_user_blk_event (void *opaque,QEMUChrEvent event) {DeviceState *dev = opaque;VirtIODevice *vdev =VIRTIO_DEVICE (dev);hw/char/cadence_uart.c +1
-1@@ -348,7 +348,7 @@ static void uart_receive(void *opaque, const uint8_t *buf, int size) } } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) {CadenceUARTState *s = opaque;uint8_t buf ='\0' ;hw/char/digic-uart.c +1
-1@@ -131,7 +131,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, int size) s->reg_rx = *buf; } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }hw/char/escc.c +1
-1@@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)serial_receive_byte (s, buf[0 ]); } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) {ESCCChannelState *s = opaque;if (event ==CHR_EVENT_BREAK )hw/char/etraxfs_ser.c +1
-1@@ -202,7 +202,7 @@ static int serial_can_receive(void *opaque)return sizeof (s->rx_fifo) - s->rx_fifo_len; } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) { }hw/char/exynos4210_uart.c +1
-1@@ -528,7 +528,7 @@ static void exynos4210_uart_receive(void *opaque, const uint8_t *buf, int size) } -static void exynos4210_uart_event (void *opaque,int event) +static void exynos4210_uart_event (void *opaque,QEMUChrEvent event) {Exynos4210UartState *s = (Exynos4210UartState *)opaque;hw/char/grlib_apbuart.c +1
-1@@ -155,7 +155,7 @@ static void grlib_apbuart_receive(void *opaque, const uint8_t *buf, int size) } } -static void grlib_apbuart_event (void *opaque,int event) +static void grlib_apbuart_event (void *opaque,QEMUChrEvent event) {trace_grlib_apbuart_event (event); }hw/char/imx_serial.c +1
-1@@ -323,7 +323,7 @@ static void imx_receive(void *opaque, const uint8_t *buf, int size)imx_put_data (opaque, *buf); } -static void imx_event (void *opaque,int event) +static void imx_event (void *opaque,QEMUChrEvent event) {if (event ==CHR_EVENT_BREAK ) {imx_put_data (opaque,URXD_BRK |URXD_FRMERR |URXD_ERR );hw/char/ipoctal232.c +1
-1@@ -503,7 +503,7 @@ static void hostdev_receive(void *opaque, const uint8_t *buf, int size) } } -static void hostdev_event (void *opaque,int event) +static void hostdev_event (void *opaque,QEMUChrEvent event) {SCC2698Channel *ch = opaque;switch (event) {hw/char/lm32_juart.c +1
-1@@ -104,7 +104,7 @@ static int juart_can_rx(void *opaque)return !(s->jrx &JRX_FULL ); } -static void juart_event (void *opaque,int event) +static void juart_event (void *opaque,QEMUChrEvent event) { }hw/char/lm32_uart.c +1
-1@@ -235,7 +235,7 @@ static int uart_can_rx(void *opaque)return !(s->regs[R_LSR ] &LSR_DR ); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }hw/char/mcf_uart.c +1
-1@@ -256,7 +256,7 @@ static void mcf_uart_push_byte(mcf_uart_state *s, uint8_t data)mcf_uart_update (s); } -static void mcf_uart_event (void *opaque,int event) +static void mcf_uart_event (void *opaque,QEMUChrEvent event) {mcf_uart_state *s = (mcf_uart_state *)opaque;hw/char/milkymist-uart.c +1
-1@@ -180,7 +180,7 @@ static int uart_can_rx(void *opaque)return !(s->regs[R_STAT ] &STAT_RX_EVT ); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }hw/char/nrf51_uart.c +1
-1@@ -245,7 +245,7 @@ static int uart_can_receive(void *opaque)return s->rx_started ? (UART_FIFO_LENGTH - s->rx_fifo_len) :0 ; } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) {NRF51UARTState *s =NRF51_UART (opaque);hw/char/pl011.c +1
-1@@ -280,7 +280,7 @@ static void pl011_receive(void *opaque, const uint8_t *buf, int size)pl011_put_fifo (opaque, *buf); } -static void pl011_event (void *opaque,int event) +static void pl011_event (void *opaque,QEMUChrEvent event) {if (event ==CHR_EVENT_BREAK )pl011_put_fifo (opaque,0x400 );hw/char/serial.c +1
-1@@ -634,7 +634,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size)serial_update_irq (s); } -static void serial_event (void *opaque,int event) +static void serial_event (void *opaque,QEMUChrEvent event) {SerialState *s = opaque;DPRINTF ("event %x\n" , event);hw/char/sh_serial.c +1
-1@@ -358,7 +358,7 @@ static void sh_serial_receive1(void *opaque, const uint8_t *buf, int size) } } -static void sh_serial_event (void *opaque,int event) +static void sh_serial_event (void *opaque,QEMUChrEvent event) {sh_serial_state *s = opaque;if (event ==CHR_EVENT_BREAK )hw/char/terminal3270.c +1
-1@@ -142,7 +142,7 @@ static void terminal_read(void *opaque, const uint8_t *buf, int size) } } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {Terminal3270 *t = opaque;CcwDevice *ccw_dev =CCW_DEVICE (t);hw/char/virtio-console.c +1
-1@@ -145,7 +145,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)virtio_serial_write (port, buf, size); } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {VirtConsole *vcon = opaque;VirtIOSerialPort *port =VIRTIO_SERIAL_PORT (vcon);hw/char/xilinx_uartlite.c +1
-1@@ -206,7 +206,7 @@ static int uart_can_rx(void *opaque)return s->rx_fifo_len <sizeof (s->rx_fifo); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }hw/ipmi/ipmi_bmc_extern.c +1
-1@@ -379,7 +379,7 @@ static void receive(void *opaque, const uint8_t *buf, int size)handle_hw_op (ibe, hw_op); } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {IPMIBmcExtern *ibe = opaque;IPMIInterface *s = ibe->parent.intf;hw/mips/boston.c +1
-1@@ -98,7 +98,7 @@ enum boston_plat_reg { PLAT_SYS_CTL = 0x48, }; -static void boston_lcd_event (void *opaque,int event) +static void boston_lcd_event (void *opaque,QEMUChrEvent event) {BostonState *s = opaque;if (event ==CHR_EVENT_OPENED && !s->lcd_inited) {hw/mips/mips_malta.c +1
-1@@ -545,7 +545,7 @@ static void malta_fpga_reset(void *opaque)snprintf (s->display_text,9 ," " ); } -static void malta_fgpa_display_event (void *opaque,int event) +static void malta_fgpa_display_event (void *opaque,QEMUChrEvent event) {MaltaFPGAState *s = opaque;hw/riscv/riscv_htif.c +1
-1@@ -96,7 +96,7 @@ static void htif_recv(void *opaque, const uint8_t *buf, int size)* Called by the char dev to supply special events to the HTIF console. * Not used for HTIF. */ -static void htif_event (void *opaque,int event) +static void htif_event (void *opaque,QEMUChrEvent event) { }hw/riscv/sifive_uart.c +1
-1@@ -162,7 +162,7 @@ static int uart_can_rx(void *opaque)return s->rx_fifo_len <sizeof (s->rx_fifo); } -static void uart_event (void *opaque,int event) +static void uart_event (void *opaque,QEMUChrEvent event) { }hw/usb/ccid-card-passthru.c +1
-1@@ -307,7 +307,7 @@ static void ccid_card_vscard_read(void *opaque, const uint8_t *buf, int size) } } -static void ccid_card_vscard_event (void *opaque,int event) +static void ccid_card_vscard_event (void *opaque,QEMUChrEvent event) {PassthruState *card = opaque;hw/usb/dev-serial.c +1
-1@@ -461,7 +461,7 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) s->recv_used += size; } -static void usb_serial_event (void *opaque,int event) +static void usb_serial_event (void *opaque,QEMUChrEvent event) {USBSerialState *s = opaque;hw/usb/redirect.c +1
-1@@ -1354,7 +1354,7 @@ static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size)usbredirparser_do_write (dev->parser); } -static void usbredir_chardev_event (void *opaque,int event) +static void usbredir_chardev_event (void *opaque,QEMUChrEvent event) {USBRedirDevice *dev = opaque;monitor/hmp.c +1
-1@@ -1322,7 +1322,7 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size) cur_mon = old_mon; } -static void monitor_event (void *opaque,int event) +static void monitor_event (void *opaque,QEMUChrEvent event) {Monitor *mon = opaque;MonitorHMP *hmp_mon =container_of (mon, MonitorHMP, common);monitor/qmp.c +1
-1@@ -337,7 +337,7 @@ static QDict *qmp_greeting(MonitorQMP *mon) ver, cap_list); } -static void monitor_qmp_event (void *opaque,int event) +static void monitor_qmp_event (void *opaque,QEMUChrEvent event) {QDict *data;MonitorQMP *mon = opaque;net/filter-mirror.c +1
-1@@ -132,7 +132,7 @@ static void redirector_chr_read(void *opaque, const uint8_t *buf, int size) } } -static void redirector_chr_event (void *opaque,int event) +static void redirector_chr_event (void *opaque,QEMUChrEvent event) {NetFilterState *nf = opaque;MirrorState *s =FILTER_REDIRECTOR (nf);net/vhost-user.c +2
-2@@ -218,7 +218,7 @@ static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond,return TRUE; } -static void net_vhost_user_event (void *opaque,int event); +static void net_vhost_user_event (void *opaque,QEMUChrEvent event);static void chr_closed_bh (void *opaque) {@@ -249,7 +249,7 @@ static void chr_closed_bh(void *opaque) } } -static void net_vhost_user_event (void *opaque,int event) +static void net_vhost_user_event (void *opaque,QEMUChrEvent event) {const char *name = opaque;NetClientState *ncs[MAX_QUEUE_NUM ];qtest.c +1
-1@@ -722,7 +722,7 @@ static int qtest_can_read(void *opaque)return 1024 ; } -static void qtest_event (void *opaque,int event) +static void qtest_event (void *opaque,QEMUChrEvent event) {int i;tests/test-char.c +3
-3@@ -54,7 +54,7 @@ static void fe_read(void *opaque, const uint8_t *buf, int size) quit = true; } -static void fe_event (void *opaque,int event) +static void fe_event (void *opaque,QEMUChrEvent event) {FeHandler *h = opaque;bool new_open_state;@@ -633,7 +633,7 @@ typedef struct {static void -char_socket_event (void *opaque,int event) +char_socket_event (void *opaque,QEMUChrEvent event) {CharSocketTestData *data = opaque; data->event = event;@@ -1006,7 +1006,7 @@ static void char_socket_client_test(gconstpointer opaque) }static void -count_closed_event (void *opaque,int event) +count_closed_event (void *opaque,QEMUChrEvent event) {int *count = opaque;if (event ==CHR_EVENT_CLOSED ) {tests/vhost-user-test.c +1
-1@@ -499,7 +499,7 @@ static TestServer *test_server_new(const gchar *name)return server; } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {TestServer *s = opaque;Signature · 1 line
2.21.0
Quoted 29 lines · Philippe Mathieu-Daudé
The Chardev events are listed in the QEMUChrEvent enum.
By using the enum in the IOEventHandler typedef we:
- make the IOEventHandler type more explicit (this handler process out-of-band information, while the IOReadHandler is in-band),
- help static code analyzers.This patch was produced with the following spatch script:
@match@
expression backend, opaque, context,set_open; identifierfd_can_read,fd_read,fd_event,be_change; @@
qemu_chr_fe_set_handlers(backend,fd_can_read,fd_read,fd_event,be_change, opaque, context, set_open);@depends on match@ identifier opaque, event; identifier match.fd_event; @@ static -void fd_event(void *opaque, int event) +void fd_event(void *opaque, QEMUChrEvent event) { ... }
Quoted 7 lines
Then the following files were manually modified:
-
include/chardev/char-fe.h
-include/chardev/char.h
-include/chardev/char-mux.h
-chardev/char.c
-chardev/char-mux.c
My guess is that the only change that must be done at the same time as the spatch is the typedef in char-fe.h.
In particular,
chardev/char-mux.c static void mux_print_help(Chardev *chr) · line 120
Quoted 2 lines
chardev/char-mux.c +1
-1-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)
this doesn't appear to be required -- int will implicitly convert to enum when performing the call, and it can't be related to the typedef.
Yes, we do want to propagate the type up the call stack, but it would be nice to see the spatch results on their own.
r~
Quoted 38 lines · On Wed, 18 Dec 2019 18:20:09 +0100 Philippe Mathieu-Daudé <[email protected]>…
The Chardev events are listed in the QEMUChrEvent enum.
By using the enum in the IOEventHandler typedef we:
- make the IOEventHandler type more explicit (this handler process out-of-band information, while the IOReadHandler is in-band),
- help static code analyzers.This patch was produced with the following spatch script:
@match@
expression backend, opaque, context,set_open; identifierfd_can_read,fd_read,fd_event,be_change; @@
qemu_chr_fe_set_handlers(backend,fd_can_read,fd_read,fd_event,be_change, opaque, context, set_open);@depends on match@ identifier opaque, event; identifier match.fd_event; @@ static -void fd_event(void *opaque, int event) +void fd_event(void *opaque, QEMUChrEvent event) { ... }Then the following files were manually modified:
-
include/chardev/char-fe.h
-include/chardev/char.h
-include/chardev/char-mux.h
-chardev/char.c
-chardev/char-mux.cSigned-off-by Philippe Mathieu-Daudé <[email protected]>
(...)
hw/char/terminal3270.c static void terminal_read(void *opaque, const uint8_t *buf, int size) · line 148
Quoted 13 lines
hw/char/terminal3270.c +1
-1@@ -142,7 +142,7 @@ static void terminal_read(void *opaque, const uint8_t *buf, int size) } } -static void chr_event (void *opaque,int event) +static void chr_event (void *opaque,QEMUChrEvent event) {Terminal3270 *t = opaque;CcwDevice *ccw_dev =CCW_DEVICE (t);
Quoted 25 lines · Philippe Mathieu-Daudé
Hi,
After this chat on #qemu IRC:
13:20 <stsquad> so what is the difference between a IOReadHandler and IOEventHandler? 13:25 <f4bug> stsquad: one is in-band and the other out-of-band?
13:26 <stsquad> f4bug: ahh yes it seems so - connect/disconnect etc... 13:27 <f4bug> see QEMUChrEvent for IOEventHandlerI thought it might be a good opportunity to make the IOEventHandler typedef meaning more obvious, by using the QEMUChrEvent enum.
To be able to build I had to explicit all enums ignored in the switch(event) statement by these frontends.
Then I used a coccinelle spatch to change the various IOEventHandler. I don't think the last patch can be split, but suggestions are welcome!
Regards,
Phil.
v2:
- do blindly ignore all events using a 'default' case.
Quoted 15 lines
Philippe Mathieu-Daudé (14):
hw/ipmi: Remove unnecessary declarations
hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler
ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler
vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler
vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler
vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler
virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler
chardev: Use QEMUChrEvent enum in IOEventHandler typedef
(I guess Paolo will take the series for next PR?)
Quoted 96 lines
include/chardev/char-fe.h | 2 +- include/chardev/char-mux.h | 2 +- include/chardev/char.h | 4 ++-- backends/cryptodev-vhost-user.c | 7 ++++++- chardev/char-mux.c | 8 ++++---- chardev/char.c | 9 +++++++-- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/block/vhost-user-blk.c | 7 ++++++- hw/char/cadence_uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/nrf51_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/terminal3270.c | 7 ++++++- hw/char/virtio-console.c | 7 ++++++- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 12 +++++++----- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 7 ++++++- hw/usb/dev-serial.c | 6 +++++- hw/usb/redirect.c | 7 ++++++- monitor/hmp.c | 6 +++++- monitor/qmp.c | 7 ++++++- net/filter-mirror.c | 2 +- net/vhost-user.c | 9 +++++++-- qtest.c | 2 +- tests/test-char.c | 6 +++--- tests/vhost-user-test.c | 2 +- 44 files changed, 111 insertions(+), 56 deletions(-)Cc "Gonglei (Arei)" <[email protected]>Cc "Marc-André Lureau" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Alex Bennée" <[email protected]>Cc "Philippe Mathieu-Daudé" <[email protected]>Cc Andrzej Zaborowski <[email protected]>Cc Peter Maydell <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Kevin Wolf <[email protected]>Cc Max Reitz <[email protected]>Cc "Edgar E. Iglesias" <[email protected]>Cc Alistair Francis <[email protected]>Cc Antony Pavlov <[email protected]>Cc Igor Mitsyanko <[email protected]>Cc Fabien Chouteau <[email protected]>Cc KONRAD Frederic <[email protected]>Cc Peter Chubb <[email protected]>Cc Alberto Garcia <[email protected]>Cc Michael Walle <[email protected]>Cc Thomas Huth <[email protected]>Cc Joel Stanley <[email protected]>Cc Cornelia Huck <[email protected]>Cc Halil Pasic <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Laurent Vivier <[email protected]>Cc Amit Shah <[email protected]>Cc Corey Minyard <[email protected]>Cc Paul Burton <[email protected]>Cc Aleksandar Rikalo <[email protected]>Cc Aurelien Jarno <[email protected]>Cc Aleksandar Markovic <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Sagar Karandikar <[email protected]>Cc Bastian Koppelmann <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Samuel Thibault <[email protected]>Cc "Dr. David Alan Gilbert" <[email protected]>Cc Markus Armbruster <[email protected]>Cc Zhang Chen <[email protected]>Cc Li Zhijian <[email protected]>Cc Jason Wang <[email protected]>--
2.21.0
Quoted 43 lines · Marc-André Lureau
Quoted 25 lines · Philippe Mathieu-Daudé
Hi,
After this chat on #qemu IRC:
13:20 <stsquad> so what is the difference between a IOReadHandler and IOEventHandler? 13:25 <f4bug> stsquad: one is in-band and the other out-of-band?
13:26 <stsquad> f4bug: ahh yes it seems so - connect/disconnect etc... 13:27 <f4bug> see QEMUChrEvent for IOEventHandlerI thought it might be a good opportunity to make the IOEventHandler typedef meaning more obvious, by using the QEMUChrEvent enum.
To be able to build I had to explicit all enums ignored in the switch(event) statement by these frontends.
Then I used a coccinelle spatch to change the various IOEventHandler. I don't think the last patch can be split, but suggestions are welcome!
Regards,
Phil.
v2:
- do blindly ignore all events using a 'default' case.Quoted 15 lines
Philippe Mathieu-Daudé (14):
hw/ipmi: Remove unnecessary declarations
hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler
ccid-card-passthru: Explicit we ignore QEMUChrEvent in IOEventHandler
vhost-user-crypto: Explicit we ignore some QEMUChrEvent in IOEventHandler
vhost-user-net: Explicit we ignore few QEMUChrEvent in IOEventHandler
vhost-user-blk: Explicit we ignore few QEMUChrEvent in IOEventHandler
virtio-console: Explicit we ignore some QEMUChrEvent in IOEventHandler monitor/qmp: Explicit we ignore few QEMUChrEvent in IOEventHandler monitor/hmp: Explicit we ignore a QEMUChrEvent in IOEventHandler chardev/char: Explicit we ignore some QEMUChrEvent in IOEventHandler
chardev: Use QEMUChrEvent enum in IOEventHandler typedef
Quoted 3 lines
Reviewed-by Marc-André Lureau <[email protected]>(I guess Paolo will take the series for next PR?)
Yes, I'm queuing it. I'll check Richard's remark before sending out the pull request.
Paolo