vhost: introduce vhost_is_little_endian() helper

gkurz · mstsirkin · commit ab27c07f6072 · 2015-06-01T15:48:53.000+02:00
Signed-off-by: Greg Kurz &lt;gkurz@linux.vnet.ibm.com&gt;

Signed-off-by: Michael S. Tsirkin &lt;mst@redhat.com&gt;
Acked-by: Cornelia Huck &lt;cornelia.huck@de.ibm.com&gt;
Reviewed-by: David Gibson &lt;david@gibson.dropbear.id.au&gt;
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
@@ -173,34 +173,39 @@ static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit)
 	return vq->acked_features & (1ULL << bit);
 }
 
+static inline bool vhost_is_little_endian(struct vhost_virtqueue *vq)
+{
+	return vhost_has_feature(vq, VIRTIO_F_VERSION_1);
+}
+
 /* Memory accessors */
 static inline u16 vhost16_to_cpu(struct vhost_virtqueue *vq, __virtio16 val)
 {
-	return __virtio16_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __virtio16_to_cpu(vhost_is_little_endian(vq), val);
 }
 
 static inline __virtio16 cpu_to_vhost16(struct vhost_virtqueue *vq, u16 val)
 {
-	return __cpu_to_virtio16(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __cpu_to_virtio16(vhost_is_little_endian(vq), val);
 }
 
 static inline u32 vhost32_to_cpu(struct vhost_virtqueue *vq, __virtio32 val)
 {
-	return __virtio32_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __virtio32_to_cpu(vhost_is_little_endian(vq), val);
 }
 
 static inline __virtio32 cpu_to_vhost32(struct vhost_virtqueue *vq, u32 val)
 {
-	return __cpu_to_virtio32(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __cpu_to_virtio32(vhost_is_little_endian(vq), val);
 }
 
 static inline u64 vhost64_to_cpu(struct vhost_virtqueue *vq, __virtio64 val)
 {
-	return __virtio64_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __virtio64_to_cpu(vhost_is_little_endian(vq), val);
 }
 
 static inline __virtio64 cpu_to_vhost64(struct vhost_virtqueue *vq, u64 val)
 {
-	return __cpu_to_virtio64(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);
+	return __cpu_to_virtio64(vhost_is_little_endian(vq), val);
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -173,34 +173,39 @@ static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit)`
`173`	`173`	`return vq->acked_features & (1ULL << bit);`
`174`	`174`	`}`
`175`	`175`
	`176`	`+static inline bool vhost_is_little_endian(struct vhost_virtqueue *vq)`
	`177`	`+{`
	`178`	`+ return vhost_has_feature(vq, VIRTIO_F_VERSION_1);`
	`179`	`+}`
	`180`	`+`
`176`	`181`	`/* Memory accessors */`
`177`	`182`	`static inline u16 vhost16_to_cpu(struct vhost_virtqueue *vq, __virtio16 val)`
`178`	`183`	`{`
`179`		`- return __virtio16_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`184`	`+ return __virtio16_to_cpu(vhost_is_little_endian(vq), val);`
`180`	`185`	`}`
`181`	`186`
`182`	`187`	`static inline __virtio16 cpu_to_vhost16(struct vhost_virtqueue *vq, u16 val)`
`183`	`188`	`{`
`184`		`- return __cpu_to_virtio16(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`189`	`+ return __cpu_to_virtio16(vhost_is_little_endian(vq), val);`
`185`	`190`	`}`
`186`	`191`
`187`	`192`	`static inline u32 vhost32_to_cpu(struct vhost_virtqueue *vq, __virtio32 val)`
`188`	`193`	`{`
`189`		`- return __virtio32_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`194`	`+ return __virtio32_to_cpu(vhost_is_little_endian(vq), val);`
`190`	`195`	`}`
`191`	`196`
`192`	`197`	`static inline __virtio32 cpu_to_vhost32(struct vhost_virtqueue *vq, u32 val)`
`193`	`198`	`{`
`194`		`- return __cpu_to_virtio32(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`199`	`+ return __cpu_to_virtio32(vhost_is_little_endian(vq), val);`
`195`	`200`	`}`
`196`	`201`
`197`	`202`	`static inline u64 vhost64_to_cpu(struct vhost_virtqueue *vq, __virtio64 val)`
`198`	`203`	`{`
`199`		`- return __virtio64_to_cpu(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`204`	`+ return __virtio64_to_cpu(vhost_is_little_endian(vq), val);`
`200`	`205`	`}`
`201`	`206`
`202`	`207`	`static inline __virtio64 cpu_to_vhost64(struct vhost_virtqueue *vq, u64 val)`
`203`	`208`	`{`
`204`		`- return __cpu_to_virtio64(vhost_has_feature(vq, VIRTIO_F_VERSION_1), val);`
	`209`	`+ return __cpu_to_virtio64(vhost_is_little_endian(vq), val);`
`205`	`210`	`}`
`206`	`211`	`#endif`