From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm8R5-00023V-Lp for qemu-devel@nongnu.org; Fri, 11 Sep 2009 11:53:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm8R1-0001vl-Qn for qemu-devel@nongnu.org; Fri, 11 Sep 2009 11:53:19 -0400 Received: from [199.232.76.173] (port=54645 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm8R1-0001vU-Kd for qemu-devel@nongnu.org; Fri, 11 Sep 2009 11:53:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62099) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm8R1-00053b-5A for qemu-devel@nongnu.org; Fri, 11 Sep 2009 11:53:15 -0400 From: Amit Shah Date: Fri, 11 Sep 2009 21:22:31 +0530 Message-Id: <1252684353-25067-4-git-send-email-amit.shah@redhat.com> In-Reply-To: <1252684353-25067-3-git-send-email-amit.shah@redhat.com> References: <1252684353-25067-1-git-send-email-amit.shah@redhat.com> <1252684353-25067-2-git-send-email-amit.shah@redhat.com> <1252684353-25067-3-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] virtio-console: Add a in-qemu api for open/read/write/close ports List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah This is a simple-to-use api for opening a port, registering a callback for read, writing to a port and closing it. Signed-off-by: Amit Shah --- hw/virtio-console.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++-- hw/virtio-console.h | 5 ++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 9fa35ec..dce7191 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -52,6 +52,11 @@ struct VirtIOConsolePort { TAILQ_HEAD(, VirtIOConsolePortBuffer) unflushed_buffer_head; + /* Callback that's invoked when we have a buffer that can be consumed + * by an in-qemu user of this port + */ + size_t (*read_callback)(const uint8_t *buf, const size_t len); + bool guest_connected; bool host_connected; }; @@ -150,10 +155,15 @@ static bool has_complete_data(VirtIOConsolePort *port) static size_t flush_buf(VirtIOConsolePort *port, const uint8_t *buf, size_t len) { - if (!port->hd) { - return 0; + int ret; + + ret = 0; + if (port->read_callback) { + ret = port->read_callback(buf, len); + } else if (port->hd) { + ret = qemu_chr_write(port->hd, buf, len); } - return qemu_chr_write(port->hd, buf, len); + return ret; } static void flush_queue(VirtIOConsolePort *port) @@ -431,6 +441,55 @@ static void vcon_event(void *opaque, int event) send_control_event(port, &cpkt); } +/* Functions for use inside qemu to open and read from/write to ports */ +VirtIOConsolePort *virtio_console_open(uint32_t id, + size_t(*read_callback)(const uint8_t*buf, + const size_t len)) +{ + VirtIOConsolePort *port; + struct virtio_console_control cpkt; + + port = get_port_from_id(id); + if (!port) { + return NULL; + } + /* Don't allow opening an already-open port */ + if (port->host_connected) { + return NULL; + } + port->read_callback = read_callback; + + /* Send port open notification to the guest */ + port->host_connected = true; + cpkt.event = VIRTIO_CONSOLE_PORT_OPEN; + cpkt.value = 1; + send_control_event(port, &cpkt); + + return port; +} + +void virtio_console_close(VirtIOConsolePort *port) +{ + struct virtio_console_control cpkt; + + if (!port) + return; + + port->read_callback = NULL; + + cpkt.event = VIRTIO_CONSOLE_PORT_OPEN; + cpkt.value = 0; + send_control_event(port, &cpkt); +} + +size_t virtio_console_write(VirtIOConsolePort *port, uint8_t *buf, size_t size) +{ + if (!port || !port->host_connected) { + return 0; + } + return write_to_port(port, buf, size, false); +} + static void set_port_active(uint32_t *map, uint32_t idx) { int i; diff --git a/hw/virtio-console.h b/hw/virtio-console.h index 9bf6aaf..b06297e 100644 --- a/hw/virtio-console.h +++ b/hw/virtio-console.h @@ -70,5 +70,10 @@ struct virtio_console_header { typedef struct VirtIOConsolePort VirtIOConsolePort; void virtio_console_monitor_command(Monitor *mon, const char *command, const char *param); +VirtIOConsolePort *virtio_console_open(uint32_t id, + size_t(*read_callback)(const uint8_t*buf, + const size_t len)); +void virtio_console_close(VirtIOConsolePort *port); +size_t virtio_console_write(VirtIOConsolePort *port, uint8_t *buf, size_t size); #endif -- 1.6.2.5