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