diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-03 14:29:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-03 14:29:42 +0000 |
| commit | 4affd48bfede47d67115e382be0ad73a8b2d2fe1 (patch) | |
| tree | 5bf63cfd7f46842177a630a6032111370b1cd556 | |
| parent | 1010af540b8bdd54ba05cf5567fd85aafa76dd7d (diff) | |
| parent | 0d82411d0e38a0de7829f97d04406765c8d2210d (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20191220-pull-request' into staging
vga: two little bugfixes.
# gpg: Signature made Fri 20 Dec 2019 06:06:04 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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-20191220-pull-request:
display/bochs-display: fix memory leak
vhost-user-gpu: Drop trailing json comma
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | contrib/vhost-user-gpu/50-qemu-gpu.json.in | 2 | ||||
| -rw-r--r-- | hw/display/bochs-display.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/vhost-user-gpu/50-qemu-gpu.json.in b/contrib/vhost-user-gpu/50-qemu-gpu.json.in index 658b545864..f5edd097f8 100644 --- a/contrib/vhost-user-gpu/50-qemu-gpu.json.in +++ b/contrib/vhost-user-gpu/50-qemu-gpu.json.in @@ -1,5 +1,5 @@ { "description": "QEMU vhost-user-gpu", "type": "gpu", - "binary": "@libexecdir@/vhost-user-gpu", + "binary": "@libexecdir@/vhost-user-gpu" } diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index dc1bd1641d..215db9a231 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -252,6 +252,8 @@ static void bochs_display_update(void *opaque) dpy_gfx_update(s->con, 0, ys, mode.width, y - ys); } + + g_free(snap); } } |