diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-20 10:15:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-20 10:15:19 +0000 |
| commit | f3949284da77529c68da8be71f182bac1bcc7c3e (patch) | |
| tree | a210dbd98b17fe7166be3958b130d27cafa7c9a0 | |
| parent | e6d567db23219fe9979f16d74e13f27145f07f84 (diff) | |
| parent | 02501fc39381c4dabaf6becdd12c2a4754c3847c (diff) | |
| download | qemu-f3949284da77529c68da8be71f182bac1bcc7c3e.zip qemu-f3949284da77529c68da8be71f182bac1bcc7c3e.tar.gz qemu-f3949284da77529c68da8be71f182bac1bcc7c3e.tar.bz2 | |
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>
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index b958cd1..de0c425 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -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" }, |