diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-05-06 02:05:09 +0530 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-05-19 22:15:51 +0930 |
| commit | 8345adbf96fc1bde7d9846aadbe5af9b2ae90882 (patch) | |
| tree | 30ea3bbed2d9f7c870bc1656a7fdd0e0929f5a2a /drivers/char/virtio_console.c | |
| parent | 9778829cffd4d8d68c7e457645f958a82d4c4d8b (diff) | |
| download | linux-3.10-8345adbf96fc1bde7d9846aadbe5af9b2ae90882.tar.gz linux-3.10-8345adbf96fc1bde7d9846aadbe5af9b2ae90882.tar.bz2 linux-3.10-8345adbf96fc1bde7d9846aadbe5af9b2ae90882.zip | |
virtio: console: Accept console size along with resize control message
The VIRTIO_CONSOLE_RESIZE control message sent to us by the host now
contains the new {rows, cols} values for the console. This ensures each
console port gets its own size, and we don't depend on the config-space
rows and cols values at all now.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
CC: linuxppc-dev@ozlabs.org
CC: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/virtio_console.c')
| -rw-r--r-- | drivers/char/virtio_console.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index f1fe11a344e..458d907e362 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1194,12 +1194,23 @@ static void handle_control_message(struct ports_device *portdev, * have to notify the host first. */ break; - case VIRTIO_CONSOLE_RESIZE: + case VIRTIO_CONSOLE_RESIZE: { + struct { + __u16 rows; + __u16 cols; + } size; + if (!is_console_port(port)) break; + + memcpy(&size, buf->buf + buf->offset + sizeof(*cpkt), + sizeof(size)); + set_console_size(port, size.rows, size.cols); + port->cons.hvc->irq_requested = 1; resize_console(port); break; + } case VIRTIO_CONSOLE_PORT_OPEN: port->host_connected = cpkt->value; wake_up_interruptible(&port->waitqueue); |