compat: disable edid on correct virtio-gpu device

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

Cornelia Huck posted 1 patch 5 years, 8 months ago

Download mbox

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test checkpatch passed

Test FreeBSD passed

Test asan passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200318093919.24942-1-cohuck@redhat.com

Maintainers: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eduardo Habkost <ehabkost@redhat.com>

hw/core/machine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

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

Posted by Cornelia Huck 5 years, 8 months ago

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 <ldoktor@redhat.com>
Tested-by: Lukáš Doktor <ldoktor@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---

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

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

Posted by Philippe Mathieu-Daudé 5 years, 8 months ago

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 <ldoktor@redhat.com>
> Tested-by: Lukáš Doktor <ldoktor@redhat.com>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

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