[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/26] virtio: add virtio-gpu bswap helpers heade
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 17/26] virtio: add virtio-gpu bswap helpers header |
Date: |
Mon, 18 Jun 2018 18:17:20 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/hw/virtio/virtio-gpu-bswap.h | 48 ++++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 43 +------------------------
2 files changed, 49 insertions(+), 42 deletions(-)
create mode 100644 include/hw/virtio/virtio-gpu-bswap.h
diff --git a/include/hw/virtio/virtio-gpu-bswap.h
b/include/hw/virtio/virtio-gpu-bswap.h
new file mode 100644
index 0000000000..bc9e895f9c
--- /dev/null
+++ b/include/hw/virtio/virtio-gpu-bswap.h
@@ -0,0 +1,48 @@
+#ifndef HW_VIRTIO_GPU_BSWAP_H
+#define HW_VIRTIO_GPU_BSWAP_H
+
+#include "qemu/bswap.h"
+
+static inline void
+virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
+{
+ le32_to_cpus(&hdr->type);
+ le32_to_cpus(&hdr->flags);
+ le64_to_cpus(&hdr->fence_id);
+ le32_to_cpus(&hdr->ctx_id);
+ le32_to_cpus(&hdr->padding);
+}
+
+static inline void
+virtio_gpu_bswap_32(void *ptr, size_t size)
+{
+#ifdef HOST_WORDS_BIGENDIAN
+
+ size_t i;
+ struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr;
+
+ virtio_gpu_ctrl_hdr_bswap(hdr);
+
+ i = sizeof(struct virtio_gpu_ctrl_hdr);
+ while (i < size) {
+ le32_to_cpus((uint32_t *)(ptr + i));
+ i = i + sizeof(uint32_t);
+ }
+
+#endif
+}
+
+static inline void
+virtio_gpu_t2d_bswap(struct virtio_gpu_transfer_to_host_2d *t2d)
+{
+ virtio_gpu_ctrl_hdr_bswap(&t2d->hdr);
+ le32_to_cpus(&t2d->r.x);
+ le32_to_cpus(&t2d->r.y);
+ le32_to_cpus(&t2d->r.width);
+ le32_to_cpus(&t2d->r.height);
+ le64_to_cpus(&t2d->offset);
+ le32_to_cpus(&t2d->resource_id);
+ le32_to_cpus(&t2d->padding);
+}
+
+#endif
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 2dd3c3481a..6a55416be7 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -18,6 +18,7 @@
#include "trace.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-gpu.h"
+#include "hw/virtio/virtio-gpu-bswap.h"
#include "hw/virtio/virtio-bus.h"
#include "migration/blocker.h"
#include "qemu/log.h"
@@ -30,48 +31,6 @@ virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
static void virtio_gpu_cleanup_mapping(struct virtio_gpu_simple_resource *res);
-static void
-virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
-{
- le32_to_cpus(&hdr->type);
- le32_to_cpus(&hdr->flags);
- le64_to_cpus(&hdr->fence_id);
- le32_to_cpus(&hdr->ctx_id);
- le32_to_cpus(&hdr->padding);
-}
-
-static void virtio_gpu_bswap_32(void *ptr,
- size_t size)
-{
-#ifdef HOST_WORDS_BIGENDIAN
-
- size_t i;
- struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr;
-
- virtio_gpu_ctrl_hdr_bswap(hdr);
-
- i = sizeof(struct virtio_gpu_ctrl_hdr);
- while (i < size) {
- le32_to_cpus((uint32_t *)(ptr + i));
- i = i + sizeof(uint32_t);
- }
-
-#endif
-}
-
-static void
-virtio_gpu_t2d_bswap(struct virtio_gpu_transfer_to_host_2d *t2d)
-{
- virtio_gpu_ctrl_hdr_bswap(&t2d->hdr);
- le32_to_cpus(&t2d->r.x);
- le32_to_cpus(&t2d->r.y);
- le32_to_cpus(&t2d->r.width);
- le32_to_cpus(&t2d->r.height);
- le64_to_cpus(&t2d->offset);
- le32_to_cpus(&t2d->resource_id);
- le32_to_cpus(&t2d->padding);
-}
-
#ifdef CONFIG_VIRGL
#include <virglrenderer.h>
#define VIRGL(_g, _virgl, _simple, ...) \
--
2.18.0.rc1
- [Qemu-devel] [PATCH v3 12/26] libvhost-user: export vug_source_new(), (continued)
- [Qemu-devel] [PATCH v3 12/26] libvhost-user: export vug_source_new(), Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 13/26] contrib: add vhost-user-input, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 14/26] Add vhost-user-input-pci, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 15/26] vhost-user: add vhost_user_gpu_set_socket(), Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 16/26] vhost-user: add vhost_user_gpu_get_num_capsets(), Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 18/26] util: promote qemu_egl_rendernode_open() to libqemuutil, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 21/26] virtio-gpu: remove unused config_size, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 22/26] virtio-gpu: block both 2d and 3d rendering, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 20/26] virtio-gpu: remove unused qdev, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 17/26] virtio: add virtio-gpu bswap helpers header,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 23/26] virtio-gpu: remove useless 'waiting' field, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 19/26] contrib: add vhost-user-gpu, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 25/26] virtio-gpu: split virtio-gpu-pci & virtio-vga, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 24/26] virtio-gpu: split virtio-gpu, introduce virtio-gpu-base, Marc-André Lureau, 2018/06/18
- [Qemu-devel] [PATCH v3 26/26] hw/display: add vhost-user-vga & gpu-pci, Marc-André Lureau, 2018/06/18