starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

chardev: .chr_open(): drop be_opened parameter

Browse Source 
The logic around the parameter is rather tricky. Let's instead
explicitly send CHR_EVENT_OPENED in all backends where needed.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
[ Marc-André - add CHR_EVENT_OPENED in udp_chr_open() ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20260115144606.233252-6-vsementsov@yandex-team.ru>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2026-01-15 17:45:59 +03:00
committed by Marc-André Lureau
parent 0bc5c851f8
commit 0c5d04867a
26 changed files with 80 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
chardev/baum.c
View File

@@ -642,10 +642,7 @@ static void char_braille_finalize(Object *obj)
}
}
static void baum_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void baum_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
BaumChardev *baum = BAUM_CHARDEV(chr);
brlapi_handle_t *handle;
@@ -670,6 +667,8 @@ static void baum_chr_open(Chardev *chr,
* as an integer, but in practice it seems to work
*/
qemu_set_fd_handler(baum->brlapi_fd, baum_chr_read, NULL, baum);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void char_braille_class_init(ObjectClass *oc, const void *data)

5
chardev/char-console.c
View File

@@ -26,12 +26,11 @@
#include "chardev/char-win.h"
#include "qemu/module.h"
static void console_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
static void console_chr_open(Chardev *chr, ChardevBackend *backend,
Error **errp)
{
win_chr_set_file(chr, GetStdHandle(STD_OUTPUT_HANDLE), true);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void char_console_class_init(ObjectClass *oc, const void *data)

7
chardev/char-file.c
View File

@@ -34,10 +34,7 @@
#include "chardev/char-fd.h"
#endif
static void file_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void file_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevFile *file = backend->u.file.data;
#ifdef _WIN32
@@ -100,6 +97,8 @@ static void file_chr_open(Chardev *chr,
return;
}
#endif
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void file_chr_parse(QemuOpts *opts, ChardevBackend *backend,

11
chardev/char-hub.c
View File

@@ -203,10 +203,7 @@ static void hub_chr_update_read_handlers(Chardev *chr)
}
}
static void hub_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void hub_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevHub *hub = backend->u.hub.data;
HubChardev *d = HUB_CHARDEV(chr);
@@ -241,8 +238,10 @@ static void hub_chr_open(Chardev *chr,
list = list->next;
}
/* Closed until an explicit event from backend */
*be_opened = false;
/*
* Closed until an explicit event from backend, so we don't
* send CHR_EVENT_OPENED now.
*/
}
static void hub_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)

19
chardev/char-mux.c
View File

@@ -361,10 +361,7 @@ void mux_set_focus(Chardev *chr, unsigned int focus)
mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
}
static void mux_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void mux_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevMux *mux = backend->u.mux.data;
Chardev *drv;
@@ -377,11 +374,17 @@ static void mux_chr_open(Chardev *chr,
}
d->focus = -1;
/* only default to opened state if we've realized the initial
* set of muxes
if (!qemu_chr_fe_init(&d->chr, drv, errp)) {
return;
}
/*
* Only move to opened state if we've realized
* the initial set of muxes:
*/
*be_opened = muxes_opened;
qemu_chr_fe_init(&d->chr, drv, errp);
if (muxes_opened) {
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
}
static void mux_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)

7
chardev/char-null.c
View File

@@ -26,12 +26,9 @@
#include "chardev/char.h"
#include "qemu/module.h"
static void null_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void null_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
*be_opened = false;
/* do not send CHR_EVENT_OPENED */
}
static void char_null_class_init(ObjectClass *oc, const void *data)

15
chardev/char-parallel.c
View File

@@ -157,10 +157,7 @@ static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg)
return 0;
}
static void parallel_chr_open_fd(Chardev *chr,
int fd,
bool *be_opened,
Error **errp)
static void parallel_chr_open_fd(Chardev *chr, int fd, Error **errp)
{
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
@@ -172,6 +169,7 @@ static void parallel_chr_open_fd(Chardev *chr,
}
drv->mode = IEEE1284_MODE_COMPAT;
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#endif /* __linux__ */
@@ -227,21 +225,16 @@ static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg)
return 0;
}
static void parallel_chr_open_fd(Chardev *chr,
int fd,
bool *be_opened,
Error **errp)
static void parallel_chr_open_fd(Chardev *chr, int fd, Error **errp)
{
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
drv->fd = fd;
*be_opened = false;
}
#endif
#ifdef HAVE_CHARDEV_PARALLEL
static void parallel_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
ChardevHostdev *parallel = backend->u.parallel.data;
@@ -251,7 +244,7 @@ static void parallel_chr_open(Chardev *chr,
if (fd < 0) {
return;
}
parallel_chr_open_fd(chr, fd, be_opened, errp);
parallel_chr_open_fd(chr, fd, errp);
}
static void parallel_chr_parse(QemuOpts *opts, ChardevBackend *backend,

14
chardev/char-pipe.c
View File

@@ -103,10 +103,7 @@ static int win_chr_pipe_init(Chardev *chr, const char *filename,
return -1;
}
static void pipe_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void pipe_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevHostdev *opts = backend->u.pipe.data;
const char *filename = opts->device;
@@ -114,14 +111,13 @@ static void pipe_chr_open(Chardev *chr,
if (win_chr_pipe_init(chr, filename, errp) < 0) {
return;
}
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#else
static void pipe_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void pipe_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevHostdev *opts = backend->u.pipe.data;
int fd_in, fd_out;
@@ -158,6 +154,8 @@ static void pipe_chr_open(Chardev *chr,
}
return;
}
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#endif /* !_WIN32 */

6
chardev/char-pty.c
View File

@@ -331,10 +331,7 @@ static int qemu_openpty_raw(int *aslave, char *pty_name)
return amaster;
}
static void pty_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void pty_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
PtyChardev *s;
int master_fd, slave_fd;
@@ -364,7 +361,6 @@ static void pty_chr_open(Chardev *chr,
qio_channel_set_name(s->ioc, name);
g_free(name);
s->timer_src = NULL;
*be_opened = false;
/* create symbolic link */
if (path) {

3
chardev/char-ringbuf.c
View File

@@ -94,7 +94,6 @@ static void char_ringbuf_finalize(Object *obj)
static void ringbuf_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
ChardevRingbuf *opts = backend->u.ringbuf.data;
@@ -111,6 +110,8 @@ static void ringbuf_chr_open(Chardev *chr,
d->prod = 0;
d->cons = 0;
d->cbuf = g_malloc0(d->size);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
void qmp_ringbuf_write(const char *device, const char *data,

18
chardev/char-serial.c
View File

@@ -41,14 +41,15 @@
#ifdef _WIN32
static void serial_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void serial_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevHostdev *serial = backend->u.serial.data;
int ret = win_chr_serial_init(chr, serial->device, errp);
if (ret < 0) {
return;
}
win_chr_serial_init(chr, serial->device, errp);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#elif defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
@@ -258,10 +259,7 @@ static int serial_chr_ioctl(Chardev *chr, int cmd, void *arg)
return 0;
}
static void serial_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void serial_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevHostdev *serial = backend->u.serial.data;
int fd;
@@ -281,6 +279,8 @@ static void serial_chr_open(Chardev *chr,
close(fd);
return;
}
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#endif /* __linux__ || __sun__ */

10
chardev/char-socket.c
View File

@@ -1365,10 +1365,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,
}
static void tcp_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void tcp_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
SocketChardev *s = SOCKET_CHARDEV(chr);
ChardevSocket *sock = backend->u.socket.data;
@@ -1439,9 +1436,6 @@ static void tcp_chr_open(Chardev *chr,
}
s->registered_yank = true;
/* be isn't opened until we get a connection */
*be_opened = false;
update_disconnected_filename(s);
if (s->is_listen) {
@@ -1454,6 +1448,8 @@ static void tcp_chr_open(Chardev *chr,
return;
}
}
/* be isn't opened until we get a connection */
}
static void tcp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)

7
chardev/char-stdio.c
View File

@@ -85,10 +85,7 @@ static void term_stdio_handler(int sig)
stdio_chr_set_echo(NULL, stdio_echo_state);
}
static void stdio_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void stdio_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevStdio *opts = backend->u.stdio.data;
struct sigaction act;
@@ -123,6 +120,8 @@ static void stdio_chr_open(Chardev *chr,
stdio_allow_signal = !opts->has_signal || opts->signal;
stdio_chr_set_echo(chr, false);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
#endif

6
chardev/char-udp.c
View File

@@ -188,10 +188,7 @@ static void udp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)
}
}
static void upd_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
static void upd_chr_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevUdp *udp = backend->u.udp.data;
SocketAddress *local_addr = socket_address_flatten(udp->local);
@@ -214,6 +211,7 @@ static void upd_chr_open(Chardev *chr,
g_free(name);
s->ioc = QIO_CHANNEL(sioc);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void char_udp_class_init(ObjectClass *oc, const void *data)

2
chardev/char-win-stdio.c
View File

@@ -144,7 +144,6 @@ static void win_stiod_chr_set_echo(Chardev *chr, bool echo)
static void win_stdio_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
ChardevStdio *opts = backend->u.stdio.data;
@@ -208,6 +207,7 @@ static void win_stdio_chr_open(Chardev *chr,
win_stiod_chr_set_echo(chr, false);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
return;
err3:

11
chardev/char.c
View File

@@ -246,8 +246,7 @@ int qemu_chr_add_client(Chardev *s, int fd)
CHARDEV_GET_CLASS(s)->chr_add_client(s, fd) : -1;
}
static void qemu_char_open(Chardev *chr, ChardevBackend *backend,
bool *be_opened, Error **errp)
static void qemu_char_open(Chardev *chr, ChardevBackend *backend, Error **errp)
{
ChardevClass *cc = CHARDEV_GET_CLASS(chr);
/* Any ChardevCommon member would work */
@@ -268,7 +267,7 @@ static void qemu_char_open(Chardev *chr, ChardevBackend *backend,
}
if (cc->chr_open) {
cc->chr_open(chr, backend, be_opened, errp);
cc->chr_open(chr, backend, errp);
}
}
@@ -1009,7 +1008,6 @@ static Chardev *chardev_new(const char *id, const char *typename,
Object *obj;
Chardev *chr = NULL;
Error *local_err = NULL;
bool be_opened = true;
assert(g_str_has_prefix(typename, "chardev-"));
assert(id);
@@ -1020,7 +1018,7 @@ static Chardev *chardev_new(const char *id, const char *typename,
chr->label = g_strdup(id);
chr->gcontext = gcontext;
qemu_char_open(chr, backend, &be_opened, &local_err);
qemu_char_open(chr, backend, &local_err);
if (local_err) {
error_propagate(errp, local_err);
object_unref(obj);
@@ -1030,9 +1028,6 @@ static Chardev *chardev_new(const char *id, const char *typename,
if (!chr->filename) {
chr->filename = g_strdup(typename + 8);
}
if (be_opened) {
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
return chr;
}

4
chardev/msmouse.c
View File

@@ -255,16 +255,16 @@ static void char_msmouse_finalize(Object *obj)
static void msmouse_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
MouseChardev *mouse = MOUSE_CHARDEV(chr);
*be_opened = false;
mouse->hs = qemu_input_handler_register((DeviceState *)mouse,
&msmouse_handler);
mouse->tiocm = 0;
fifo8_create(&mouse->outbuf, MSMOUSE_BUF_SZ);
/* Never send CHR_EVENT_OPENED */
}
static void char_msmouse_class_init(ObjectClass *oc, const void *data)

10
chardev/spice.c
View File

@@ -251,9 +251,7 @@ static void chr_open(Chardev *chr, const char *subtype)
s->sin.subtype = g_strdup(subtype);
}
static void spice_vmc_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
static void spice_vmc_chr_open(Chardev *chr, ChardevBackend *backend,
Error **errp)
{
ChardevSpiceChannel *spicevmc = backend->u.spicevmc.data;
@@ -277,13 +275,10 @@ static void spice_vmc_chr_open(Chardev *chr,
return;
}
*be_opened = false;
chr_open(chr, type);
}
static void spice_port_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
static void spice_port_chr_open(Chardev *chr, ChardevBackend *backend,
Error **errp)
{
ChardevSpicePort *spiceport = backend->u.spiceport.data;
@@ -302,7 +297,6 @@ static void spice_port_chr_open(Chardev *chr,
chr_open(chr, "port");
*be_opened = false;
s = SPICE_CHARDEV(chr);
s->sin.portname = g_strdup(name);

5
chardev/wctablet.c
View File

@@ -326,13 +326,10 @@ static void wctablet_chr_finalize(Object *obj)
static void wctablet_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
TabletChardev *tablet = WCTABLET_CHARDEV(chr);
*be_opened = true;
/* init state machine */
memcpy(tablet->outbuf, WC_FULL_CONFIG_STRING, WC_FULL_CONFIG_STRING_LENGTH);
tablet->outlen = WC_FULL_CONFIG_STRING_LENGTH;
@@ -340,6 +337,8 @@ static void wctablet_chr_open(Chardev *chr,
tablet->hs = qemu_input_handler_register((DeviceState *)tablet,
&wctablet_handler);
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
static void wctablet_chr_class_init(ObjectClass *oc, const void *data)