Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb06e367 authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell
Browse files

virtio: console: ensure console size is updated on hvc open 



When multiple console support is added, ensure each port's size gets
updated when a new one is opened via hvc.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 1c85bf35

drivers/char/virtio_console.c

+17 −16
Original line number Diff line number Diff line
@@ -251,27 +251,28 @@ static int get_chars(u32 vtermno, char *buf, int count) 
	return count;

}



/*

 * virtio console configuration. This supports:

 * - console resize

 */

static void virtcons_apply_config(struct virtio_device *dev)

static void resize_console(struct port *port)

{

	struct virtio_device *vdev;

	struct winsize ws;



	if (virtio_has_feature(dev, VIRTIO_CONSOLE_F_SIZE)) {

		dev->config->get(dev,

	vdev = port->portdev->vdev;

	if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_SIZE)) {

		vdev->config->get(vdev,

				  offsetof(struct virtio_console_config, cols),

				  &ws.ws_col, sizeof(u16));

		dev->config->get(dev,

		vdev->config->get(vdev,

				  offsetof(struct virtio_console_config, rows),

				  &ws.ws_row, sizeof(u16));

		/* This is the pre-multiport style: we use control messages

		 * these days which specify the port.  So this means port 0. */

		hvc_resize(find_port_by_vtermno(0)->hvc, ws);

		hvc_resize(port->hvc, ws);

	}

}



static void virtcons_apply_config(struct virtio_device *vdev)

{

	resize_console(find_port_by_vtermno(0));

}



/* We set the configuration at this point, since we now have a tty */

static int notifier_add_vio(struct hvc_struct *hp, int data)

{
@@ -282,7 +283,7 @@ static int notifier_add_vio(struct hvc_struct *hp, int data) 
		return -EINVAL;



	hp->irq_requested = 1;

	virtcons_apply_config(port->portdev->vdev);

	resize_console(port);



	return 0;

}