yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-rhel-Make-isa-cirrus-vga-device-unavailable.patch

9ae3a8
From 76ec45c8db5e4654a02c296ce7bc610c5be60bdb Mon Sep 17 00:00:00 2001
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
Date: Sat, 2 Nov 2013 15:05:07 +0100
9ae3a8
Subject: [PATCH 50/81] rhel: Make "isa-cirrus-vga" device unavailable
9ae3a8
9ae3a8
RH-Author: Markus Armbruster <armbru@redhat.com>
9ae3a8
Message-id: <1383404707-6015-3-git-send-email-armbru@redhat.com>
9ae3a8
Patchwork-id: 55270
9ae3a8
O-Subject: [PATCH 7.0 qemu-kvm 2/2] rhel: Make "isa-cirrus-vga" device unavailable
9ae3a8
Bugzilla: 1001088
9ae3a8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
9ae3a8
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
9ae3a8
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
9ae3a8
We can't drop it, because the ISA device is entangled with the PCI
9ae3a8
device, which we want to keep.  Disentangling it upstream would be
9ae3a8
nice, but we're out of time.
9ae3a8
9ae3a8
Instead, make it unavailable with -device / device_add.  Suffices,
9ae3a8
because the only other way to get it is via pc_vga_init() calling
9ae3a8
isa_vga_init(), which it never does in RHEL, because it never gets a
9ae3a8
null pci_bus argument.
9ae3a8
9ae3a8
Signed-off-by: Markus Armbruster <armbru@redhat.com>
9ae3a8
---
9ae3a8
 hw/display/cirrus_vga.c | 2 ++
9ae3a8
 1 file changed, 2 insertions(+)
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 hw/display/cirrus_vga.c |    2 ++
9ae3a8
 1 files changed, 2 insertions(+), 0 deletions(-)
9ae3a8
9ae3a8
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
9ae3a8
index a7634ba..bfaa0b0 100644
9ae3a8
--- a/hw/display/cirrus_vga.c
9ae3a8
+++ b/hw/display/cirrus_vga.c
9ae3a8
@@ -2937,6 +2937,8 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
9ae3a8
     k->init   = vga_initfn;
9ae3a8
     dc->props = isa_cirrus_vga_properties;
9ae3a8
     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
9ae3a8
+    /* Disabled for Red Hat Enterprise Linux: */
9ae3a8
+    dc->cannot_instantiate_with_device_add_yet = true;
9ae3a8
 }
9ae3a8
 
9ae3a8
 static const TypeInfo isa_cirrus_vga_info = {
9ae3a8
-- 
9ae3a8
1.7.1
9ae3a8