Commit f3949284 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e6d567db 02501fc3

hw/core/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ GlobalProperty hw_compat_4_0[] = { 
    { "secondary-vga",  "edid", "false" },

    { "bochs-display",  "edid", "false" },

    { "virtio-vga",     "edid", "false" },

    { "virtio-gpu",     "edid", "false" },

    { "virtio-gpu-device", "edid", "false" },

    { "virtio-device", "use-started", "false" },

    { "virtio-balloon-device", "qemu-4-0-config-size", "true" },

    { "pl031", "migrate-tick-offset", "false" },