From 5b896af413dae0e4933a6e5c277bfe7b4f2f9bb4 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 4 Jul 2019 10:32:05 +0200

Subject: [PATCH 2/4] virtio-gpu: pass down VirtIOGPU pointer to a bunch of

 functions

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Gerd Hoffmann <kraxel@redhat.com>

Message-id: <20190704103207.29158-2-kraxel@redhat.com>

Patchwork-id: 89374

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 1/3] virtio-gpu: pass down VirtIOGPU pointer to a bunch of functions

Bugzilla: 1531543

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

No functional change, just preparation for a followup patch

which needs a VirtIOGPU pointer.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Message-Id: <20180829122101.29852-2-kraxel@redhat.com>

(cherry picked from commit 3bb68f798da0234d5ca0ac6062aaa084afc83069)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/display/virtio-gpu-3d.c     |  8 ++++----

 hw/display/virtio-gpu.c        | 25 +++++++++++++++----------

 include/hw/virtio/virtio-gpu.h |  6 ++++--

 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c

index 3558f38..55d7640 100644

--- a/hw/display/virtio-gpu-3d.c

+++ b/hw/display/virtio-gpu-3d.c

@@ -86,7 +86,7 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g,

                                        &res_iovs,

                                        &num_iovs);

     if (res_iovs != NULL && num_iovs != 0) {

-        virtio_gpu_cleanup_mapping_iov(res_iovs, num_iovs);

+        virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs);

     }

     virgl_renderer_resource_unref(unref.resource_id);

 }

@@ -291,7 +291,7 @@ static void virgl_resource_attach_backing(VirtIOGPU *g,

     VIRTIO_GPU_FILL_CMD(att_rb);

     trace_virtio_gpu_cmd_res_back_attach(att_rb.resource_id);

-    ret = virtio_gpu_create_mapping_iov(&att_rb, cmd, NULL, &res_iovs);

+    ret = virtio_gpu_create_mapping_iov(g, &att_rb, cmd, NULL, &res_iovs);

     if (ret != 0) {

         cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;

         return;

@@ -301,7 +301,7 @@ static void virgl_resource_attach_backing(VirtIOGPU *g,

                                              res_iovs, att_rb.nr_entries);

     if (ret != 0)

-        virtio_gpu_cleanup_mapping_iov(res_iovs, att_rb.nr_entries);

+        virtio_gpu_cleanup_mapping_iov(g, res_iovs, att_rb.nr_entries);

 }

 static void virgl_resource_detach_backing(VirtIOGPU *g,

@@ -320,7 +320,7 @@ static void virgl_resource_detach_backing(VirtIOGPU *g,

     if (res_iovs == NULL || num_iovs == 0) {

         return;

     }

-    virtio_gpu_cleanup_mapping_iov(res_iovs, num_iovs);

+    virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs);

 }

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c

index 08cd567..cb77ece 100644

--- a/hw/display/virtio-gpu.c

+++ b/hw/display/virtio-gpu.c

@@ -28,7 +28,8 @@

 static struct virtio_gpu_simple_resource*

 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_cleanup_mapping(VirtIOGPU *g,

+                                       struct virtio_gpu_simple_resource *res);

 static void

 virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)

@@ -441,7 +442,7 @@ static void virtio_gpu_resource_destroy(VirtIOGPU *g,

     }

     pixman_image_unref(res->image);

-    virtio_gpu_cleanup_mapping(res);

+    virtio_gpu_cleanup_mapping(g, res);

     QTAILQ_REMOVE(&g->reslist, res, next);

     g->hostmem -= res->hostmem;

     g_free(res);

@@ -687,7 +688,8 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,

     scanout->height = ss.r.height;

 }

-int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab,

+int virtio_gpu_create_mapping_iov(VirtIOGPU *g,

+                                  struct virtio_gpu_resource_attach_backing *ab,

                                   struct virtio_gpu_ctrl_command *cmd,

                                   uint64_t **addr, struct iovec **iov)

 {

@@ -731,7 +733,7 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab,

             qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map MMIO memory for"

                           " resource %d element %d\n",

                           __func__, ab->resource_id, i);

-            virtio_gpu_cleanup_mapping_iov(*iov, i);

+            virtio_gpu_cleanup_mapping_iov(g, *iov, i);

             g_free(ents);

             *iov = NULL;

             if (addr) {

@@ -745,7 +747,8 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab,

     return 0;

 }

-void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count)

+void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,

+                                    struct iovec *iov, uint32_t count)

 {

     int i;

@@ -756,9 +759,10 @@ void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count)

     g_free(iov);

 }

-static void virtio_gpu_cleanup_mapping(struct virtio_gpu_simple_resource *res)

+static void virtio_gpu_cleanup_mapping(VirtIOGPU *g,

+                                       struct virtio_gpu_simple_resource *res)

 {

-    virtio_gpu_cleanup_mapping_iov(res->iov, res->iov_cnt);

+    virtio_gpu_cleanup_mapping_iov(g, res->iov, res->iov_cnt);

     res->iov = NULL;

     res->iov_cnt = 0;

     g_free(res->addrs);

@@ -790,7 +794,7 @@ virtio_gpu_resource_attach_backing(VirtIOGPU *g,

         return;

     }

-    ret = virtio_gpu_create_mapping_iov(&ab, cmd, &res->addrs, &res->iov);

+    ret = virtio_gpu_create_mapping_iov(g, &ab, cmd, &res->addrs, &res->iov);

     if (ret != 0) {

         cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;

         return;

@@ -817,7 +821,7 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g,

         cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;

         return;

     }

-    virtio_gpu_cleanup_mapping(res);

+    virtio_gpu_cleanup_mapping(g, res);

 }

 static void virtio_gpu_simple_process_cmd(VirtIOGPU *g,

@@ -1143,6 +1147,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,

             hwaddr len = res->iov[i].iov_len;

             res->iov[i].iov_base =

                 cpu_physical_memory_map(res->addrs[i], &len, 1);

+

             if (!res->iov[i].iov_base || len != res->iov[i].iov_len) {

                 /* Clean up the half-a-mapping we just created... */

                 if (res->iov[i].iov_base) {

@@ -1151,7 +1156,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,

                 }

                 /* ...and the mappings for previous loop iterations */

                 res->iov_cnt = i;

-                virtio_gpu_cleanup_mapping(res);

+                virtio_gpu_cleanup_mapping(g, res);

                 pixman_image_unref(res->image);

                 g_free(res);

                 return -EINVAL;

diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h

index 22ac3c2..f95f8ce 100644

--- a/include/hw/virtio/virtio-gpu.h

+++ b/include/hw/virtio/virtio-gpu.h

@@ -158,10 +158,12 @@ void virtio_gpu_ctrl_response_nodata(VirtIOGPU *g,

                                      enum virtio_gpu_ctrl_type type);

 void virtio_gpu_get_display_info(VirtIOGPU *g,

                                  struct virtio_gpu_ctrl_command *cmd);

-int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab,

+int virtio_gpu_create_mapping_iov(VirtIOGPU *g,

+                                  struct virtio_gpu_resource_attach_backing *ab,

                                   struct virtio_gpu_ctrl_command *cmd,

                                   uint64_t **addr, struct iovec **iov);

-void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count);

+void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,

+                                    struct iovec *iov, uint32_t count);

 void virtio_gpu_process_cmdq(VirtIOGPU *g);

 /* virtio-gpu-3d.c */

-- 

1.8.3.1