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

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

virtio: console: ensure add_inbuf can work for multiple ports as well 



add_inbuf() assumed one port and one inbuf per port. Remove that
assumption.

Also move the function so that put_chars and get_chars are together.

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

drivers/char/virtio_console.c

+18 −17
Original line number Diff line number Diff line
@@ -77,6 +77,22 @@ static struct port_buffer *alloc_buf(size_t buf_size) 
	return NULL;

}



/*

 * Create a scatter-gather list representing our input buffer and put

 * it in the queue.

 *

 * Callers should take appropriate locks.

 */

static void add_inbuf(struct virtqueue *vq, struct port_buffer *buf)

{

	struct scatterlist sg[1];

	sg_init_one(sg, buf->buf, buf->size);



	if (vq->vq_ops->add_buf(vq, sg, 0, 1, buf) < 0)

		BUG();

	vq->vq_ops->kick(vq);

}



/*

 * The put_chars() callback is pretty straightforward.

 *
@@ -111,21 +127,6 @@ static int put_chars(u32 vtermno, const char *buf, int count) 
	return count;

}



/*

 * Create a scatter-gather list representing our input buffer and put

 * it in the queue.

 */

static void add_inbuf(struct port *port)

{

	struct scatterlist sg[1];

	sg_init_one(sg, port->inbuf->buf, PAGE_SIZE);



	/* Should always be able to add one buffer to an empty queue. */

	if (port->in_vq->vq_ops->add_buf(port->in_vq, sg, 0, 1, port) < 0)

		BUG();

	port->in_vq->vq_ops->kick(port->in_vq);

}



/*

 * get_chars() is the callback from the hvc_console infrastructure

 * when an interrupt is received.
@@ -162,7 +163,7 @@ static int get_chars(u32 vtermno, char *buf, int count) 


	/* Finished?  Re-register buffer so Host will use it again. */

	if (port->inbuf->offset == port->inbuf->len)

		add_inbuf(port);

		add_inbuf(port->in_vq, port->inbuf);



	return count;

}
@@ -294,7 +295,7 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) 
	}



	/* Register the input buffer the first time. */

	add_inbuf(port);

	add_inbuf(port->in_vq, port->inbuf);



	/* Start using the new console output. */

	early_put_chars = NULL;