Re: [PATCH] virtio-mmio: Correct the name of the guest features selector

From: Rusty Russell
Date: Tue Nov 15 2011 - 21:33:35 EST


On Tue, 15 Nov 2011 14:25:22 +0000, Pawel Moll <pawel.moll@xxxxxxx> wrote:
> On Tue, 2011-11-15 at 14:17 +0000, Sasha Levin wrote:
> > Guest features selector spelling mistake.
> >
> > diff --git a/include/linux/virtio_mmio.h b/include/linux/virtio_mmio.h
> > index 27c7ede..5c7b6f0 100644
> > --- a/include/linux/virtio_mmio.h
> > +++ b/include/linux/virtio_mmio.h
> > @@ -63,7 +63,7 @@
> > #define VIRTIO_MMIO_GUEST_FEATURES 0x020
> >
> > /* Activated features set selector - Write Only */
> > -#define VIRTIO_MMIO_GUEST_FEATURES_SET 0x024
> > +#define VIRTIO_MMIO_GUEST_FEATURES_SEL 0x024
> >
> > /* Guest's memory page size in bytes - Write Only */
> > #define VIRTIO_MMIO_GUEST_PAGE_SIZE 0x028
>
> Damn. Sorry about it. But if you change the header you'll need to change
> the driver:
>
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index 1f25bb9..10bb8b9 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -161,7 +161,7 @@ static void vm_finalize_features(struct virtio_device *vdev)
> vring_transport_features(vdev);
>
> for (i = 0; i < ARRAY_SIZE(vdev->features); i++) {
> - writel(i, vm_dev->base + VIRTIO_MMIO_GUEST_FEATURES_SET);
> + writel(i, vm_dev->base + VIRTIO_MMIO_GUEST_FEATURES_SEL);
> writel(vdev->features[i],
> vm_dev->base + VIRTIO_MMIO_GUEST_FEATURES);
> }

Rolled together and applied.

Thanks,
Rusty.
--
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/