From nobody Mon Feb 9 18:46:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597766358; cv=none; d=zohomail.com; s=zohoarc; b=PpDJDHRHWwlBsyrVDSiqscEjDQ2g7Mae0I4K9fjD+GF1bgrbkXru13gXWprD6jt+QByCbNOvl8fseRnmW7c2bzj9LJEWAhh2pi7asYbQhvw/wXNq7OgpPo9qHyYWIL6rvLen6K5TW5sCfVpn4BEad1V+4069Cip8D+tUOiCoYGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597766358; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xSqAU3Pxu473TbSHUkuXD1dkTAtrfiq11xcUgepKnmE=; b=jlJ5IQrJ9e54tjAf9HmTEqk3ZPznoj7LqnOiqw8qDfBWQkMW8mvtj/gJdhxOohExw+opbOcfWFPgtzlIdYlhpD4jTIBNpSXJaPr9sjTYbYQA3CU444uE2GM03AQaZQxnDiWGn5TA0AJ9NQsG3/5s6WkezZrOPj7lt1aOn2A2VGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597766358856365.7252552100506; Tue, 18 Aug 2020 08:59:18 -0700 (PDT) Received: from localhost ([::1]:43082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k83Bx-0004jj-Ms for importer@patchew.org; Tue, 18 Aug 2020 11:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82Le-0005wi-G5 for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:12:22 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32228 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82LL-0007a7-QU for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:12:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-yQLzy-K0NdGVSDcIzIhB7A-1; Tue, 18 Aug 2020 10:11:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 00B7380F041 for ; Tue, 18 Aug 2020 14:11:45 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id A302C165D8; Tue, 18 Aug 2020 14:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xSqAU3Pxu473TbSHUkuXD1dkTAtrfiq11xcUgepKnmE=; b=Y6PGvDq6BEWQWsCc1ERJBPHxMAsuX4mU7027zGf1aGA1JHfvPgMnVzjndyuFu+8MKJ26G4 s5cYMIoDLZA64dpotMZ01oMVzo5J4oae6nzXAx++3KfEBdGpaXLsfuWTXtkDVPXbnCYJXM J10N2wVtBzVVbSb6nE7d9Nd+BcmX4s4= X-MC-Unique: yQLzy-K0NdGVSDcIzIhB7A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 094/150] meson: convert hw/usb Date: Tue, 18 Aug 2020 10:09:29 -0400 Message-Id: <20200818141025.21608-95-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 02:16:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.target | 1 + hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/usb/Makefile.objs | 71 -------------------------------------------- hw/usb/meson.build | 69 ++++++++++++++++++++++++++++++++++++++++++ meson.build | 15 ++++++++++ 6 files changed, 86 insertions(+), 72 deletions(-) delete mode 100644 hw/usb/Makefile.objs create mode 100644 hw/usb/meson.build diff --git a/Makefile.target b/Makefile.target index 386378b9c8..3d5a2af4af 100644 --- a/Makefile.target +++ b/Makefile.target @@ -168,6 +168,7 @@ endif LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) = $(SECCOMP_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) LIBS :=3D $(LIBS) $(VDE_LIBS) $(SLIRP_LIBS) +LIBS :=3D $(LIBS) $(LIBUSB_LIBS) $(SMARTCARD_LIBS) $(USB_REDIR_LIBS) =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index f6e08f6660..c2619bbb50 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,6 @@ devices-dirs-y +=3D sd/ devices-dirs-y +=3D ssi/ devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ -devices-dirs-y +=3D usb/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 4dafc8a08e..89bd6adb70 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -3,6 +3,7 @@ subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') +subdir('usb') subdir('vfio') subdir('virtio') subdir('watchdog') diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs deleted file mode 100644 index e342ff59fa..0000000000 --- a/hw/usb/Makefile.objs +++ /dev/null @@ -1,71 +0,0 @@ -# usb subsystem core -common-obj-y +=3D core.o combined-packet.o bus.o libhw.o -common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o - -# usb host adapters -common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o -common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o -common-obj-$(CONFIG_USB_OHCI_PCI) +=3D hcd-ohci-pci.o -common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o -common-obj-$(CONFIG_USB_EHCI_PCI) +=3D hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o -common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o -common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o -common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o -common-obj-$(CONFIG_USB_DWC2) +=3D hcd-dwc2.o - -common-obj-$(CONFIG_TUSB6010) +=3D tusb6010.o -common-obj-$(CONFIG_IMX) +=3D chipidea.o - -# emulated usb devices -common-obj-$(CONFIG_USB) +=3D dev-hub.o -common-obj-$(CONFIG_USB) +=3D dev-hid.o -common-obj-$(CONFIG_USB_TABLET_WACOM) +=3D dev-wacom.o -common-obj-$(CONFIG_USB_STORAGE_BOT) +=3D dev-storage.o -common-obj-$(CONFIG_USB_STORAGE_UAS) +=3D dev-uas.o -common-obj-$(CONFIG_USB_AUDIO) +=3D dev-audio.o -common-obj-$(CONFIG_USB_SERIAL) +=3D dev-serial.o -common-obj-$(CONFIG_USB_NETWORK) +=3D dev-network.o - -ifeq ($(CONFIG_USB_SMARTCARD),y) -common-obj-y +=3D dev-smartcard-reader.o -ifeq ($(CONFIG_SMARTCARD),y) -common-obj-m +=3D smartcard.mo -smartcard.mo-objs :=3D ccid-card-passthru.o ccid-card-emulated.o -smartcard.mo-cflags :=3D $(SMARTCARD_CFLAGS) -smartcard.mo-libs :=3D $(SMARTCARD_LIBS) -endif -endif - -ifeq ($(CONFIG_POSIX),y) -common-obj-$(CONFIG_USB_STORAGE_MTP) +=3D dev-mtp.o -endif - -# usb redirection -ifeq ($(CONFIG_USB),y) -ifeq ($(CONFIG_USB_REDIR),y) -common-obj-m +=3D redirect.mo -redirect.mo-objs =3D redirect.o quirks.o -redirect.mo-cflags =3D $(USB_REDIR_CFLAGS) -redirect.mo-libs =3D $(USB_REDIR_LIBS) -endif -endif - -# usb pass-through -ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) -common-obj-y +=3D host-libusb.o -else -common-obj-y +=3D host-stub.o -endif -common-obj-$(CONFIG_ALL) +=3D host-stub.o - -host-libusb.o-cflags :=3D $(LIBUSB_CFLAGS) -host-libusb.o-libs :=3D $(LIBUSB_LIBS) - -ifeq ($(CONFIG_USB_LIBUSB),y) -common-obj-$(CONFIG_XEN) +=3D xen-usb.o -xen-usb.o-cflags :=3D $(LIBUSB_CFLAGS) -xen-usb.o-libs :=3D $(LIBUSB_LIBS) -endif - -common-obj-$(CONFIG_IMX_USBPHY) +=3D imx-usb-phy.o diff --git a/hw/usb/meson.build b/hw/usb/meson.build new file mode 100644 index 0000000000..3c44a1b069 --- /dev/null +++ b/hw/usb/meson.build @@ -0,0 +1,69 @@ +hw_usb_modules =3D {} + +# usb subsystem core +softmmu_ss.add(files( + 'bus.c', + 'combined-packet.c', + 'core.c', + 'libhw.c' +)) + +softmmu_ss.add(when: 'CONFIG_USB', if_true: files( + 'desc.c', + 'desc-msos.c', +)) + +# usb host adapters +softmmu_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c')) +softmmu_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c')) +softmmu_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c'= , 'hcd-ehci-sysbus.c')) +softmmu_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c')) +softmmu_ss.add(when: 'CONFIG_USB_XHCI_NEC', if_true: files('hcd-xhci-nec.c= ')) +softmmu_ss.add(when: 'CONFIG_USB_MUSB', if_true: files('hcd-musb.c')) +softmmu_ss.add(when: 'CONFIG_USB_DWC2', if_true: files('hcd-dwc2.c')) + +softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c')) +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c')) +softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c')) + +# emulated usb devices +softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c')) +softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hid.c')) +softmmu_ss.add(when: 'CONFIG_USB_TABLET_WACOM', if_true: files('dev-wacom.= c')) +softmmu_ss.add(when: 'CONFIG_USB_STORAGE_BOT', if_true: files('dev-storage= .c')) +softmmu_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c')) +softmmu_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c')) +softmmu_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c')) +softmmu_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c')) +softmmu_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: = files('dev-mtp.c')) + +# smartcard +softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard= -reader.c')) + +if config_host.has_key('CONFIG_SMARTCARD') + usbsmartcard_ss =3D ss.source_set() + usbsmartcard_ss.add(when: 'CONFIG_USB_SMARTCARD', + if_true: [cacard, files('ccid-card-emulated.c', 'cci= d-card-passthru.c')]) + hw_usb_modules +=3D {'smartcard': usbsmartcard_ss} +endif + +# usb redirect +if config_host.has_key('CONFIG_USB_REDIR') + usbredir_ss =3D ss.source_set() + usbredir_ss.add(when: 'CONFIG_USB', + if_true: [usbredir, files('redirect.c', 'quirks.c')]) + hw_usb_modules +=3D {'redirect': usbredir_ss} +endif + +# usb pass-through +softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_USB_LIBUSB', libusb], + if_true: files('host-libusb.c'), + if_false: files('host-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('host-stub.c')) + +softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true: files(= 'xen-usb.c')) + +modules +=3D { 'hw-usb': hw_usb_modules } diff --git a/meson.build b/meson.build index c6a8c9f648..d0671f88d7 100644 --- a/meson.build +++ b/meson.build @@ -327,6 +327,21 @@ if 'CONFIG_XEN_BACKEND' in config_host xen =3D declare_dependency(compile_args: config_host['XEN_CFLAGS'].split= (), link_args: config_host['XEN_LIBS'].split()) endif +cacard =3D not_found +if 'CONFIG_SMARTCARD' in config_host + cacard =3D declare_dependency(compile_args: config_host['SMARTCARD_CFLAG= S'].split(), + link_args: config_host['SMARTCARD_LIBS'].spl= it()) +endif +usbredir =3D not_found +if 'CONFIG_USB_REDIR' in config_host + usbredir =3D declare_dependency(compile_args: config_host['USB_REDIR_CFL= AGS'].split(), + link_args: config_host['USB_REDIR_LIBS'].s= plit()) +endif +libusb =3D not_found +if 'CONFIG_USB_LIBUSB' in config_host + libusb =3D declare_dependency(compile_args: config_host['LIBUSB_CFLAGS']= .split(), + link_args: config_host['LIBUSB_LIBS'].split(= )) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') --=20 2.26.2