virtio-console: notify about the terminal size
v3 cover virtio-console: notify about the terminal size
The goal of this series is to have a resizable terminal into a guest without having to set up networking and using, e.g. ssh.
The virtio spec allows a virtio-console device to notify the guest about terminal resizes in the host. Linux Kernel implements the driver part of the spec. This series implement the device part in QEMU.
This series adds support for a resizable terminal if a virtio console device is connected to the stdio backend.
This series also introduces resize messages that can be sent over QMP to notify QEMU about the size of the terminal connented to some chardev. In the libvirt setting, it will allow to implement a resizable terminal for virsh console and other libvirt clients.
v3:
add resize messages over QMP, as suggested by Daniel
v2:
fix adding a new virtio feature bit to the virtio console device
Szymon Lukasz (9):
chardev: add cols, rows fields
chardev: add CHR_EVENT_RESIZE
chardev: add qemu_chr_resize()
char-mux: add support for the terminal size
main-loop: change the handling of SIGWINCH
char-stdio: add support for the terminal size
qmp: add chardev-resize command
virtio-serial-bus: add terminal resize messages
virtio-console: notify the guest about terminal resizes
backends/cryptodev-vhost-user.c | 1 + chardev/char-fe.c | 13 +++++++ chardev/char-mux.c | 18 ++++++++- chardev/char-stdio.c | 29 ++++++++++++++ chardev/char.c | 26 +++++++++++++ hw/block/vhost-user-blk.c | 1 + hw/char/terminal3270.c | 1 + hw/char/trace-events | 1 + hw/char/virtio-console.c | 63 +++++++++++++++++++++++++++++-- hw/char/virtio-serial-bus.c | 42 ++++++++++++++++++++- hw/core/machine.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/redirect.c | 1 + include/chardev/char-fe.h | 10 +++++ include/chardev/char.h | 7 ++++ include/hw/virtio/virtio-serial.h | 5 +++ include/qemu/main-loop.h | 4 ++ monitor/hmp.c | 1 + monitor/qmp.c | 1 + net/vhost-user.c | 1 + qapi/char.json | 25 ++++++++++++ ui/curses.c | 11 +++--- util/main-loop.c | 21 +++++++++++ 25 files changed, 274 insertions(+), 12 deletions(-)
Signature · 1 line
2.27.0
PATCH v3 1/9 chardev: add cols, rows fields
These fields should be interpreted as the size of the terminal connected to a given chardev.
--- chardev/char-fe.c | 13 +++++++++++++ include/chardev/char-fe.h | 10 ++++++++++ include/chardev/char.h | 1 + 3 files changed, 24 insertions(+)
chardev/char-fe.c +13 -0
@@ -336,6 +336,19 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo) } } +void qemu_chr_fe_get_winsize (CharBackend *be,uint16_t *cols,uint16_t *rows) +{ +Chardev *chr = be->chr; + +if (chr) { + *cols = chr->cols; + *rows = chr->rows; + }else { + *cols =0 ; + *rows =0 ; + } +} +void qemu_chr_fe_set_open (CharBackend *be,int fe_open) {Chardev *chr = be->chr;
include/chardev/char-fe.h +10 -0
@@ -154,6 +154,16 @@ int qemu_chr_fe_wait_connected(CharBackend *be, Error **errp);*/ void qemu_chr_fe_set_echo (CharBackend *be,bool echo); +/** +* qemu_chr_fe_get_winsize: +* @cols: the address for storing columns +* @rows: the address for storing rows +* +* Get the size of the terminal connected to the chardev backend. +* Returns *cols = *rows = 0, if no associated Chardev. +*/ +void qemu_chr_fe_get_winsize (CharBackend *be,uint16_t *cols,uint16_t *rows); +/** * qemu_chr_fe_set_open: *
include/chardev/char.h +1 -0
@@ -65,6 +65,7 @@ struct Chardev {char *filename;int logfd;int be_open; +uint16_t cols, rows;GSource *gsource;GMainContext *gcontext;DECLARE_BITMAP (features,QEMU_CHAR_FEATURE_LAST );
Signature · 1 line
2.27.0
PATCH v3 2/9 chardev: add CHR_EVENT_RESIZE
In reply to Szymon LukaszAdd a new chardev event, CHR_EVENT_RESIZE, which a backend should trigger if detects the size of the connected terminal changed.
--- backends/cryptodev-vhost-user.c | 1 + chardev/char.c | 1 + hw/block/vhost-user-blk.c | 1 + hw/char/terminal3270.c | 1 + hw/char/virtio-console.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/redirect.c | 1 + include/chardev/char.h | 4 ++++ monitor/hmp.c | 1 + monitor/qmp.c | 1 + net/vhost-user.c | 1 + 13 files changed, 16 insertions(+)
backends/cryptodev-vhost-user.c +1 -0
@@ -174,6 +174,7 @@ static void cryptodev_vhost_user_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
chardev/char.c +1 -0
@@ -74,6 +74,7 @@ void qemu_chr_be_event(Chardev *s, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/block/vhost-user-blk.c +1 -0
@@ -403,6 +403,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/char/terminal3270.c +1 -0
@@ -169,6 +169,7 @@ static void chr_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/char/virtio-console.c +1 -0
@@ -165,6 +165,7 @@ static void chr_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/ipmi/ipmi_bmc_extern.c +1 -0
@@ -439,6 +439,7 @@ static void chr_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/usb/ccid-card-passthru.c +1 -0
@@ -321,6 +321,7 @@ static void ccid_card_vscard_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT :case CHR_EVENT_CLOSED : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/usb/dev-serial.c +1 -0
@@ -507,6 +507,7 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event)break ;case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
hw/usb/redirect.c +1 -0
@@ -1383,6 +1383,7 @@ static void usbredir_chardev_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
include/chardev/char.h +4 -0
@@ -22,6 +22,10 @@ typedef enum {CHR_EVENT_OPENED ,/* new connection established */ CHR_EVENT_MUX_IN ,/* mux-focus was set to this terminal */ CHR_EVENT_MUX_OUT ,/* mux-focus will move on */ +CHR_EVENT_RESIZE ,/* +* the size of the terminal connected to +* the chardev changed +*/ CHR_EVENT_CLOSED /* connection closed. NOTE: currently this event * is only bound to the read port of the chardev. * Normally the read port and write port of a
monitor/hmp.c +1 -0
@@ -1373,6 +1373,7 @@ static void monitor_event(void *opaque, QEMUChrEvent event)break ;case CHR_EVENT_BREAK : +case CHR_EVENT_RESIZE :/* Ignored */ break ; }
monitor/qmp.c +1 -0
@@ -371,6 +371,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
net/vhost-user.c +1 -0
@@ -297,6 +297,7 @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :case CHR_EVENT_MUX_OUT : +case CHR_EVENT_RESIZE :/* Ignore */ break ; }
Signature · 1 line
2.27.0
PATCH v3 3/9 chardev: add qemu_chr_resize()
In reply to Szymon LukaszThis function should be called whenever we learn about a new size of the terminal connected to a chardev.
--- chardev/char.c | 11 +++++++++++ include/chardev/char.h | 2 ++ 2 files changed, 13 insertions(+)
chardev/char.c +11 -0
@@ -354,6 +354,17 @@ int qemu_chr_wait_connected(Chardev *chr, Error **errp)return 0 ; } +void qemu_chr_resize (Chardev *chr,uint16_t cols,uint16_t rows) +{ +if (cols != chr->cols || rows != chr->rows) { + chr->cols = cols; + chr->rows = rows; +if (chr->be_open) { +qemu_chr_be_event (chr,CHR_EVENT_RESIZE ); + } + } +} +QemuOpts *qemu_chr_parse_compat (const char *label,const char *filename,bool permit_mux_mon) {
include/chardev/char.h +2 -0
@@ -230,6 +230,8 @@ int qemu_chr_write(Chardev *s, const uint8_t *buf, int len, bool write_all);#define qemu_chr_write_all (s, buf, len) qemu_chr_write(s, buf, len, true)int qemu_chr_wait_connected (Chardev *chr,Error **errp); +void qemu_chr_resize (Chardev *chr,uint16_t cols,uint16_t rows); +#define TYPE_CHARDEV "chardev"#define CHARDEV (obj) OBJECT_CHECK(Chardev, (obj), TYPE_CHARDEV)#define CHARDEV_CLASS (klass) \
Signature · 1 line
2.27.0
PATCH v3 4/9 char-mux: add support for the terminal size
In reply to Szymon LukaszThe terminal size of a mux chardev should be the same as the real chardev, so listen for CHR_EVENT_RESIZE to be up to date.
We forward CHR_EVENT_RESIZE only to the focused frontend. This means frontends should probably update their view of the terminal size on receiving CHR_EVENT_MUX_IN.
--- chardev/char-mux.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
chardev/char-mux.c +17 -1
@@ -247,9 +247,24 @@ void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event) } } +static void mux_update_winsize (Chardev *chr) +{ +MuxChardev *d =MUX_CHARDEV (chr); +uint16_t cols, rows; + +qemu_chr_fe_get_winsize (&d->chr, &cols, &rows); +qemu_chr_resize (chr, cols, rows); +} +static void mux_chr_event (void *opaque,QEMUChrEvent event) { -mux_chr_send_all_event (CHARDEV (opaque), event); +Chardev *chr =CHARDEV (opaque); + +if (event ==CHR_EVENT_RESIZE ) { +mux_update_winsize (chr); + }else { +mux_chr_send_all_event (chr, event); + } }static GSource *mux_chr_add_watch (Chardev *s,GIOCondition cond)
@@ -330,6 +345,7 @@ static void qemu_chr_open_mux(Chardev *chr,*/ *be_opened = machine_init_done;qemu_chr_fe_init (&d->chr, drv, errp); +mux_update_winsize (chr); } static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend,
Signature · 1 line
2.27.0
PATCH v3 5/9 main-loop: change the handling of SIGWINCH
In reply to Szymon LukaszBlock SIGWINCH, so it is delivered only via signalfd. Install a handler that uses NotifierList to tell interested parties about SIGWINCH delivery.
--- include/qemu/main-loop.h | 4 ++++ ui/curses.c | 11 ++++++----- util/main-loop.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-)
include/qemu/main-loop.h +4 -0
@@ -325,4 +325,8 @@ typedef struct MainLoopPoll {void main_loop_poll_add_notifier (Notifier *notify);void main_loop_poll_remove_notifier (Notifier *notify); +#ifndef _WIN32 +void sigwinch_add_notifier (Notifier *n); +#endif +#endif
ui/curses.c +6 -5
@@ -34,6 +34,7 @@#include <iconv.h> #include "qapi/error.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "ui/console.h" #include "ui/input.h"
@@ -146,7 +147,7 @@ static void curses_resize(DisplayChangeListener *dcl, } #if !defined(_WIN32) && defined(SIGWINCH) && defined(KEY_RESIZE) -static volatile sig_atomic_t got_sigwinch; +static bool got_sigwinch; static void curses_winch_check(void) { struct winsize {
@@ -169,17 +170,17 @@ static void curses_winch_check(void) invalidate = 1; } -static void curses_winch_handler (int signum) +static void curses_winch_handler (Notifier *n,void *data) { got_sigwinch = true; }static void curses_winch_init (void ) { -struct sigaction old, winch = { - .sa_handler = curses_winch_handler, +static Notifier n = { + .notify = curses_winch_handler }; -sigaction (SIGWINCH , &winch, &old); +sigwinch_add_notifier (&n); }#else static void curses_winch_check (void ) {}
util/main-loop.c +21 -0
@@ -90,6 +90,7 @@ static int qemu_signal_init(Error **errp)sigaddset (&set,SIGIO );sigaddset (&set,SIGALRM );sigaddset (&set,SIGBUS ); +sigaddset (&set,SIGWINCH );/* SIGINT cannot be handled via signalfd, so that ^C can be used * to interrupt QEMU when it is being run under gdb. SIGHUP and * SIGTERM are also handled asynchronously, even though it is not
@@ -111,6 +112,26 @@ static int qemu_signal_init(Error **errp) return 0; } +static NotifierList sigwinch_notifiers = +NOTIFIER_LIST_INITIALIZER (sigwinch_notifiers); + +static void sigwinch_handler (int signum) +{ +notifier_list_notify (&sigwinch_notifiers,NULL ); +} + +void sigwinch_add_notifier (Notifier *n) +{ +if (notifier_list_empty (&sigwinch_notifiers)) { +struct sigaction action = { + .sa_handler = sigwinch_handler, + }; +sigaction (SIGWINCH , &action,NULL ); + } + +notifier_list_add (&sigwinch_notifiers, n); +} +#else /* _WIN32 */ static int qemu_signal_init (Error **errp)
Signature · 1 line
2.27.0
PATCH v3 6/9 char-stdio: add support for the terminal size
In reply to Szymon LukaszUpdate the terminal size upon SIGWINCH delivery.
--- chardev/char-stdio.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
chardev/char-stdio.c +29 -0
@@ -34,7 +34,9 @@#include "chardev/char-win-stdio.h" #else #include <termios.h> +#include <sys/ioctl.h> #include "chardev/char-fd.h" +#include "qemu/main-loop.h" #endif #ifndef _WIN32
@@ -45,6 +47,13 @@ static bool stdio_in_use;static bool stdio_allow_signal;static bool stdio_echo_state; +typedef struct { +FDChardev parent; +Notifier resize_notifier; +}StdioChardev ; + +#define STDIO_CHARDEV (obj) OBJECT_CHECK(StdioChardev, (obj), TYPE_CHARDEV_STDIO) +static void term_exit (void ) {if (stdio_in_use) {
@@ -82,11 +91,26 @@ static void term_stdio_handler(int sig)qemu_chr_set_echo_stdio (NULL , stdio_echo_state); } +static void qemu_chr_resize_stdio (Chardev *chr) +{ +struct winsize ws; +if (ioctl (1 ,TIOCGWINSZ , &ws) !=-1 ) { +qemu_chr_resize (chr, ws.ws_col, ws.ws_row); + } +} + +static void term_resize_notify (Notifier *n,void *data) +{ +StdioChardev *s =container_of (n, StdioChardev, resize_notifier); +qemu_chr_resize_stdio (CHARDEV (s)); +} +static void qemu_chr_open_stdio (Chardev *chr,ChardevBackend *backend,bool *be_opened,Error **errp) { +StdioChardev *s =STDIO_CHARDEV (chr);ChardevStdio *opts = backend->u.stdio.data;struct sigaction act;
@@ -116,6 +140,10 @@ static void qemu_chr_open_stdio(Chardev *chr, stdio_allow_signal = opts->signal; }qemu_chr_set_echo_stdio (chr, false); + +qemu_chr_resize_stdio (chr); + s->resize_notifier.notify = term_resize_notify; +sigwinch_add_notifier (&s->resize_notifier); }#endif
@@ -155,6 +183,7 @@ static const TypeInfo char_stdio_type_info = { .parent = TYPE_CHARDEV_WIN_STDIO, #else .parent = TYPE_CHARDEV_FD, + .instance_size = sizeof(StdioChardev), #endif .instance_finalize = char_stdio_finalize, .class_init = char_stdio_class_init,
Signature · 1 line
2.27.0
PATCH v3 7/9 qmp: add chardev-resize command
In reply to Szymon LukaszThe managment software can use this command to notify QEMU about the size of the terminal connected to a chardev, QEMU can then forward this information to the guest if the chardev is connected to a virtio console device.
--- chardev/char.c | 14 ++++++++++++++ qapi/char.json | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+)
chardev/char.c +14 -0
@@ -1182,6 +1182,20 @@ void qmp_chardev_send_break(const char *id, Error **errp)qemu_chr_be_event (chr,CHR_EVENT_BREAK ); } +void qmp_chardev_resize (const char *id,uint16_t cols,uint16_t rows, +Error **errp) +{ +Chardev *chr; + + chr =qemu_chr_find (id); +if (chr ==NULL ) { +error_setg (errp,"Chardev '%s' not found" , id); +return ; + } + +qemu_chr_resize (chr, cols, rows); +} +/* * Add a timeout callback for the chardev (in milliseconds), return * the GSource object created. Please use this to add timeout hook for
qapi/char.json +25 -0
@@ -573,3 +573,28 @@ { 'event': 'VSERPORT_CHANGE', 'data': { 'id': 'str', 'open': 'bool' } } + +## +# @chardev-resize: +# +# Notifies a chardev about the current size of the terminal connected +# to this chardev. +# +# @id: the chardev's ID, must exist +# @cols: the number of columns +# @rows: the number of rows +# +# Returns: Nothing on success +# +# Since: 5.1 +# +# Example: +# +# -> { "execute": "chardev-resize", "arguments": { "id": "foo", "cols": 80, "rows": 24 } } +# <- { "return": {} } +# +## +{ 'command': 'chardev-resize', + 'data': { 'id': 'str', + 'cols': 'uint16', + 'rows': 'uint16' } }
Signature · 1 line
2.27.0
PATCH v3 8/9 virtio-serial-bus: add terminal resize messages
In reply to Szymon LukaszImplement the part of the virtio spec that allows to notify the virtio driver about terminal resizes. The virtio spec contains two methods to achieve that:
For legacy drivers, we have only one port and we put the terminal size in the config space and inject the config changed interrupt.
For multiport devices, we use the control virtqueue to send a packet containing the terminal size. Note that the Linux kernel expects the fields indicating the number of rows and columns in a packet to be in a different order than the one specified in the current version of the virtio spec. We follow the Linux implementation, so hopefully there is no implementation of this functionality conforming to the spec.
--- hw/char/trace-events | 1 + hw/char/virtio-serial-bus.c | 42 +++++++++++++++++++++++++++++-- hw/core/machine.c | 1 + include/hw/virtio/virtio-serial.h | 5 ++++ 4 files changed, 47 insertions(+), 2 deletions(-)
hw/char/trace-events +1 -0
@@ -10,6 +10,7 @@ serial_ioport_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0x%02x" # virtio-serial-bus.c virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u" +virtio_serial_send_console_resize(unsigned int port, uint16_t cols, uint16_t rows) "port %u, cols %u, rows %u" virtio_serial_throttle_port(unsigned int port, bool throttle) "port %u, throttle %d" virtio_serial_handle_control_message(uint16_t event, uint16_t value) "event %u, value %u" virtio_serial_handle_control_message_port(unsigned int port) "port %u"
hw/char/virtio-serial-bus.c +40 -2
60 lines not on this page · raw message
hw/core/machine.c +1 -0
@@ -30,6 +30,7 @@GlobalProperty hw_compat_5_0[] = { {"virtio-balloon-device" ,"page-poison" ,"false" }, + {"virtio-serial-device" ,"console-size" ,"off" }, };const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0);
include/hw/virtio/virtio-serial.h +5 -0
@@ -188,6 +188,8 @@ struct VirtIOSerial {virtio_serial_conf serial;uint64_t host_features; + +uint16_t port0_cols, port0_rows; };/* Interface to the virtio-serial bus */
@@ -222,6 +224,9 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port);*/ void virtio_serial_throttle_port (VirtIOSerialPort *port,bool throttle); +void virtio_serial_send_console_resize (VirtIOSerialPort *port, +uint16_t cols,uint16_t rows); +#define TYPE_VIRTIO_SERIAL "virtio-serial-device"#define VIRTIO_SERIAL (obj) \ OBJECT_CHECK(VirtIOSerial, (obj), TYPE_VIRTIO_SERIAL)
Signature · 1 line
2.27.0
PATCH v3 9/9 virtio-console: notify the guest about terminal resizes
In reply to Szymon LukaszIf a virtio serial port is a console port forward terminal resize messages from the chardev backend to the guest.
--- hw/char/virtio-console.c | 62 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-)
hw/char/virtio-console.c +58 -4
@@ -29,6 +29,7 @@ typedef struct VirtConsole {CharBackend chr;guint watch; +uint16_t cols, rows; } VirtConsole;/*
@@ -104,6 +105,33 @@ 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 ; + } + +qemu_chr_fe_get_winsize (&vcon->chr, &cols, &rows); + +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 +139,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 +201,23 @@ 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); + +trace_virtio_console_chr_event (port->id, event); +switch (event) { +case CHR_EVENT_OPENED : +case CHR_EVENT_MUX_IN : +case CHR_EVENT_RESIZE : +virtconsole_send_resize (port); +break ; +default : +break ; + } +} +static int chr_be_change (void *opaque) {VirtConsole *vcon = opaque;
@@ -179,7 +226,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 +256,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 +276,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 +293,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 {
Signature · 1 line
2.27.0
I have found this 3 year old patch adding virtio console resize support, which seems to have been forgotten at that time. I would like to see this feature merged.
Szymon, you have originally submitted this patch, would you be willing to update it for the latest development tree and resubmit it?
If it turns out that Szymon doesn't want to work on this anymore for any reason (or doesn't respond), could I resubmit the patch myself? The contributing guidelines don't say anything about this. I'm especially unsure how to deal with Signed-off-by, as in such case I would be (re)submitting sombody else's work, but potentially with my modifications. I'm willing to update and test the patch, and if necessary, address any review feedback.
- Filip Hejsek
Quoted 65 lines
The goal of this series is to have a resizable terminal into a guest without having to set up networking and using, e.g. ssh.
The virtio spec allows a virtio-console device to notify the guest about
terminal resizes in the host. Linux Kernel implements the driver part of
the spec. This series implement the device part in QEMU.This series adds support for a resizable terminal if a virtio console device is connected to the stdio backend.
This series also introduces resize messages that can be sent over QMP to
notify QEMU about the size of the terminal connented to some chardev. In the libvirt setting, it will allow to implement a resizable terminal
for virsh console and other libvirt clients.v3:
add resize messages over QMP, as suggested by Danielv2:
fix adding a new virtio feature bit to the virtio console deviceSzymon Lukasz (9):
chardev: add cols, rows fields
chardev: addCHR_EVENT_RESIZE
chardev: addqemu_chr_resize()
char-mux: add support for the terminal size
main-loop: change the handling of SIGWINCH
char-stdio: add support for the terminal size
qmp: add chardev-resize command
virtio-serial-bus: add terminal resize messages
virtio-console: notify the guest about terminal resizesbackends/cryptodev-vhost-user.c | 1 + chardev/char-fe.c | 13 +++++++ chardev/char-mux.c | 18 ++++++++- chardev/char-stdio.c | 29 ++++++++++++++ chardev/char.c | 26 +++++++++++++ hw/block/vhost-user-blk.c | 1 + hw/char/terminal3270.c | 1 + hw/char/trace-events | 1 + hw/char/virtio-console.c | 63
+++++++++++++++++++++++++++++--
hw/char/virtio-serial-bus.c | 42 ++++++++++++++++++++- hw/core/machine.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/redirect.c | 1 + include/chardev/char-fe.h | 10 +++++ include/chardev/char.h | 7 ++++include/hw/virtio/virtio-serial.h| 5 +++ include/qemu/main-loop.h | 4 ++ monitor/hmp.c | 1 + monitor/qmp.c | 1 + net/vhost-user.c | 1 + qapi/char.json | 25 ++++++++++++ ui/curses.c | 11 +++--- util/main-loop.c | 21 +++++++++++25 files changed, 274 insertions(+), 12 deletions(-)
Quoted 7 lines · Filip Hejsek
I have found this 3 year old patch adding virtio console resize support, which seems to have been forgotten at that time. I would like to see this feature merged.
Szymon, you have originally submitted this patch, would you be willing to update it for the latest development tree and resubmit it?
Quoted 7 lines
If it turns out that Szymon doesn't want to work on this anymore for any reason (or doesn't respond), could I resubmit the patch myself? The contributing guidelines don't say anything about this. I'm especially unsure how to deal with Signed-off-by, as in such case I would be (re)submitting sombody else's work, but potentially with my modifications. I'm willing to update and test the patch, and if necessary, address any review feedback.
You should keep Szymon's SOB, mention your changes in the commit message below that SOB and put in your own after.
Amit
Filip Hejsek wrote on Mon, Oct 23, 2023 at 05:12:14AM +0200:
Quoted 3 lines
I have found this 3 year old patch adding virtio console resize support, which seems to have been forgotten at that time. I would like to see this feature merged.
It's been a couple more years... :)
Have you had a look at this, or did you find another way of handling terminal resizes cleanly enough?
Thanks,
Signature · 1 line
Dominique Martinet
Quoted 5 lines · Dominique Martinet
Filip Hejsek wrote on Mon, Oct 23, 2023 at 05:12:14AM +0200:
Quoted 3 lines
I have found this 3 year old patch adding virtio console resize support, which seems to have been forgotten at that time. I would like to see this feature merged.
Quoted 9 lines
It's been a couple more years... :)
Have you had a look at this, or did you find another way of handling terminal resizes cleanly enough?
Thanks,
Signature · 1 line
Dominique Martinet
just resubmit the way Amit suggested at the time.
Quoted 9 lines · Dominique Martinet
Filip Hejsek wrote on Mon, Oct 23, 2023 at 05:12:14AM +0200:
Quoted 3 lines
I have found this 3 year old patch adding virtio console resize support, which seems to have been forgotten at that time. I would like to see this feature merged.
It's been a couple more years... :)
Have you had a look at this, or did you find another way of handling terminal resizes cleanly enough?
I had indeed looked into this back in 2023 and even did some work on it, but unfortunately I had abandoned it before getting to the finish line.
From what I remember, I found that the patches didn't merge cleanly, so I attempted to reconcile them with the changes made in QEMU master since the original patches were submitted. As part of that work, I felt that I needed to take responsibility for the patches, the same way I would for a patch I wrote on my own.
Due to my yak shaving tendencies, I got distracted by several things. I ended up investigating a test failure caused by a bug in unrelated code (which I reported as issue #1969). I wrote terminal size detection code for Windows. And I remember there being something in the patches that I wasn't really happy about and intended to rewrite, but I never got around to doing that. After a while, I lost my enthusiasm, and because I had other things to worry about, this work ended up just sitting there on my SSD for almost two years.
So anyway, for now I have now uploaded my version of the patches here:
https://gitlab.com/filip-hejsek/qemu/-/commits/console-resize-old
I will try to merge it with the current master again, which should be ready in a short time. I can't promise much more than that, though. :)
Best regards,
Filip Hejsek
Quoted 2 lines
I will try to merge it with the current master again, which should be ready in a short time.
Done. You can find an updated version of the patches at
<https://gitlab.com/filip-hejsek/qemu/-/commits/console-resize>.
I haven't tested the updated version though. I will maybe do some testing and then submit it to the mailing list for review, although if anyone else would like to take over then feel free to do so.
Quoted 8 lines · Filip Hejsek
Quoted 2 lines
I will try to merge it with the current master again, which should be ready in a short time.
Done. You can find an updated version of the patches at
<https://gitlab.com/filip-hejsek/qemu/-/commits/console-resize>.
I haven't tested the updated version though. I will maybe do some testing and then submit it to the mailing list for review, although if anyone else would like to take over then feel free to do so.
I have done some tests and it seems that lines and columns are swapped. Maybe the implementation in the linux kernel was changed to conform to the spec?
Filip Hejsek wrote on Thu, Sep 11, 2025 at 11:19:15PM +0200:
Quoted 9 lines
Quoted 5 lines
Done. You can find an updated version of the patches at
<https://gitlab.com/filip-hejsek/qemu/-/commits/console-resize>.
I haven't tested the updated version though. I will maybe do some testing and then submit it to the mailing list for review, although if anyone else would like to take over then feel free to do so.I have done some tests and it seems that lines and columns are swapped. Maybe the implementation in the linux kernel was changed to conform to the spec?
Yes, they have:
https://git.kernel.org/linus/5326ab737a47278dbd16ed3ee7380b26c7056ddd
I had also rebased the patches but wasn't sure how it was supposed to
work, but perhaps that was why it appeared not to work instead...
(I assumed running qemu with something like that would "just resize",
but also tried the qmp command to no avail:
-serial none -device virtio-serial-pci -chardev stdio,id=foo -device virtconsole,chardev=foo )
I'll retry with your branch, thank you !
Signature · 1 line
Dominique Martinet | Asmadeus