From 8f9f4d8d52ebb7878543ac0b84cc372477041e33 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@redhat.com>
Date: Wed, 1 Apr 2020 16:13:50 -0400
Subject: [PATCH 2/2] compat: disable 'edid' for virtio-gpu-ccw

RH-Author: Cornelia Huck <cohuck@redhat.com>
Message-id: <20200401161350.20462-1-cohuck@redhat.com>
Patchwork-id: 94523
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH v2] compat: disable 'edid' for virtio-gpu-ccw
Bugzilla: 1816793
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816793
Branch: rhel-av-8.2.1
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=27629804
Upstream: downstream only
Tested: verified that for a virtio-gpu-ccw device 'edid' is false with
        a s390-ccw-virtio-rhel7.6.0 machine and true with a
        s390-ccw-virtio-rhel8.2.0 (s390x does not have the 8.0 or 8.1
        machine types)

hw_compat_rhel_8_0 copied the original upstream version of
disabling 'edid' for virtio-gpu-pci only (not following later
changes). Switch it to virtio-gpu-device, following upstream
02501fc39381 ("compat: disable edid on correct virtio-gpu device").

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Jon Maloy <jmaloy.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 e0e0eec8bf..5a025d1af2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -72,7 +72,7 @@ GlobalProperty hw_compat_rhel_8_0[] = {
     /* hw_compat_rhel_8_0 from hw_compat_4_0 */
     { "virtio-vga",     "edid", "false" },
     /* hw_compat_rhel_8_0 from hw_compat_4_0 */
-    { "virtio-gpu-pci", "edid", "false" },
+    { "virtio-gpu-device", "edid", "false" },
     /* hw_compat_rhel_8_0 from hw_compat_4_0 */
     { "virtio-device", "use-started", "false" },
     /* hw_compat_rhel_8_0 from hw_compat_3_1 - that was added in 4.1 */
-- 
2.18.2