From nobody Tue Feb 10 05:41:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527873627738502.15967901429656; Fri, 1 Jun 2018 10:20:27 -0700 (PDT) Received: from localhost ([::1]:56912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnj0-0000hd-CO for importer@patchew.org; Fri, 01 Jun 2018 13:20:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOneC-0006Ae-Jc for qemu-devel@nongnu.org; Fri, 01 Jun 2018 13:15:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOne9-0002QF-DF for qemu-devel@nongnu.org; Fri, 01 Jun 2018 13:15:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53972 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fOne8-0002OM-RT for qemu-devel@nongnu.org; Fri, 01 Jun 2018 13:15:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79B584000B6E for ; Fri, 1 Jun 2018 17:15:24 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-107.ams2.redhat.com [10.36.117.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06EEE217B400 for ; Fri, 1 Jun 2018 17:15:23 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 1 Jun 2018 19:15:20 +0200 Message-Id: <20180601171521.1770-3-pbonzini@redhat.com> In-Reply-To: <20180601171521.1770-1-pbonzini@redhat.com> References: <20180601171521.1770-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 01 Jun 2018 17:15:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 01 Jun 2018 17:15:24 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 55/56] hw: allow compiling out SCSI 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- default-configs/mips-softmmu-common.mak | 1 + default-configs/pci.mak | 1 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/usb.mak | 1 + hw/Makefile.objs | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index e31f046b3b..fae2347ee7 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -4,6 +4,7 @@ include pci.mak include sound.mak include usb.mak CONFIG_ESP=3Dy +CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_ISA_MM=3Dy CONFIG_VGA_CIRRUS=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 35e7596949..163dd814c7 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -15,6 +15,7 @@ CONFIG_PCNET_COMMON=3Dy CONFIG_AC97=3Dy CONFIG_HDA=3Dy CONFIG_ES1370=3Dy +CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy CONFIG_MEGASAS_SCSI_PCI=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index f9e742120c..9159a4a8af 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -2,3 +2,4 @@ =20 CONFIG_SERIAL=3Dy CONFIG_VIRTIO=3Dy +CONFIG_SCSI=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index f9e742120c..9159a4a8af 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -2,3 +2,4 @@ =20 CONFIG_SERIAL=3Dy CONFIG_VIRTIO=3Dy +CONFIG_SCSI=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2f4bfe73b4..729033b25a 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -2,6 +2,7 @@ CONFIG_PCI=3Dy CONFIG_VIRTIO_PCI=3D$(CONFIG_PCI) CONFIG_VHOST_USER_SCSI=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VHOST_USER_BLK=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) +CONFIG_SCSI=3Dy CONFIG_VIRTIO=3Dy CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 004b0f4e77..12f97eeb20 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,6 +2,7 @@ =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/usb.mak b/default-configs/usb.mak index f4b85684f0..e42cfeabbe 100644 --- a/default-configs/usb.mak +++ b/default-configs/usb.mak @@ -3,6 +3,7 @@ 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 diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6a0ffe0afd..a19c1417ed 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -23,7 +23,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D nvram/ devices-dirs-$(CONFIG_SOFTMMU) +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ devices-dirs-$(CONFIG_SOFTMMU) +=3D pcmcia/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D scsi/ +devices-dirs-$(CONFIG_SCSI) +=3D scsi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D sd/ devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ --=20 2.17.0