mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccid: build smartcard as module

Browse Source 
Drops libcacard.so dependency from core qemu.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-6-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-06-24 15:10:40 +02:00
parent c4ddab7ae5
commit 8887312b40
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -59,6 +59,7 @@ common-obj-y += migration/
common-obj-y += audio/ common-obj-y += audio/
common-obj-m += audio/ common-obj-m += audio/
common-obj-y += hw/ common-obj-y += hw/
common-obj-m += hw/
common-obj-y += replay/ common-obj-y += replay/

1
hw/Makefile.objs
View File

@ -43,4 +43,5 @@ devices-dirs-y += smbios/
endif endif
common-obj-y += $(devices-dirs-y) common-obj-y += $(devices-dirs-y)
common-obj-m += usb/
obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y)

4
hw/usb/Makefile.objs
View File

@ -29,11 +29,13 @@ common-obj-$(CONFIG_USB_NETWORK) += dev-network.o
ifeq ($(CONFIG_USB_SMARTCARD),y) ifeq ($(CONFIG_USB_SMARTCARD),y)
common-obj-y += dev-smartcard-reader.o 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-objs := ccid-card-passthru.o ccid-card-emulated.o
smartcard.mo-cflags := $(SMARTCARD_CFLAGS) smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
smartcard.mo-libs := $(SMARTCARD_LIBS) smartcard.mo-libs := $(SMARTCARD_LIBS)
endif endif
endif
ifeq ($(CONFIG_POSIX),y) ifeq ($(CONFIG_POSIX),y)
common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o

2
util/module.c
View File

@ -261,6 +261,8 @@ static struct {
const char *prefix; const char *prefix;
const char *module; const char *module;
} const qom_modules[] = { } const qom_modules[] = {
{ "ccid-card-passthru", "hw-", "usb-smartcard" },
{ "ccid-card-emulated", "hw-", "usb-smartcard" },
}; };
static bool module_loaded_qom_all; static bool module_loaded_qom_all;