aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-06-24 15:10:40 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-07-07 15:33:59 +0200
commit8887312b406f71aee18aeb7e5ac4b18f461f4a79 (patch)
tree9d9eb64a9efbd4a521440db98f4a9ba1e4fe0beb
parentc4ddab7ae5362669837d5d63ccc55f1ffa190eca (diff)
downloadqemu-8887312b406f71aee18aeb7e5ac4b18f461f4a79.zip
qemu-8887312b406f71aee18aeb7e5ac4b18f461f4a79.tar.gz
qemu-8887312b406f71aee18aeb7e5ac4b18f461f4a79.tar.bz2
ccid: build smartcard as module
Drops libcacard.so dependency from core qemu. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20200624131045.14512-6-kraxel@redhat.com
-rw-r--r--Makefile.objs1
-rw-r--r--hw/Makefile.objs1
-rw-r--r--hw/usb/Makefile.objs4
-rw-r--r--util/module.c2
4 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 9838397..3d45492 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -59,6 +59,7 @@ common-obj-y += migration/
common-obj-y += audio/
common-obj-m += audio/
common-obj-y += hw/
+common-obj-m += hw/
common-obj-y += replay/
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 4cbe5e4..af8fd9a 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -43,4 +43,5 @@ devices-dirs-y += smbios/
endif
common-obj-y += $(devices-dirs-y)
+common-obj-m += usb/
obj-y += $(devices-dirs-y)
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index fa5c3fa..3c5b3d4 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -29,11 +29,13 @@ common-obj-$(CONFIG_USB_NETWORK) += dev-network.o
ifeq ($(CONFIG_USB_SMARTCARD),y)
common-obj-y += dev-smartcard-reader.o
-common-obj-$(CONFIG_SMARTCARD) += smartcard.mo
+ifeq ($(CONFIG_SMARTCARD),y)
+common-obj-m += smartcard.mo
smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o
smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
smartcard.mo-libs := $(SMARTCARD_LIBS)
endif
+endif
ifeq ($(CONFIG_POSIX),y)
common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o
diff --git a/util/module.c b/util/module.c
index ee560a4..89da9a3 100644
--- a/util/module.c
+++ b/util/module.c
@@ -261,6 +261,8 @@ static struct {
const char *prefix;
const char *module;
} const qom_modules[] = {
+ { "ccid-card-passthru", "hw-", "usb-smartcard" },
+ { "ccid-card-emulated", "hw-", "usb-smartcard" },
};
static bool module_loaded_qom_all;