[PULL 0/1] Vga 20200320 patches

[PULL 0/1] Vga 20200320 patches

[Gerd Hoffmann]

The following changes since commit e6d567db23219fe9979f16d74e13f27145f07f84:

  Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2020-03-19 15:31:09 +0000)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/vga-20200320-pull-request

for you to fetch changes up to 02501fc39381c4dabaf6becdd12c2a4754c3847c:

  compat: disable edid on correct virtio-gpu device (2020-03-20 07:50:52 +0100)

----------------------------------------------------------------
vga: edid compat fix for virtio-gpu

----------------------------------------------------------------

Cornelia Huck (1):
  compat: disable edid on correct virtio-gpu device

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

-- 
2.18.2

[PULL 1/1] compat: disable edid on correct virtio-gpu device

[Gerd Hoffmann]

From: Cornelia Huck <cohuck@redhat.com>

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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-id: 20200318093919.24942-1-cohuck@redhat.com
Cc: qemu-stable@nongnu.org
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 b958cd1b991b..de0c42560534 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.18.2

Re: [PULL 0/1] Vga 20200320 patches

[Peter Maydell]

On Fri, 20 Mar 2020 at 07:27, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit e6d567db23219fe9979f16d74e13f27145f07f84:
>
>   Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2020-03-19 15:31:09 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20200320-pull-request
>
> for you to fetch changes up to 02501fc39381c4dabaf6becdd12c2a4754c3847c:
>
>   compat: disable edid on correct virtio-gpu device (2020-03-20 07:50:52 +0100)
>
> ----------------------------------------------------------------
> vga: edid compat fix for virtio-gpu
>
> ----------------------------------------------------------------
>
> Cornelia Huck (1):
>   compat: disable edid on correct virtio-gpu device
>
>  hw/core/machine.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM