Virtualization - Nov 2014 - [PATCH v6 29/46] vhost: add memory access wrappers

Add guest memory access wrappers to handle virtio endianness
conversions.

Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
---
 drivers/vhost/vhost.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index c624b09..1f321fd 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -176,4 +176,35 @@ static inline int vhost_has_feature(struct vhost_virtqueue
*vq, int bit)
 {
 	return vq->acked_features & (1ULL << bit);
 }
+
+/* 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);
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
 #endif
-- 
MST

On Fri, Nov 28, 2014 at 4:10 AM, Michael S. Tsirkin <mst at redhat.com> 
wrote:
> Add guest memory access wrappers to handle virtio endianness
> conversions.
> 
> Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
> ---
>  drivers/vhost/vhost.h | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
> index c624b09..1f321fd 100644
> --- a/drivers/vhost/vhost.h
> +++ b/drivers/vhost/vhost.h
> @@ -176,4 +176,35 @@ static inline int vhost_has_feature(struct 
> vhost_virtqueue *vq, int bit)
>  {
>  	return vq->acked_features & (1ULL << bit);
>  }
> +
> +/* 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);
> +}
> +
> +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);
> +}
> +
> +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);
> +}
> +
> +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);
> +}
> +
> +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);
> +}
> +
> +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);
> +}
>  #endif
> -- 
> MST
Reviewed-by: Jason Wang <jasowang at redhat.com>