| Message ID | 20200624131045.14512-7-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | build some devices as modules. | expand |
On 2020-06-24 at 15:10 CEST, Gerd Hoffmann wrote... > Drops libusbredirparser.so dependency from core qemu. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > util/module.c | 1 + > hw/usb/Makefile.objs | 9 ++++++--- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/util/module.c b/util/module.c > index 89da9a3cce05..e3226165e91c 100644 > --- a/util/module.c > +++ b/util/module.c > @@ -263,6 +263,7 @@ static struct { > } const qom_modules[] = { > { "ccid-card-passthru", "hw-", "usb-smartcard" }, > { "ccid-card-emulated", "hw-", "usb-smartcard" }, > + { "usb-redir", "hw-", "usb-redirect" }, > }; > > static bool module_loaded_qom_all; > diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs > index 3c5b3d4fadd3..e342ff59fab0 100644 > --- a/hw/usb/Makefile.objs > +++ b/hw/usb/Makefile.objs > @@ -43,9 +43,12 @@ endif > > # usb redirection > ifeq ($(CONFIG_USB),y) > -common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o > -redirect.o-cflags = $(USB_REDIR_CFLAGS) > -redirect.o-libs = $(USB_REDIR_LIBS) > +ifeq ($(CONFIG_USB_REDIR),y) > +common-obj-m += redirect.mo > +redirect.mo-objs = redirect.o quirks.o > +redirect.mo-cflags = $(USB_REDIR_CFLAGS) > +redirect.mo-libs = $(USB_REDIR_LIBS) > +endif > endif > > # usb pass-through With the same questions as for earlier patches Reviewed-by: Christophe de Dinechin <dinechin@redhat.com> -- Cheers, Christophe de Dinechin (IRC c3d)
diff --git a/util/module.c b/util/module.c index 89da9a3cce05..e3226165e91c 100644 --- a/util/module.c +++ b/util/module.c @@ -263,6 +263,7 @@ static struct { } const qom_modules[] = { { "ccid-card-passthru", "hw-", "usb-smartcard" }, { "ccid-card-emulated", "hw-", "usb-smartcard" }, + { "usb-redir", "hw-", "usb-redirect" }, }; static bool module_loaded_qom_all; diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 3c5b3d4fadd3..e342ff59fab0 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -43,9 +43,12 @@ endif # usb redirection ifeq ($(CONFIG_USB),y) -common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o -redirect.o-cflags = $(USB_REDIR_CFLAGS) -redirect.o-libs = $(USB_REDIR_LIBS) +ifeq ($(CONFIG_USB_REDIR),y) +common-obj-m += redirect.mo +redirect.mo-objs = redirect.o quirks.o +redirect.mo-cflags = $(USB_REDIR_CFLAGS) +redirect.mo-libs = $(USB_REDIR_LIBS) +endif endif # usb pass-through
Drops libusbredirparser.so dependency from core qemu. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- util/module.c | 1 + hw/usb/Makefile.objs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)