From nobody Sat Sep 28 14:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154822835577683.78308886975958; Tue, 22 Jan 2019 23:25:55 -0800 (PST) Received: from localhost ([127.0.0.1]:57145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCv4-0007lF-QA for importer@patchew.org; Wed, 23 Jan 2019 02:25:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCWO-000560-Gs for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCWM-0003s3-58 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:23 -0500 Received: from mga18.intel.com ([134.134.136.126]:36921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCWL-0002NF-Pc for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:22 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2019 22:59:33 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:59:31 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="129981008" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:07 +0800 Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123065618.3520-1-yang.zhong@intel.com> References: <20190123065618.3520-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [RFC PATCH v4 33/44] scsi: express dependencies with 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, peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, sameo@linux.intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong --- hw/scsi/Kconfig | 12 ++++++++++++ hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 812a12522b..7a9d373382 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -5,24 +5,29 @@ config LSI_SCSI_PCI bool default y depends on PCI + select SCSI =20 config MPTSAS_SCSI_PCI bool default y depends on PCI + select SCSI =20 config MEGASAS_SCSI_PCI bool default y depends on PCI + select SCSI =20 config VMW_PVSCSI_SCSI_PCI bool default y depends on PCI + select SCSI =20 config ESP bool + select SCSI =20 config ESP_PCI bool @@ -30,8 +35,15 @@ config ESP_PCI depends on PCI select ESP =20 +config SPAPR_VSCSI + bool + depends on PSERIES + select SCSI + config VIRTIO_SCSI bool + default y + select SCSI =20 config VHOST_USER_SCSI bool diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 45167baeaf..54b36ed8b1 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_MEGASAS_SCSI_PCI) +=3D megasas.o common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) +=3D vmw_pvscsi.o common-obj-$(CONFIG_ESP) +=3D esp.o common-obj-$(CONFIG_ESP_PCI) +=3D esp-pci.o -obj-$(CONFIG_PSERIES) +=3D spapr_vscsi.o +obj-$(CONFIG_SPAPR_VSCSI) +=3D spapr_vscsi.o =20 ifeq ($(CONFIG_VIRTIO_SCSI),y) obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 0b8f41040e..db46c56cc8 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -52,11 +52,13 @@ config USB_STORAGE_BOT bool default y depends on USB + select SCSI =20 config USB_STORAGE_UAS bool default y depends on USB + select SCSI =20 config USB_AUDIO bool --=20 2.17.1