From nobody Fri Dec 19 07:47:14 2025 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; dkim=fail; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562661767645.2784814436604; Thu, 7 Feb 2019 10:04:21 -0800 (PST) Received: from localhost ([127.0.0.1]:44520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro28-0006sw-LO for importer@patchew.org; Thu, 07 Feb 2019 13:04:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001wx-0L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvt-0002HI-U2 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvt-0002Fj-Ln for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: by mail-wm1-x342.google.com with SMTP id p6so828571wmc.1 for ; Thu, 07 Feb 2019 09:57:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57: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=bgVghyGwuem/CESAEZhzXUipZkkWpaSUEcbSTh1s2lA=; b=cNIyzPjxe4keZ7Re8XwN+X33q7NthgtZcdTUGZjrC0V1E6/FuiQtNwYjMW04r2Qq5k vb08QpnDuKWAcvc3tSe59niNFMnDrAcno3gE41m8kbB6DMMlwWC8TEBgw9MmHkPyuZwy XiTJYxih+NqhYqWO7ncJ6q/GiYoU/qXtEihxcDUQh7O8iIaMBGn/TPcaWZaEFdW/vaiU yPtdHgLTWuu6aTu1bH34GxWZsAUrm91amrXRjS33GusjLNq2g0/ZhBoB3o1rw7GUIffs XfhTIQLNgPI61rPzJmR4OKPG/oXjHBomSyOX8aWPtso3naMmFIi4kaZ1a55V44rAykeg kemA== 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=bgVghyGwuem/CESAEZhzXUipZkkWpaSUEcbSTh1s2lA=; b=k1izlWKYQAaTL2LnMbhGdVTQkN1s7zrOU6ZNilNqOqDt5zzGXb5cL1DDUHisOTZDLD 4K2PwFwt+3AzFOYMRKiB57Nn9Sz6lCMQfHUvcZhVDIi61zJDv0BubswPmx3+CDdN4IBB wey9e2CDg1w8ZhGNWAR332/U4Be+i2Y6iBGaQ72/LiyPNweCwhwMzD0u0Ww7BBpb2VH2 QfcnLmNeRODjSEEWTkfvlgy+cSAHWlTxqtsnbBh8FB9SzRfi9DEozary0ENiSus3PHsa iIFubhgpUNjFOo4Wy1TgJ5+WklHoAFZoH1jja3aaFAlgyX2La9qHj3ySjrFo6sPQKrGD urgA== X-Gm-Message-State: AHQUAua+vjhYxJXFX8kRVOy4xExA8AnTWkuFHa8PZay/ZTc6QpXprTB5 VIG3VSouCS9LA8f9scQTP/gfasgg X-Google-Smtp-Source: AHgI3IZwe4NtJvDSrldHdHmu2yrvTzi5poPPRsP73JWo2YdM3BFEnEJty0TCQHxBGSRvF18jdnuaVg== X-Received: by 2002:a7b:c75a:: with SMTP id w26mr4585951wmk.35.1549562272363; Thu, 07 Feb 2019 09:57:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:58 +0100 Message-Id: <1549562254-41157-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::342 Subject: [Qemu-devel] [PATCH 15/51] 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 , thuth@redhat.com, philmd@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" 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 Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/hppa-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/virtio.mak | 1 - hw/scsi/Kconfig | 10 +++++++++- hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 901f42a..44acb5a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -163,5 +163,4 @@ CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy =20 # for realview and versatilepb -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 5089a94..b7f2b43 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -7,7 +7,6 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 90a2412..a7a8d4e 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -4,7 +4,6 @@ CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy -CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_ISA_MM=3Dy CONFIG_VGA_CIRRUS=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 59a4a3d..805c400 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_ISA_BUS=3Dy CONFIG_ECC=3Dy -CONFIG_SCSI=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 51599ed..82d0726 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -7,6 +7,5 @@ CONFIG_VIRTIO_GPU=3Dy CONFIG_VIRTIO_INPUT=3Dy CONFIG_VIRTIO_NET=3Dy CONFIG_VIRTIO_RNG=3Dy -CONFIG_SCSI=3Dy CONFIG_VIRTIO_SCSI=3Dy CONFIG_VIRTIO_SERIAL=3Dy diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index a7d25d3..b9cf269 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -5,24 +5,29 @@ config LSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MPTSAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MEGASAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config VMW_PVSCSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config ESP bool + select SCSI =20 config ESP_PCI bool @@ -34,11 +39,14 @@ config SPAPR_VSCSI bool default y depends on PSERIES + select SCSI =20 config VIRTIO_SCSI bool + select SCSI =20 config VHOST_USER_SCSI bool - default y + # Only PCI devices are provided for now + default y if VIRTIO_PCI depends on VHOST_USER && LINUX diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 45167ba..54b36ed 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 e20670a..a1b7acb 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 1.8.3.1