From: Szymon Lukasz <noh4hss@gmail.com>
To: qemu-devel@nongnu.org
Cc: lvivier@redhat.com, amit@kernel.org, mst@redhat.com,
Szymon Lukasz <noh4hss@gmail.com>,
marcandre.lureau@redhat.com, pbonzini@redhat.com
Subject: [PATCH 6/6] virtio-console: notify the guest about terminal resizes
Date: Sun, 21 Jun 2020 18:21:32 +0200 [thread overview]
Message-ID: <20200621162132.62797-7-noh4hss@gmail.com> (raw)
In-Reply-To: <20200621162132.62797-1-noh4hss@gmail.com>
If a virtio serial port is a console port forward terminal resize
messages from the chardev backend to the guest.
Signed-off-by: Szymon Lukasz <noh4hss@gmail.com>
---
hw/char/virtio-console.c | 64 +++++++++++++++++++++++++++++++++++++---
1 file changed, 60 insertions(+), 4 deletions(-)
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 97b9240ef5..1ea06aad08 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -29,6 +29,7 @@ typedef struct VirtConsole {
CharBackend chr;
guint watch;
+ uint16_t cols, rows;
} VirtConsole;
/*
@@ -104,6 +105,36 @@ static ssize_t flush_buf(VirtIOSerialPort *port,
return ret;
}
+static void virtconsole_send_resize(VirtIOSerialPort *port)
+{
+ uint16_t cols, rows;
+ VirtConsole *vcon = VIRTIO_CONSOLE(port);
+
+ /*
+ * We probably shouldn't send these messages before
+ * we told the guest it is a console port (which we do
+ * by sending VIRTIO_CONSOLE_CONSOLE_PORT message).
+ * Instead of adding a new field to the device state
+ * lets just use the guest_connected field for that purpose
+ * since the guest should not care about the terminal size
+ * before opening the port.
+ */
+ if (!port->guest_connected) {
+ return;
+ }
+
+ if (qemu_chr_fe_get_winsize(&vcon->chr, &cols, &rows) < 0) {
+ cols = 0;
+ rows = 0;
+ }
+
+ if (cols != vcon->cols || rows != vcon->rows) {
+ vcon->cols = cols;
+ vcon->rows = rows;
+ virtio_serial_send_console_resize(port, cols, rows);
+ }
+}
+
/* Callback function that's called when the guest opens/closes the port */
static void set_guest_connected(VirtIOSerialPort *port, int guest_connected)
{
@@ -111,7 +142,9 @@ static void set_guest_connected(VirtIOSerialPort *port, int guest_connected)
DeviceState *dev = DEVICE(port);
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
- if (!k->is_console) {
+ if (k->is_console) {
+ virtconsole_send_resize(port);
+ } else {
qemu_chr_fe_set_open(&vcon->chr, guest_connected);
}
@@ -171,6 +204,22 @@ static void chr_event(void *opaque, QEMUChrEvent event)
}
}
+static void chr_event_console(void *opaque, QEMUChrEvent event)
+{
+ VirtConsole *vcon = opaque;
+ VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon);
+
+ switch (event) {
+ case CHR_EVENT_OPENED:
+ case CHR_EVENT_RESIZE:
+ trace_virtio_console_chr_event(port->id, event);
+ virtconsole_send_resize(port);
+ break;
+ default:
+ break;
+ }
+}
+
static int chr_be_change(void *opaque)
{
VirtConsole *vcon = opaque;
@@ -179,7 +228,9 @@ static int chr_be_change(void *opaque)
if (k->is_console) {
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
- NULL, chr_be_change, vcon, NULL, true);
+ chr_event_console, chr_be_change,
+ vcon, NULL, true);
+ virtconsole_send_resize(port);
} else {
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
chr_event, chr_be_change, vcon, NULL, false);
@@ -207,7 +258,7 @@ static void virtconsole_enable_backend(VirtIOSerialPort *port, bool enable)
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
- k->is_console ? NULL : chr_event,
+ k->is_console ? chr_event_console : chr_event,
chr_be_change, vcon, NULL, false);
} else {
qemu_chr_fe_set_handlers(&vcon->chr, NULL, NULL, NULL,
@@ -227,6 +278,11 @@ static void virtconsole_realize(DeviceState *dev, Error **errp)
return;
}
+ if (k->is_console) {
+ vcon->cols = (uint16_t) -1;
+ vcon->rows = (uint16_t) -1;
+ }
+
if (qemu_chr_fe_backend_connected(&vcon->chr)) {
/*
* For consoles we don't block guest data transfer just
@@ -239,7 +295,7 @@ static void virtconsole_realize(DeviceState *dev, Error **errp)
*/
if (k->is_console) {
qemu_chr_fe_set_handlers(&vcon->chr, chr_can_read, chr_read,
- NULL, chr_be_change,
+ chr_event_console, chr_be_change,
vcon, NULL, true);
virtio_serial_open(port);
} else {
--
2.27.0
prev parent reply other threads:[~2020-06-21 16:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-21 16:21 [PATCH 0/6] virtio-console: notify about the terminal size Szymon Lukasz
2020-06-21 16:21 ` [PATCH 1/6] main-loop: change the handling of SIGWINCH Szymon Lukasz
2020-06-21 16:21 ` [PATCH 2/6] chardev: add support for retrieving the terminal size Szymon Lukasz
2020-06-21 16:21 ` [PATCH 3/6] chardev: add support for notifying about terminal resizes Szymon Lukasz
2020-06-21 16:21 ` [PATCH 4/6] char-stdio: add support for the terminal size Szymon Lukasz
2020-06-21 16:21 ` [PATCH 5/6] virtio-serial-bus: add terminal resize messages Szymon Lukasz
2020-06-22 4:14 ` Michael S. Tsirkin
2020-06-21 16:21 ` Szymon Lukasz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200621162132.62797-7-noh4hss@gmail.com \
--to=noh4hss@gmail.com \
--cc=amit@kernel.org \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).