[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/7] ccid: build smartcard as module
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 3/7] ccid: build smartcard as module |
Date: |
Thu, 4 Jun 2020 15:16:39 +0200 |
Drops libcacard.so dependency from core qemu.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile.objs | 1 +
hw/core/qdev.c | 2 ++
hw/Makefile.objs | 1 +
hw/usb/Makefile.objs | 4 +++-
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile.objs b/Makefile.objs
index 99774cfd2545..28c165c0e623 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/core/qdev.c b/hw/core/qdev.c
index 7177798840d4..36c301750c31 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -156,6 +156,8 @@ static struct {
const char *type;
const char *mod;
} const hwmodules[] = {
+ { .type = "ccid-card-passthru", .mod = "usb-smartcard" },
+ { .type = "ccid-card-emulated", .mod = "usb-smartcard" },
};
static bool qdev_module_loaded_all;
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 660e2b437348..71843591fe43 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 66835e5bf732..d8e340cd0748 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -28,11 +28,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
--
2.18.4
- [PATCH v2 0/7] build some devices as modules., Gerd Hoffmann, 2020/06/04
- [PATCH v2 2/7] build: fix device module builds, Gerd Hoffmann, 2020/06/04
- [PATCH v2 5/7] vga: build qxl as module, Gerd Hoffmann, 2020/06/04
- [PATCH v2 6/7] vga: build virtio-gpu only once, Gerd Hoffmann, 2020/06/04
- [PATCH v2 7/7] vga: build virtio-gpu as module, Gerd Hoffmann, 2020/06/04
- [PATCH v2 3/7] ccid: build smartcard as module,
Gerd Hoffmann <=
- [PATCH v2 1/7] qdev: add support for device module loading, Gerd Hoffmann, 2020/06/04
- [PATCH v2 4/7] usb: build usb-redir as module, Gerd Hoffmann, 2020/06/04