[PULL 0/2] Vga 20191220 patches

[PULL 0/2] Vga 20191220 patches

[Gerd Hoffmann]

The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:

  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/vga-20191220-pull-request

for you to fetch changes up to 0d82411d0e38a0de7829f97d04406765c8d2210d:

  display/bochs-display: fix memory leak (2019-12-20 07:05:46 +0100)

----------------------------------------------------------------
vga: two little bugfixes.

----------------------------------------------------------------

Cameron Esfahani (1):
  display/bochs-display: fix memory leak

Cole Robinson (1):
  vhost-user-gpu: Drop trailing json comma

 hw/display/bochs-display.c                 | 2 ++
 contrib/vhost-user-gpu/50-qemu-gpu.json.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.18.1

[PULL 1/2] vhost-user-gpu: Drop trailing json comma

[Gerd Hoffmann]

From: Cole Robinson <crobinso@redhat.com>

Trailing comma is not valid json:

$ cat contrib/vhost-user-gpu/50-qemu-gpu.json.in | jq
parse error: Expected another key-value pair at line 5, column 1

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 7f5dd2ac9f3504e2699f23e69bc3d8051b729832.1568925097.git.crobinso@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 contrib/vhost-user-gpu/50-qemu-gpu.json.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/vhost-user-gpu/50-qemu-gpu.json.in b/contrib/vhost-user-gpu/50-qemu-gpu.json.in
index 658b545864b1..f5edd097f805 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"
 }
-- 
2.18.1

[PULL 2/2] display/bochs-display: fix memory leak

[Gerd Hoffmann]

From: Cameron Esfahani <dirty@apple.com>

Fix memory leak in bochs_display_update().  Leaks 304 bytes per frame.

Fixes: 33ebad54056
Signed-off-by: Cameron Esfahani <dirty@apple.com>
Message-Id: <d6c26e68db134c7b0c7ce8b61596ca2e65e01e12.1576013209.git.dirty@apple.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/bochs-display.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index dc1bd1641d34..215db9a231d3 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);
     }
 }
 
-- 
2.18.1

Re: [PULL 0/2] Vga 20191220 patches

[Peter Maydell]

On Fri, 20 Dec 2019 at 06:08, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:
>
>   Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20191220-pull-request
>
> for you to fetch changes up to 0d82411d0e38a0de7829f97d04406765c8d2210d:
>
>   display/bochs-display: fix memory leak (2019-12-20 07:05:46 +0100)
>
> ----------------------------------------------------------------
> vga: two little bugfixes.
>
> ----------------------------------------------------------------
>
> Cameron Esfahani (1):
>   display/bochs-display: fix memory leak
>
> Cole Robinson (1):
>   vhost-user-gpu: Drop trailing json comma
>
>  hw/display/bochs-display.c                 | 2 ++
>  contrib/vhost-user-gpu/50-qemu-gpu.json.in | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM