[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] virtio-serial: Consolidate guest_open/guest_c
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 09/11] virtio-serial: Consolidate guest_open/guest_close into set_guest_connected |
Date: |
Tue, 26 Mar 2013 11:08:01 +0100 |
Signed-off-by: Hans de Goede <address@hidden>
---
hw/virtio-console.c | 23 +++++------------------
hw/virtio-serial-bus.c | 15 +++++----------
hw/virtio-serial.h | 6 ++----
3 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 7c89990..284180f 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -66,26 +66,15 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const
uint8_t *buf, size_t len)
return ret;
}
-/* Callback function that's called when the guest opens the port */
-static void guest_open(VirtIOSerialPort *port)
+/* Callback function that's called when the guest opens/closes the port */
+static void set_guest_connected(VirtIOSerialPort *port, int guest_connected)
{
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
if (!vcon->chr) {
return;
}
- qemu_chr_fe_set_open(vcon->chr, 1);
-}
-
-/* Callback function that's called when the guest closes the port */
-static void guest_close(VirtIOSerialPort *port)
-{
- VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
-
- if (!vcon->chr) {
- return;
- }
- qemu_chr_fe_set_open(vcon->chr, 0);
+ qemu_chr_fe_set_open(vcon->chr, guest_connected);
}
/* Readiness of the guest to accept data on a port */
@@ -152,8 +141,7 @@ static void virtconsole_class_init(ObjectClass *klass, void
*data)
k->is_console = true;
k->init = virtconsole_initfn;
k->have_data = flush_buf;
- k->guest_open = guest_open;
- k->guest_close = guest_close;
+ k->set_guest_connected = set_guest_connected;
dc->props = virtconsole_properties;
}
@@ -176,8 +164,7 @@ static void virtserialport_class_init(ObjectClass *klass,
void *data)
k->init = virtconsole_initfn;
k->have_data = flush_buf;
- k->guest_open = guest_open;
- k->guest_close = guest_close;
+ k->set_guest_connected = set_guest_connected;
dc->props = virtserialport_properties;
}
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index ab7168e..eb7af21 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -372,14 +372,9 @@ static void handle_control_message(VirtIOSerial *vser,
void *buf, size_t len)
case VIRTIO_CONSOLE_PORT_OPEN:
port->guest_connected = cpkt.value;
- if (cpkt.value && vsc->guest_open) {
+ if (vsc->set_guest_connected) {
/* Send the guest opened notification if an app is interested */
- vsc->guest_open(port);
- }
-
- if (!cpkt.value && vsc->guest_close) {
- /* Send the guest closed notification if an app is interested */
- vsc->guest_close(port);
+ vsc->set_guest_connected(port, cpkt.value);
}
break;
}
@@ -484,9 +479,9 @@ static void guest_reset(VirtIOSerial *vser)
vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port);
if (port->guest_connected) {
port->guest_connected = false;
-
- if (vsc->guest_close)
- vsc->guest_close(port);
+ if (vsc->set_guest_connected) {
+ vsc->set_guest_connected(port, false);
+ }
}
}
}
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index 484dcfe..516400f 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -92,10 +92,8 @@ typedef struct VirtIOSerialPortClass {
int (*exit)(VirtIOSerialPort *port);
/* Callbacks for guest events */
- /* Guest opened device. */
- void (*guest_open)(VirtIOSerialPort *port);
- /* Guest closed device. */
- void (*guest_close)(VirtIOSerialPort *port);
+ /* Guest opened/closed device. */
+ void (*set_guest_connected)(VirtIOSerialPort *port, int guest_connected);
/* Guest is now ready to accept data (virtqueues set up). */
void (*guest_ready)(VirtIOSerialPort *port);
--
1.8.1.4
- [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, (continued)
- [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Hans de Goede, 2013/03/26
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Paolo Bonzini, 2013/03/26
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Hans de Goede, 2013/03/26
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Paolo Bonzini, 2013/03/26
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Hans de Goede, 2013/03/27
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Paolo Bonzini, 2013/03/27
- Re: [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Hans de Goede, 2013/03/27
[Qemu-devel] [PATCH 06/11] qemu-char: Consolidate guest_close/guest_open into a set_fe_open callback, Hans de Goede, 2013/03/26
[Qemu-devel] [PATCH 08/11] qemu-char: add_handlers: Don't re-send the be_open event on unregister, Hans de Goede, 2013/03/26
[Qemu-devel] [PATCH 10/11] virtio-serial: propagate guest_connected to the port on post_load, Hans de Goede, 2013/03/26
[Qemu-devel] [PATCH 09/11] virtio-serial: Consolidate guest_open/guest_close into set_guest_connected,
Hans de Goede <=
[Qemu-devel] [PATCH 11/11] spice-qemu-char: Drop hackish vmc_register on spice_chr_write, Hans de Goede, 2013/03/26
Re: [Qemu-devel] [PATCH 0/11] chardev frontend open handling cleanup v2, Eric Blake, 2013/03/26
Re: [Qemu-devel] [PATCH 0/11] chardev frontend open handling cleanup v2, Anthony Liguori, 2013/03/27