On 03/28/2013 07:28 PM, Amit Shah wrote:
> The cvq_lock was taken for the c_ivq. Rename the lock to make that
> obvious.
>
> We'll also add a lock around the c_ovq in the next commit, so there's no
> ambiguity.
>
> Signed-off-by: Amit Shah <amit.shah@xxxxxxxxxx>
Reviewed-by: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx>
> ---
> drivers/char/virtio_console.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
> index e905d5f..7e9bc1d 100644
> --- a/drivers/char/virtio_console.c
> +++ b/drivers/char/virtio_console.c
> @@ -149,7 +149,7 @@ struct ports_device {
> spinlock_t ports_lock;
>
> /* To protect the vq operations for the control channel */
> - spinlock_t cvq_lock;
> + spinlock_t c_ivq_lock;
>
> /* The current config space is stored here */
> struct virtio_console_config config;
> @@ -1709,23 +1709,23 @@ static void control_work_handler(struct work_struct *work)
> portdev = container_of(work, struct ports_device, control_work);
> vq = portdev->c_ivq;
>
> - spin_lock(&portdev->cvq_lock);
> + spin_lock(&portdev->c_ivq_lock);
> while ((buf = virtqueue_get_buf(vq, &len))) {
> - spin_unlock(&portdev->cvq_lock);
> + spin_unlock(&portdev->c_ivq_lock);
>
> buf->len = len;
> buf->offset = 0;
>
> handle_control_message(portdev, buf);
>
> - spin_lock(&portdev->cvq_lock);
> + spin_lock(&portdev->c_ivq_lock);
> if (add_inbuf(portdev->c_ivq, buf) < 0) {
> dev_warn(&portdev->vdev->dev,
> "Error adding buffer to queue\n");
> free_buf(buf, false);
> }
> }
> - spin_unlock(&portdev->cvq_lock);
> + spin_unlock(&portdev->c_ivq_lock);
> }
>
> static void out_intr(struct virtqueue *vq)
> @@ -1986,10 +1986,11 @@ static int virtcons_probe(struct virtio_device *vdev)
> if (multiport) {
> unsigned int nr_added_bufs;
>
> - spin_lock_init(&portdev->cvq_lock);
> + spin_lock_init(&portdev->c_ivq_lock);
> INIT_WORK(&portdev->control_work, &control_work_handler);
>
> - nr_added_bufs = fill_queue(portdev->c_ivq, &portdev->cvq_lock);
> + nr_added_bufs = fill_queue(portdev->c_ivq,
> + &portdev->c_ivq_lock);
> if (!nr_added_bufs) {
> dev_err(&vdev->dev,
> "Error allocating buffers for control queue\n");
> @@ -2140,7 +2141,7 @@ static int virtcons_restore(struct virtio_device *vdev)
> return ret;
>
> if (use_multiport(portdev))
> - fill_queue(portdev->c_ivq, &portdev->cvq_lock);
> + fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
>
> list_for_each_entry(port, &portdev->ports, list) {
> port->in_vq = portdev->in_vqs[port->id];
>
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
