|
 |
ddf19c |
From 8f9f4d8d52ebb7878543ac0b84cc372477041e33 Mon Sep 17 00:00:00 2001
|
|
|
ddf19c |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
ddf19c |
Date: Wed, 1 Apr 2020 16:13:50 -0400
|
|
|
ddf19c |
Subject: [PATCH 2/2] compat: disable 'edid' for virtio-gpu-ccw
|
|
|
ddf19c |
|
|
|
ddf19c |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
ddf19c |
Message-id: <20200401161350.20462-1-cohuck@redhat.com>
|
|
|
ddf19c |
Patchwork-id: 94523
|
|
|
ddf19c |
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH v2] compat: disable 'edid' for virtio-gpu-ccw
|
|
|
ddf19c |
Bugzilla: 1816793
|
|
|
ddf19c |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
ddf19c |
|
|
|
ddf19c |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1816793
|
|
|
ddf19c |
Branch: rhel-av-8.2.1
|
|
|
ddf19c |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=27629804
|
|
|
ddf19c |
Upstream: downstream only
|
|
|
ddf19c |
Tested: verified that for a virtio-gpu-ccw device 'edid' is false with
|
|
|
ddf19c |
a s390-ccw-virtio-rhel7.6.0 machine and true with a
|
|
|
ddf19c |
s390-ccw-virtio-rhel8.2.0 (s390x does not have the 8.0 or 8.1
|
|
|
ddf19c |
machine types)
|
|
|
ddf19c |
|
|
|
ddf19c |
hw_compat_rhel_8_0 copied the original upstream version of
|
|
|
ddf19c |
disabling 'edid' for virtio-gpu-pci only (not following later
|
|
|
ddf19c |
changes). Switch it to virtio-gpu-device, following upstream
|
|
|
ddf19c |
02501fc39381 ("compat: disable edid on correct virtio-gpu device").
|
|
|
ddf19c |
|
|
|
ddf19c |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
ddf19c |
Signed-off-by: Jon Maloy <jmaloy.redhat.com>
|
|
|
ddf19c |
---
|
|
|
ddf19c |
hw/core/machine.c | 2 +-
|
|
|
ddf19c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ddf19c |
|
|
|
ddf19c |
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
|
ddf19c |
index e0e0eec8bf..5a025d1af2 100644
|
|
|
ddf19c |
--- a/hw/core/machine.c
|
|
|
ddf19c |
+++ b/hw/core/machine.c
|
|
|
ddf19c |
@@ -72,7 +72,7 @@ GlobalProperty hw_compat_rhel_8_0[] = {
|
|
|
ddf19c |
/* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
|
ddf19c |
{ "virtio-vga", "edid", "false" },
|
|
|
ddf19c |
/* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
|
ddf19c |
- { "virtio-gpu-pci", "edid", "false" },
|
|
|
ddf19c |
+ { "virtio-gpu-device", "edid", "false" },
|
|
|
ddf19c |
/* hw_compat_rhel_8_0 from hw_compat_4_0 */
|
|
|
ddf19c |
{ "virtio-device", "use-started", "false" },
|
|
|
ddf19c |
/* hw_compat_rhel_8_0 from hw_compat_3_1 - that was added in 4.1 */
|
|
|
ddf19c |
--
|
|
|
ddf19c |
2.18.2
|
|
|
ddf19c |
|