|
 |
9ae3a8 |
From 300a7cf7103f2bad1767dbb9f4a805bb2199fb7f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 2 Nov 2013 15:39:00 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 62/81] rhel: Make "pci-serial-2x" and "pci-serial-4x" device unavailable
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1383406740-6461-2-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55276
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 1/1] rhel: Make "pci-serial-2x" and "pci-serial-4x" device unavailable
|
|
|
9ae3a8 |
Bugzilla: 1001180
|
|
|
9ae3a8 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
We can't just drop CONFIG_SERIAL_PCI, because we still want
|
|
|
9ae3a8 |
"pci-serial". Instead, make them unavailable with -device /
|
|
|
9ae3a8 |
device_add. Suffices, because there's no other way to get it: the
|
|
|
9ae3a8 |
device model defines no external symbols, and the driver name doesn't
|
|
|
9ae3a8 |
occur in code outside the device model.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/char/serial-pci.c | 4 ++++
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/char/serial-pci.c | 4 ++++
|
|
|
9ae3a8 |
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
|
|
|
9ae3a8 |
index 77fec01..bfe686b 100644
|
|
|
9ae3a8 |
--- a/hw/char/serial-pci.c
|
|
|
9ae3a8 |
+++ b/hw/char/serial-pci.c
|
|
|
9ae3a8 |
@@ -207,6 +207,8 @@ static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9ae3a8 |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
9ae3a8 |
dc->props = multi_2x_serial_pci_properties;
|
|
|
9ae3a8 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
9ae3a8 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9ae3a8 |
+ dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9ae3a8 |
@@ -222,6 +224,8 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9ae3a8 |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
9ae3a8 |
dc->props = multi_4x_serial_pci_properties;
|
|
|
9ae3a8 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
9ae3a8 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9ae3a8 |
+ dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const TypeInfo serial_pci_info = {
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|