From nobody Sun Oct 5 01:45:06 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 1551727004760543.1614516071002; Mon, 4 Mar 2019 11:16:44 -0800 (PST) Received: from localhost ([127.0.0.1]:59456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t4o-00076P-Mf for importer@patchew.org; Mon, 04 Mar 2019 14:16:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCY-0001vI-P0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCX-00043A-NS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:53710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCX-00041w-FU for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: by mail-wm1-x331.google.com with SMTP id e74so128151wmg.3 for ; Mon, 04 Mar 2019 10:20:33 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:31 -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=lQL/WRYyKDvlCzl/yZrwMJpoLii/Q0sHCHlYx97lY8g=; b=dpibq+S/gjJBNzEdDA4NafRBCKwIR3zj3yDiemnyyjUtYoeEh/UhWKc9MUJ7ygzCEh aFm4BJEw/wWaJg904pNajB4iwYZd37jcMhD5p1eo/gIgfwxVJxsfIMvyr6FnF2+ZdCNv 3stb7qSfSo3JeNd2xbYEzPzMsX7GVZ7LEhA3VeowTtv5mLnu9aj665xrqyuvZVHVHw2H CZtN3fdB1AGlAdVhfCxVZxf5gL45Mm5i+QOYJtsh5hde5jrM5AE6wQTknlVX+18fZsGC X3IXULgUaETRm72rfA+n5eXu4xcHi3WnhzKjPj+fhF47hCMARW/2QahTH4hBTm/9pbsv Ekcw== 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=lQL/WRYyKDvlCzl/yZrwMJpoLii/Q0sHCHlYx97lY8g=; b=bzdIMMHgZ4+pry4a52j+xmbPeUUbzslvC8/9bQNGC0FEYzUtsQd96J2LAhzai/VECX QkpXzykLKhOgGpNVb/ZCelz233jPSDK07zmd0WUVV8vxl559TDmV7mdQqbBvAevdcPcm O6Ap/osnCWH8wbUZ6uPBSDHBdZHXOBotAdWeWVUf5fSxEZRA8d4GFKpSfaGdX9hEHwe8 B+lsoAA5Bh27Cd4Mz7D9UYS3yUmFZLNfQ7nI7dV+lz4Qly0Xc5mxoDwklT6z82Mt99YD 6024MaHV8G6IPiiBCNQrWYJreuRyuor2M+ky+QU6v6bUi1IGLOR2DuPdrZtGaxDXF6rZ Tcbw== X-Gm-Message-State: APjAAAUgt9FoxoFNUHPpuQz9eB4R8FwALZN3J3uFeHcYJ2Ok/Gafguu4 iXj00Kv9H+zMH3cFyKPS3swnMORT X-Google-Smtp-Source: APXvYqwd5AORupugdySrt5SDB5EZkyXQkQ+q/1wp6C+R9oKCql4n15tUEs0iTyV4wwnXzoxknMisnA== X-Received: by 2002:a1c:a9d0:: with SMTP id s199mr274919wme.142.1551723632219; Mon, 04 Mar 2019 10:20:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:37 +0100 Message-Id: <1551723614-1823-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-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::331 Subject: [Qemu-devel] [PULL 17/54] 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 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 | 7 +++++++ hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index e9a972f..7b7c040 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -166,5 +166,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 85a2011..221c609 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -8,7 +8,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 6d5882b..556cd5c 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -5,7 +5,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 5a2930c..7e6d467 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -7,6 +7,5 @@ CONFIG_EDID=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 8144ccb..a696ff0 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,9 +39,11 @@ config SPAPR_VSCSI bool default y depends on PSERIES + select SCSI =20 config VIRTIO_SCSI bool + select SCSI =20 config VHOST_USER_SCSI bool 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 86ee615..071e749 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -40,9 +40,11 @@ config USB_TABLET_WACOM =20 config USB_STORAGE_BOT bool + select SCSI =20 config USB_STORAGE_UAS bool + select SCSI =20 config USB_AUDIO bool --=20 1.8.3.1