@@ -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 */
@@ -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:
@@ -211,11 +211,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
@@ -3396,24 +3392,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);
}
}
Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- hw/virtio-console.c | 4 ++-- include/char/char.h | 17 ++++------------- qemu-char.c | 24 ++++++------------------ 3 files changed, 12 insertions(+), 33 deletions(-)