diff options
| -rw-r--r-- | hw/virtio-console.c | 4 | ||||
| -rw-r--r-- | include/char/char.h | 17 | ||||
| -rw-r--r-- | qemu-char.c | 24 |
3 files changed, 12 insertions, 33 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 2f7c3dfe9e..7c8999042e 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -74,7 +74,7 @@ static void guest_open(VirtIOSerialPort *port) if (!vcon->chr) { return; } - qemu_chr_fe_open(vcon->chr); + qemu_chr_fe_set_open(vcon->chr, 1); } /* Callback function that's called when the guest closes the port */ @@ -85,7 +85,7 @@ static void guest_close(VirtIOSerialPort *port) if (!vcon->chr) { return; } - qemu_chr_fe_close(vcon->chr); + qemu_chr_fe_set_open(vcon->chr, 0); } /* Readiness of the guest to accept data on a port */ diff --git a/include/char/char.h b/include/char/char.h index 3cd2aef77d..a726ddc011 100644 --- a/include/char/char.h +++ b/include/char/char.h @@ -129,21 +129,12 @@ void qemu_chr_delete(CharDriverState *chr); void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo); /** - * @qemu_chr_fe_open: + * @qemu_chr_fe_set_open: * - * Open a character backend. This function call is an indication that the - * front end is ready to begin doing I/O. + * Set character frontend open status. This is an indication that the + * front end is ready (or not) to begin doing I/O. */ -void qemu_chr_fe_open(struct CharDriverState *chr); - -/** - * @qemu_chr_fe_close: - * - * Close a character backend. This function call indicates that the front end - * no longer is able to process I/O. To process I/O again, the front end will - * call @qemu_chr_fe_open. - */ -void qemu_chr_fe_close(struct CharDriverState *chr); +void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open); /** * @qemu_chr_fe_printf: diff --git a/qemu-char.c b/qemu-char.c index 947541a559..29a24628ed 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -238,11 +238,7 @@ void qemu_chr_add_handlers(CharDriverState *s, s->chr_update_read_handler(s); if (!s->explicit_fe_open) { - if (fe_open) { - qemu_chr_fe_open(s); - } else { - qemu_chr_fe_close(s); - } + qemu_chr_fe_set_open(s, fe_open); } /* We're connecting to an already opened device, so let's make sure we @@ -3423,24 +3419,16 @@ void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo) } } -void qemu_chr_fe_open(struct CharDriverState *chr) +void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open) { - if (chr->fe_open) { + if (chr->fe_open == fe_open) { return; } - chr->fe_open = 1; - if (chr->chr_guest_open) { + chr->fe_open = fe_open; + if (fe_open && chr->chr_guest_open) { chr->chr_guest_open(chr); } -} - -void qemu_chr_fe_close(struct CharDriverState *chr) -{ - if (!chr->fe_open) { - return; - } - chr->fe_open = 0; - if (chr->chr_guest_close) { + if (!fe_open && chr->chr_guest_close) { chr->chr_guest_close(chr); } } |