From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 20 Mar 2020 10:15:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200320-pull-request' into... 
X-Git-Tag: v5.0.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3949284da77529c68da8be71f182bac1bcc7c3e;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200320-pull-request' into staging

vga: edid compat fix for virtio-gpu

# gpg: Signature made Fri 20 Mar 2020 07:25:15 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-20200320-pull-request:
  compat: disable edid on correct virtio-gpu device

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

f3949284da77529c68da8be71f182bac1bcc7c3e