yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 92d723eb5a17c33f9b446f59ebc453c05614a6ac Mon Sep 17 00:00:00 2001
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Sat, 2 Nov 2013 15:24:00 +0100
218e99
Subject: [PATCH 51/81] rhel: Make "ccid-card-emulated" device unavailable
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1383405840-6221-2-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 55273
218e99
O-Subject: [PATCH 7.0 qemu-kvm 1/1] rhel: Make "ccid-card-emulated" device unavailable
218e99
Bugzilla: 1001123
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 just --disable-smartcard-nss, because that also disables
218e99
libcacard.  Instead, make it unavailable with -device / device_add.
218e99
Suffices, because there's no other way to get it: the device model
218e99
defines no external symbols, and the driver name doesn't occur in code
218e99
outside the device model.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
---
218e99
 hw/usb/ccid-card-emulated.c | 2 ++
218e99
 1 file changed, 2 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/usb/ccid-card-emulated.c |    2 ++
218e99
 1 files changed, 2 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
218e99
index aa913df..037a9ec 100644
218e99
--- a/hw/usb/ccid-card-emulated.c
218e99
+++ b/hw/usb/ccid-card-emulated.c
218e99
@@ -595,6 +595,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data)
218e99
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
218e99
     dc->desc = "emulated smartcard";
218e99
     dc->props = emulated_card_properties;
218e99
+    /* Disabled for Red Hat Enterprise Linux: */
218e99
+    dc->cannot_instantiate_with_device_add_yet = true;
218e99
 }
218e99
 
218e99
 static const TypeInfo emulated_card_info = {
218e99
-- 
218e99
1.7.1
218e99