[Qemu-commits] [qemu/qemu] ca26b0: vhost-user-gpu: Drop trailing json comma

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ca26b032e5a0e8a190c763ce828a8740d24b9b65
      
https://github.com/qemu/qemu/commit/ca26b032e5a0e8a190c763ce828a8740d24b9b65
  Author: Cole Robinson <address@hidden>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M contrib/vhost-user-gpu/50-qemu-gpu.json.in

  Log Message:
  -----------
  vhost-user-gpu: Drop trailing json comma

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 <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0d82411d0e38a0de7829f97d04406765c8d2210d
      
https://github.com/qemu/qemu/commit/0d82411d0e38a0de7829f97d04406765c8d2210d
  Author: Cameron Esfahani <address@hidden>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M hw/display/bochs-display.c

  Log Message:
  -----------
  display/bochs-display: fix memory leak

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

Fixes: 33ebad54056
Signed-off-by: Cameron Esfahani <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4affd48bfede47d67115e382be0ad73a8b2d2fe1
      
https://github.com/qemu/qemu/commit/4affd48bfede47d67115e382be0ad73a8b2d2fe1
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-03 (Fri, 03 Jan 2020)

  Changed paths:
    M contrib/vhost-user-gpu/50-qemu-gpu.json.in
    M hw/display/bochs-display.c

  Log Message:
  -----------
  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) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1010af540b8b...4affd48bfede