diff options
| author | Peter Maydell | 2021-06-16 15:32:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-06-16 15:32:43 +0200 |
| commit | e3897b75fd2ac8c4bfda95d60309cb6414da8000 (patch) | |
| tree | ce7a8e70732b9d71563d363510b27b4eb51bae7e /contrib/vhost-user-gpu/vhost-user-gpu.c | |
| parent | Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-06-15-1... (diff) | |
| parent | virtio-gpu: move scanout_id sanity check (diff) | |
| download | qemu-e3897b75fd2ac8c4bfda95d60309cb6414da8000.tar.gz qemu-e3897b75fd2ac8c4bfda95d60309cb6414da8000.tar.xz qemu-e3897b75fd2ac8c4bfda95d60309cb6414da8000.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210615-pull-request' into staging
vga: fixes for stdvga, vhost-user-gpu and virtio-gpu.
# gpg: Signature made Tue 15 Jun 2021 18:40:11 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20210615-pull-request:
virtio-gpu: move scanout_id sanity check
vhost-user-gpu: reorder free calls.
vga: Allow writing VBE_DISPI_ID5 to ID register
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib/vhost-user-gpu/vhost-user-gpu.c')
| -rw-r--r-- | contrib/vhost-user-gpu/vhost-user-gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c index 6dc6a44f4e..611360e6b4 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -350,8 +350,8 @@ vg_resource_create_2d(VuGpu *g, if (!res->image) { g_critical("%s: resource creation failed %d %d %d", __func__, c2d.resource_id, c2d.width, c2d.height); - g_free(res); vugbm_buffer_destroy(&res->buffer); + g_free(res); cmd->error = VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY; return; } |