qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

+1 -1
+1 -1
hw/core/machine.c
··· 53 53 { "secondary-vga", "edid", "false" }, 54 54 { "bochs-display", "edid", "false" }, 55 55 { "virtio-vga", "edid", "false" }, 56 - { "virtio-gpu", "edid", "false" }, 56 + { "virtio-gpu-device", "edid", "false" }, 57 57 { "virtio-device", "use-started", "false" }, 58 58 { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, 59 59 { "pl031", "migrate-tick-offset", "false" },