|
 |
d81766 |
From a5d74cbfb850a57c04e03241eeeeef81dc8cbdfd Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Date: Sat, 2 Nov 2013 15:24:00 +0100
|
|
|
d81766 |
Subject: rhel: Make "ccid-card-emulated" device unavailable
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Message-id: <1383405840-6221-2-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 55273
|
|
|
d81766 |
O-Subject: [PATCH 7.0 qemu-kvm 1/1] rhel: Make "ccid-card-emulated" device unavailable
|
|
|
d81766 |
Bugzilla: 1001123
|
|
|
d81766 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
We can't just --disable-smartcard-nss, because that also disables
|
|
|
d81766 |
libcacard. Instead, make it unavailable with -device / device_add.
|
|
|
d81766 |
Suffices, because there's no other way to get it: the device model
|
|
|
d81766 |
defines no external symbols, and the driver name doesn't occur in code
|
|
|
d81766 |
outside the device model.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
|
|
|
d81766 |
index aa1c37a..17921a3 100644
|
|
|
d81766 |
--- a/hw/usb/ccid-card-emulated.c
|
|
|
d81766 |
+++ b/hw/usb/ccid-card-emulated.c
|
|
|
d81766 |
@@ -586,6 +586,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data)
|
|
|
d81766 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
d81766 |
dc->desc = "emulated smartcard";
|
|
|
d81766 |
dc->props = emulated_card_properties;
|
|
|
d81766 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
d81766 |
+ dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
d81766 |
}
|
|
|
d81766 |
|
|
|
d81766 |
static const TypeInfo emulated_card_info = {
|