Commit 8887312b authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ccid: build smartcard as module 



Drops libcacard.so dependency from core qemu.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20200624131045.14512-6-kraxel@redhat.com
parent c4ddab7a

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -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/

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -43,4 +43,5 @@ devices-dirs-y += smbios/ 
endif



common-obj-y += $(devices-dirs-y)

common-obj-m += usb/

obj-y += $(devices-dirs-y)

hw/usb/Makefile.objs

+3 −1
Original line number Diff line number Diff line
@@ -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

util/module.c

+2 −0
Original line number Diff line number Diff line
@@ -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;