[PATCH RFC v3 07/16] virtio_config: endian conversion for v1.0

[Michael S. Tsirkin]

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

Reviewed-by: David Hildenbrand <d...@linux.vnet.ibm.com>
Signed-off-by: Rusty Russell <ru...@rustcorp.com.au>
Signed-off-by: Cornelia Huck <cornelia.h...@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <m...@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 be0f6dd..09cd89c 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -255,12 +255,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));
 }
 
@@ -269,12 +270,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));
 }
 
@@ -283,12 +285,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

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