Linux Virtualization - Nov 2014 - [PATCH v4 07/42] virtio_config: endian conversion for v1.0

We (ab)use virtio conversion functions for device-specific
config space accesses.

Reviewed-by: David Hildenbrand <dahi at linux.vnet.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
---
 include/linux/virtio_config.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index b9cd689..b50c4a1 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -271,12 +271,13 @@ static inline u16 virtio_cread16(struct virtio_device
*vdev,
 {
 	u16 ret;
 	vdev->config->get(vdev, offset, &ret, sizeof(ret));
-	return ret;
+	return virtio16_to_cpu(vdev, (__force __virtio16)ret);
 }
 
 static inline void virtio_cwrite16(struct virtio_device *vdev,
 				   unsigned int offset, u16 val)
 {
+	val = (__force u16)cpu_to_virtio16(vdev, val);
 	vdev->config->set(vdev, offset, &val, sizeof(val));
 }
 
@@ -285,12 +286,13 @@ static inline u32 virtio_cread32(struct virtio_device
*vdev,
 {
 	u32 ret;
 	vdev->config->get(vdev, offset, &ret, sizeof(ret));
-	return ret;
+	return virtio32_to_cpu(vdev, (__force __virtio32)ret);
 }
 
 static inline void virtio_cwrite32(struct virtio_device *vdev,
 				   unsigned int offset, u32 val)
 {
+	val = (__force u32)cpu_to_virtio32(vdev, val);
 	vdev->config->set(vdev, offset, &val, sizeof(val));
 }
 
@@ -299,12 +301,13 @@ static inline u64 virtio_cread64(struct virtio_device
*vdev,
 {
 	u64 ret;
 	vdev->config->get(vdev, offset, &ret, sizeof(ret));
-	return ret;
+	return virtio64_to_cpu(vdev, (__force __virtio64)ret);
 }
 
 static inline void virtio_cwrite64(struct virtio_device *vdev,
 				   unsigned int offset, u64 val)
 {
+	val = (__force u64)cpu_to_virtio64(vdev, val);
 	vdev->config->set(vdev, offset, &val, sizeof(val));
 }
 
-- 
MST

On Tue, 25 Nov 2014 18:41:52 +0200
"Michael S. Tsirkin" <mst at redhat.com> wrote:
> We (ab)use virtio conversion functions for device-specific
> config space accesses.
> 
> Reviewed-by: David Hildenbrand <dahi at linux.vnet.ibm.com>
> Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
> Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
> Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
This looks odd with the various sign-offs but you as author...
> ---
>  include/linux/virtio_config.h | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

On Tue, Nov 25, 2014 at 06:45:57PM +0100, Cornelia Huck
wrote:
> On Tue, 25 Nov 2014 18:41:52 +0200
> "Michael S. Tsirkin" <mst at redhat.com> wrote:
> 
> > We (ab)use virtio conversion functions for device-specific
> > config space accesses.
> > 
> > Reviewed-by: David Hildenbrand <dahi at linux.vnet.ibm.com>
> > Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
> > Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
> > Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
> 
> This looks odd with the various sign-offs but you as author...
Signoff tracks all contributors for developer's certificate
of origin purposes.

Looking at the patch itself, not a single line (except the subject) seems
to be shared with the original patch by Rusty that was posted with the
same subject, so I guess I could have dropped them here, but as I
refactor code I usually keep all signoffs around as a matter of policy.

Would you like yours to be dropped then?

> > ---
> >  include/linux/virtio_config.h | 9 ++++++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)