From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 Jan 2020 14:29:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20191220-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4affd48bfede47d67115e382be0ad73a8b2d2fe1;p=qemu.git

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>
---

4affd48bfede47d67115e382be0ad73a8b2d2fe1