vga: edid compat fix for virtio-gpu

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCgAGBQJedG/bAAoJEEy22O7T6HE47qEP/2zjfg02p+dQ9yFOOLg3bnJl
 hQ+/5NkN6oneB4cm4llAGztjZy7VGvF0kW0Rl0t6x7HTcRDy+cuFKHqtl0/FSZ4O
 K/RPpcbilKUrb9ctLALByqCUGHLLloGoNKrwRiTTxZiefFWdOs4iuxTPphRNbYb3
 Wnt+uA8jBuwRaBUTkRQoI+hT8zxgyTxAf+rq2//oPTNFjWzcn8srqsAalkCDmzAJ
 D1h4XIvod15Tr4b7r1i70dewvMr7Dv0Tu/wv7X7dlQKlJ9Exn15zkyvJnvsJqOrM
 ODcIKVlkcoSaiG1MRwPjh0FidMtbUbA4SHenHO7+xu5+FgVdaa+U1JA/AqgugDjH
 w7TQlhoA2RD2hi8dJJgvxO2RdqDsCwKg9cGv81HJH2qQANJZACPB2IrIOHbYIyTV
 Fn+AeP5MQPR0IqjE9pso2gkboknLxp/IvwP4GQIvUNmcgX+I5cZVxSP1ryJ6js91
 vqf+WAYm3mKTUt5Uq4b9lh7SV7PYvqaU1dQVwvEo7ibOR8uMUd195h4CH5C25zUK
 BhiC6W4eD1zlFNg/y9lGU7dHBEAsZ18kNk20XmUM4O1N2I6IGHIthvjawCA1vOR9
 Qrwbkg6XjUftn/xwTY5cXJStvnNnYG2gWc3vk+IsnmjJv250rNZ3D0Mvmv2Av0Xm
 Nz74HnZV1QxpWiCKWogj
 =k/aZ
 -----END PGP SIGNATURE-----

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>

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" },