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

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

[Sasha Levin]

Guest features selector spelling mistake.

Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---

Hopefully not too late to fix, should possibly be done in one of the next RCs
since it's user facing.

 include/linux/virtio_mmio.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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
-- 
1.7.8.rc1

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

[Pawel Moll]

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);
        }

Cheers!

Paweł


_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

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

[Rusty Russell]

On Tue, 15 Nov 2011 14:25:22 +0000, Pawel Moll <pawel.moll@arm.com> 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.