Re: [PATCH for-5.0] compat: disable edid on correct virtio-gpu device

[Philippe Mathieu-Daudé]

On 3/18/20 10:39 AM, Cornelia Huck wrote:
> Commit bb15791166c1 ("compat: disable edid on virtio-gpu base
> device") tried to disable 'edid' on the virtio-gpu base device.
> However, that device is not 'virtio-gpu', but 'virtio-gpu-device'.
> Fix it.
>
> Fixes: bb15791166c1 ("compat: disable edid on virtio-gpu base device")
> Reported-by: Lukáš Doktor <address@hidden>
> Tested-by: Lukáš Doktor <address@hidden>
> Cc: address@hidden
> Signed-off-by: Cornelia Huck <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>
> Sorry about my testing failure on the original patch, and thanks
> to Lukáš for finding this.
>
> ---
>   hw/core/machine.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 9e8c06036faf..fa9f50db186e 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" },