diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-05 10:22:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-05 10:22:47 +0000 |
| commit | 12597061b3fd71f8f97c18acf508241f290d55d5 (patch) | |
| tree | a257c3f419015f36685839bdf0f498474912a4c6 /include/hw | |
| parent | dbe2b65566e76d3c3a0c3358285c0336ac61e757 (diff) | |
| parent | 204f01b30975923c64006f8067f0937b91eea68b (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20170103-1' into staging
virtio-gpu: misc bugfixes.
# gpg: Signature made Tue 03 Jan 2017 14:48:04 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-vga-20170103-1:
virtio-gpu: fix memory leak in resource attach backing
virtio-gpu-3d: fix memory leak in resource attach backing
virtio-gpu: call cleanup mapping function in resource destroy
virtio-gpu: track and limit host memory allocations
display: virtio-gpu-3d: check virgl capabilities max_size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/virtio/virtio-gpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 20d1cd683a..f3a98a3261 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -38,6 +38,7 @@ struct virtio_gpu_simple_resource { unsigned int iov_cnt; uint32_t scanout_bitmask; pixman_image_t *image; + uint64_t hostmem; QTAILQ_ENTRY(virtio_gpu_simple_resource) next; }; @@ -68,6 +69,7 @@ enum virtio_gpu_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_STATS_ENABLED)) struct virtio_gpu_conf { + uint64_t max_hostmem; uint32_t max_outputs; uint32_t flags; }; @@ -103,6 +105,7 @@ typedef struct VirtIOGPU { struct virtio_gpu_requested_state req_state[VIRTIO_GPU_MAX_SCANOUTS]; struct virtio_gpu_conf conf; + uint64_t hostmem; int enabled_output_bitmask; struct virtio_gpu_config virtio_config; |