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