ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-gpu: pass down VirtIOGPU pointer to a bunch of functions 

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>
This commit is contained in:
Gerd Hoffmann 2018-08-29 14:21:00 +02:00
parent 91155f8bf7
commit 3bb68f798d
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/display/virtio-gpu-3d.c
View File

@ -86,7 +86,7 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g,
&res_iovs, &res_iovs,
&num_iovs); &num_iovs);
if (res_iovs != NULL && num_iovs != 0) { 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); 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); VIRTIO_GPU_FILL_CMD(att_rb);
trace_virtio_gpu_cmd_res_back_attach(att_rb.resource_id); 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) { if (ret != 0) {
cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
return; return;
@ -301,7 +301,7 @@ static void virgl_resource_attach_backing(VirtIOGPU *g,
res_iovs, att_rb.nr_entries); res_iovs, att_rb.nr_entries);
if (ret != 0) 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, 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) { if (res_iovs == NULL || num_iovs == 0) {
return; return;
} }
virtio_gpu_cleanup_mapping_iov(res_iovs, num_iovs); virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs);
} }

25
hw/display/virtio-gpu.c
View File

@ -29,7 +29,8 @@
static struct virtio_gpu_simple_resource* static struct virtio_gpu_simple_resource*
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); 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 static void
virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr) virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
@ -442,7 +443,7 @@ static void virtio_gpu_resource_destroy(VirtIOGPU *g,
} }
pixman_image_unref(res->image); pixman_image_unref(res->image);
virtio_gpu_cleanup_mapping(res); virtio_gpu_cleanup_mapping(g, res);
QTAILQ_REMOVE(&g->reslist, res, next); QTAILQ_REMOVE(&g->reslist, res, next);
g->hostmem -= res->hostmem; g->hostmem -= res->hostmem;
g_free(res); g_free(res);
@ -688,7 +689,8 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,
scanout->height = ss.r.height; 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, struct virtio_gpu_ctrl_command *cmd,
uint64_t **addr, struct iovec **iov) uint64_t **addr, struct iovec **iov)
{ {
@ -732,7 +734,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" qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map MMIO memory for"
" resource %d element %d\n", " resource %d element %d\n",
__func__, ab->resource_id, i); __func__, ab->resource_id, i);
virtio_gpu_cleanup_mapping_iov(*iov, i); virtio_gpu_cleanup_mapping_iov(g, *iov, i);
g_free(ents); g_free(ents);
*iov = NULL; *iov = NULL;
if (addr) { if (addr) {
@ -746,7 +748,8 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab,
return 0; 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; int i;
@ -757,9 +760,10 @@ void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count)
g_free(iov); 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 = NULL;
res->iov_cnt = 0; res->iov_cnt = 0;
g_free(res->addrs); g_free(res->addrs);
@ -791,7 +795,7 @@ virtio_gpu_resource_attach_backing(VirtIOGPU *g,
return; 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) { if (ret != 0) {
cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
return; return;
@ -818,7 +822,7 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g,
cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
return; return;
} }
virtio_gpu_cleanup_mapping(res); virtio_gpu_cleanup_mapping(g, res);
} }
static void virtio_gpu_simple_process_cmd(VirtIOGPU *g, static void virtio_gpu_simple_process_cmd(VirtIOGPU *g,
@ -1144,6 +1148,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
hwaddr len = res->iov[i].iov_len; hwaddr len = res->iov[i].iov_len;
res->iov[i].iov_base = res->iov[i].iov_base =
cpu_physical_memory_map(res->addrs[i], &len, 1); cpu_physical_memory_map(res->addrs[i], &len, 1);
if (!res->iov[i].iov_base || len != res->iov[i].iov_len) { if (!res->iov[i].iov_base || len != res->iov[i].iov_len) {
/* Clean up the half-a-mapping we just created... */ /* Clean up the half-a-mapping we just created... */
if (res->iov[i].iov_base) { if (res->iov[i].iov_base) {
@ -1152,7 +1157,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
} }
/* ...and the mappings for previous loop iterations */ /* ...and the mappings for previous loop iterations */
res->iov_cnt = i; res->iov_cnt = i;
virtio_gpu_cleanup_mapping(res); virtio_gpu_cleanup_mapping(g, res);
pixman_image_unref(res->image); pixman_image_unref(res->image);
g_free(res); g_free(res);
return -EINVAL; return -EINVAL;

6
include/hw/virtio/virtio-gpu.h
View File

@ -159,10 +159,12 @@ void virtio_gpu_ctrl_response_nodata(VirtIOGPU *g,
enum virtio_gpu_ctrl_type type); enum virtio_gpu_ctrl_type type);
void virtio_gpu_get_display_info(VirtIOGPU *g, void virtio_gpu_get_display_info(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd); 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, struct virtio_gpu_ctrl_command *cmd,
uint64_t **addr, struct iovec **iov); 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); void virtio_gpu_process_cmdq(VirtIOGPU *g);
/* virtio-gpu-3d.c */ /* virtio-gpu-3d.c */