Re: [PATCH v6 02/46] virtio: use u32, not bitmap for features

[Cornelia Huck]

On Thu, 27 Nov 2014 22:07:41 +0200
"Michael S. Tsirkin" <mst@xxxxxxxxxx> wrote:

> It seemed like a good idea to use bitmap for features
> in struct virtio_device, but it's actually a pain,
> and seems to become even more painful when we get more
> than 32 feature bits.  Just change it to a u32 for now.
> 
> Based on patch by Rusty.
> 
> Suggested-by: David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>

> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index d34ebfa..ab95a4c 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -120,8 +120,7 @@ static void vp_finalize_features(struct virtio_device *vdev)
>  	vring_transport_features(vdev);
> 
>  	/* We only support 32 feature bits. */

I think you can kill this comment...

> -	BUILD_BUG_ON(ARRAY_SIZE(vdev->features) != 1);
> -	iowrite32(vdev->features[0], vp_dev->ioaddr+VIRTIO_PCI_GUEST_FEATURES);
> +	iowrite32(vdev->features, vp_dev->ioaddr+VIRTIO_PCI_GUEST_FEATURES);

...and add blanks around '+', as you're touching this line anyway.

>  }
> 
>  /* virtio config->get() implementation */

Reviewed-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/