Skip to content

Commit

Permalink
virtio: console: Add a __send_control_msg() that can send messages wi…
Browse files Browse the repository at this point in the history
…thout a valid port

We will introduce control messages that operate on the device as a whole
rather than just ports. Make send_control_msg() a wrapper around
__send_control_msg() which does not need a valid port.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Amit Shah authored and Rusty Russell committed May 19, 2010
1 parent b99fa81 commit 3425e70
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,22 +374,22 @@ static bool port_has_data(struct port *port)
return ret;
}

static ssize_t send_control_msg(struct port *port, unsigned int event,
unsigned int value)
static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id,
unsigned int event, unsigned int value)
{
struct scatterlist sg[1];
struct virtio_console_control cpkt;
struct virtqueue *vq;
unsigned int len;

if (!use_multiport(port->portdev))
if (!use_multiport(portdev))
return 0;

cpkt.id = port->id;
cpkt.id = port_id;
cpkt.event = event;
cpkt.value = value;

vq = port->portdev->c_ovq;
vq = portdev->c_ovq;

sg_init_one(sg, &cpkt, sizeof(cpkt));
if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt) >= 0) {
Expand All @@ -400,6 +400,12 @@ static ssize_t send_control_msg(struct port *port, unsigned int event,
return 0;
}

static ssize_t send_control_msg(struct port *port, unsigned int event,
unsigned int value)
{
return __send_control_msg(port->portdev, port->id, event, value);
}

static ssize_t send_buf(struct port *port, void *in_buf, size_t in_count)
{
struct scatterlist sg[1];
Expand Down

0 comments on commit 3425e70

Please sign in to comment.