diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-01-18 19:15:04 +0530 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-24 14:22:40 +1030 |
| commit | 73954488b1cc74cf46d6b94b8d3175f45496bd32 (patch) | |
| tree | ea1e978de05db548252f171257f2865ab6bfecbe | |
| parent | a3cde44908429e52b2ec052ad5a70ef60e1f2d56 (diff) | |
virtio: console: use vdev->priv to avoid accessing global var.
Part of removing our "one console" assumptions, use vdev->priv to point
to the port (currently == the global console).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | drivers/char/virtio_console.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index df45e5e9a94..e52ee1151f5 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -187,6 +187,7 @@ static int get_chars(u32 vtermno, char *buf, int count) */ static void virtcons_apply_config(struct virtio_device *dev) { + struct port *port = dev->priv; struct winsize ws; if (virtio_has_feature(dev, VIRTIO_CONSOLE_F_SIZE)) { @@ -196,7 +197,7 @@ static void virtcons_apply_config(struct virtio_device *dev) dev->config->get(dev, offsetof(struct virtio_console_config, rows), &ws.ws_row, sizeof(u16)); - hvc_resize(console.hvc, ws); + hvc_resize(port->hvc, ws); } } @@ -219,7 +220,9 @@ static void notifier_del_vio(struct hvc_struct *hp, int data) static void hvc_handle_input(struct virtqueue *vq) { - if (hvc_poll(console.hvc)) + struct port *port = vq->vdev->priv; + + if (hvc_poll(port->hvc)) hvc_kick(); } @@ -272,7 +275,10 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) "Multiple virtio-console devices not supported yet\n"); return -EEXIST; } + + /* Attach this port to this virtio_device, and vice-versa. */ port->vdev = vdev; + vdev->priv = port; /* This is the scratch page we use to receive console input */ port->inbuf = alloc_buf(PAGE_SIZE); |