diff options
Diffstat (limited to 'arch/um/drivers/virtio_uml.c')
| -rw-r--r-- | arch/um/drivers/virtio_uml.c | 12 | 
1 files changed, 7 insertions, 5 deletions
| diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c index 77faa2cf3a13..2b6e701776b6 100644 --- a/arch/um/drivers/virtio_uml.c +++ b/arch/um/drivers/virtio_uml.c @@ -1014,8 +1014,8 @@ error_kzalloc:  }  static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs, -		       struct virtqueue *vqs[], vq_callback_t *callbacks[], -		       const char * const names[], const bool *ctx, +		       struct virtqueue *vqs[], +		       struct virtqueue_info vqs_info[],  		       struct irq_affinity *desc)  {  	struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev); @@ -1031,13 +1031,15 @@ static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs,  		return rc;  	for (i = 0; i < nvqs; ++i) { -		if (!names[i]) { +		struct virtqueue_info *vqi = &vqs_info[i]; + +		if (!vqi->name) {  			vqs[i] = NULL;  			continue;  		} -		vqs[i] = vu_setup_vq(vdev, queue_idx++, callbacks[i], names[i], -				     ctx ? ctx[i] : false); +		vqs[i] = vu_setup_vq(vdev, queue_idx++, vqi->callback, +				     vqi->name, vqi->ctx);  		if (IS_ERR(vqs[i])) {  			rc = PTR_ERR(vqs[i]);  			goto error_setup; |