cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ddf19c
From 441128e2f13a56d4949b70971edd2f6902772959 Mon Sep 17 00:00:00 2001
ddf19c
From: Gerd Hoffmann <kraxel@redhat.com>
ddf19c
Date: Wed, 3 Jun 2020 15:15:56 +0100
ddf19c
Subject: [PATCH 01/17] enable ramfb
ddf19c
ddf19c
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
ddf19c
Message-id: <20200603151556.1195-2-kraxel@redhat.com>
ddf19c
Patchwork-id: 97097
ddf19c
O-Subject: [RHEL-AV-8.2.0.z qemu-kvm PATCH 1/1] enable ramfb
ddf19c
Bugzilla: 1841068
ddf19c
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
ddf19c
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
ddf19c
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ddf19c
ddf19c
---
ddf19c
 hw/vfio/pci.c            | 5 -----
ddf19c
 hw/display/Makefile.objs | 5 ++---
ddf19c
 2 files changed, 2 insertions(+), 8 deletions(-)
ddf19c
ddf19c
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ddf19c
---
ddf19c
 hw/display/Makefile.objs | 5 ++---
ddf19c
 hw/vfio/pci.c            | 5 -----
ddf19c
 2 files changed, 2 insertions(+), 8 deletions(-)
ddf19c
ddf19c
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
ddf19c
index 3d0cda1..f2182e3 100644
ddf19c
--- a/hw/display/Makefile.objs
ddf19c
+++ b/hw/display/Makefile.objs
ddf19c
@@ -1,9 +1,8 @@
ddf19c
 common-obj-$(CONFIG_DDC) += i2c-ddc.o
ddf19c
 common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o
ddf19c
 
ddf19c
-# Disabled for Red Hat Enterprise Linux
ddf19c
-#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
ddf19c
-#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
ddf19c
+common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
ddf19c
+common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
ddf19c
 
ddf19c
 common-obj-$(CONFIG_ADS7846) += ads7846.o
ddf19c
 common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
ddf19c
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
ddf19c
index d717520..f191904 100644
ddf19c
--- a/hw/vfio/pci.c
ddf19c
+++ b/hw/vfio/pci.c
ddf19c
@@ -3249,7 +3249,6 @@ static const TypeInfo vfio_pci_dev_info = {
ddf19c
     },
ddf19c
 };
ddf19c
 
ddf19c
-#if 0 /* Disabled for Red Hat Enterprise Linux */
ddf19c
 static Property vfio_pci_dev_nohotplug_properties[] = {
ddf19c
     DEFINE_PROP_BOOL("ramfb", VFIOPCIDevice, enable_ramfb, false),
ddf19c
     DEFINE_PROP_END_OF_LIST(),
ddf19c
@@ -3269,15 +3268,11 @@ static const TypeInfo vfio_pci_nohotplug_dev_info = {
ddf19c
     .instance_size = sizeof(VFIOPCIDevice),
ddf19c
     .class_init = vfio_pci_nohotplug_dev_class_init,
ddf19c
 };
ddf19c
-#endif
ddf19c
 
ddf19c
 static void register_vfio_pci_dev_type(void)
ddf19c
 {
ddf19c
     type_register_static(&vfio_pci_dev_info);
ddf19c
-
ddf19c
-#if 0 /* Disabled for Red Hat Enterprise Linux */
ddf19c
     type_register_static(&vfio_pci_nohotplug_dev_info);
ddf19c
-#endif
ddf19c
 }
ddf19c
 
ddf19c
 type_init(register_vfio_pci_dev_type)
ddf19c
-- 
ddf19c
1.8.3.1
ddf19c