From nobody Mon Feb 9 22:19:56 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548411805703541.042063901766; Fri, 25 Jan 2019 02:23:25 -0800 (PST) Received: from localhost ([127.0.0.1]:41467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmydh-00039U-In for importer@patchew.org; Fri, 25 Jan 2019 05:23:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP0-0007rB-0M for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOw-000254-73 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOv-000245-ST for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: by mail-wr1-x441.google.com with SMTP id f7so9672681wrp.1 for ; Fri, 25 Jan 2019 02:07:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9caWpS0esp4P7Bw71XiGE+lryaZFUg00jlBeTlZJ+CI=; b=Ba0soBF1wQtwsd/bpr9stKQm5LmLDpRekMFhHF7GvWPmu1MS+LiRR0yUaGqJLJQja0 KmUqjzJDSLyMTqY5SheeBW+1XpTIw+caDWj8FqCuwUKW/htAWDwEMhHA6NT6QKpnKbz+ vH+8LV8siqMbejxK+NjPzaPM3fWfq8ulFOm7f7VRxUeG/o5/Whtzcd66rN5NsmCT2Fx8 cQxlyHGJfe9ivF071lIaQZZd8E6ILH/qFaiids76hpvzFbzIU80F5ySJ388jLWk1eAv+ 4zyqHCCJzgqSjHDQgTuCk6QWFrovzd2wIXGFtywsZiFETz7kaY2FDedzCkGbNxfjRt+L V8xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9caWpS0esp4P7Bw71XiGE+lryaZFUg00jlBeTlZJ+CI=; b=VEcfYBlkWS4lyMQd5cwal9+FRkYysokClm9atqCjYq9Ro4xCnmzB4niFSQ9S3sBgy8 2RAle48xgPovaa2WLRccMhaz2P5ku+JGL64IgBEitV9bZ4q8yq+wwLXJGw1/Re+LfV29 HJ/sCJR389y43qtnXI+xiiLtjoQzwozfKYgsoy+7Rnn/gmeuoTyLqegmA/nNWA/DLmLJ hfOGpFphtY0e5h4HLq57EAxr2TmY98lszhfZ7iBpFuLNv6wg1atSGpZCC8K5B4QjLbBK 8TdjsNq5+jrHhf5a5RMdhfHs3NSuSu8IMP7N1bpGUpBXWhzt0fQMtaozKXGF/PdzPuyT efwg== X-Gm-Message-State: AJcUukciYkXxMm13AUdJQ48WBtlf4Bm4mCGSHdUuQgg2FPqRs2T8Fh9r pjj40tjOaZJyK6vYCmeJGlUEHOrb X-Google-Smtp-Source: ALg8bN6Cw2wW2fg6o8Zwp9sr3GhD01LbHDnHB8VfzC+CPFQJ4lxSbr3HOsSerjiP667kTyc874U+Wg== X-Received: by 2002:adf:c452:: with SMTP id a18mr10964988wrg.145.1548410872528; Fri, 25 Jan 2019 02:07:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:58 +0100 Message-Id: <1548410831-19553-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 39/52] build: convert usb.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of including the same list of devices for each target, let the host controllers select CONFIG_USB and make the devices default to present whenever USB is available. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on USB' \ `grep -lw $i hw/*/Kconfig` done < default-configs/usb.mak followed by adding "select USB" on the host controllers. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-33-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/riscv32-softmmu.mak | 1 - default-configs/riscv64-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/usb.mak | 11 ----------- hw/usb/Kconfig | 26 ++++++++++++++++++++++++++ 13 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index a7b4a87..f44c5bc 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for alpha-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 0109e68..07d0a62 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for arm-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy @@ -38,7 +37,6 @@ CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB=3Dy CONFIG_USB_MUSB=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 1594760..d30b12a 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 9eb9351..4073c62 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy -include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 981ea2c..e5f0841 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,5 @@ # Common mips*-softmmu CONFIG defines =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index dba071a..c60a483 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for ppc-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 0459d43..7446fc8 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 09a5b5e..e37a532 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4eb-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index d5e4a73..4a6e997 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sparc64-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfea..0000000 --- a/default-configs/usb.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_USB=3Dy -CONFIG_USB_TABLET_WACOM=3Dy -CONFIG_USB_STORAGE_BOT=3Dy -CONFIG_USB_STORAGE_UAS=3Dy -CONFIG_USB_STORAGE_MTP=3Dy -CONFIG_SCSI=3Dy -CONFIG_USB_SMARTCARD=3Dy -CONFIG_USB_AUDIO=3Dy -CONFIG_USB_SERIAL=3Dy -CONFIG_USB_NETWORK=3Dy -CONFIG_USB_BLUETOOTH=3Dy diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 86ee615..e20670a 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,59 +5,85 @@ config USB_UHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_OHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_MUSB bool + select USB =20 config TUSB6010 bool + select USB_MUSB =20 config USB_TABLET_WACOM bool + default y + depends on USB =20 config USB_STORAGE_BOT bool + default y + depends on USB =20 config USB_STORAGE_UAS bool + default y + depends on USB =20 config USB_AUDIO bool + default y + depends on USB =20 config USB_SERIAL bool + default y + depends on USB =20 config USB_NETWORK bool + default y + depends on USB =20 config USB_BLUETOOTH bool + default y + depends on USB =20 config USB_SMARTCARD bool + default y + depends on USB =20 config USB_STORAGE_MTP bool + default y + depends on USB --=20 1.8.3.1