From nobody Thu May 2 01:14:54 2024 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152701869082581.84641332235174; Tue, 22 May 2018 12:51:30 -0700 (PDT) Received: from localhost ([::1]:57623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDJV-0003TB-TB for importer@patchew.org; Tue, 22 May 2018 15:51:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLDIA-0002tL-8D for qemu-devel@nongnu.org; Tue, 22 May 2018 15:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLDI6-00014d-Ao for qemu-devel@nongnu.org; Tue, 22 May 2018 15:49:54 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:42858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLDI6-00014R-5S for qemu-devel@nongnu.org; Tue, 22 May 2018 15:49:50 -0400 Received: by mail-pl0-x242.google.com with SMTP id u6-v6so11509619pls.9 for ; Tue, 22 May 2018 12:49:50 -0700 (PDT) Received: from donizetti.event.priv ([72.28.93.232]) by smtp.gmail.com with ESMTPSA id d19-v6sm45704656pfk.59.2018.05.22.12.49.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 12:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=qSTAvThd3YyrLgmN7LQoBxaEdcy6l1/WMexWSohWspw=; b=B/w8MJcqfu+FxeEm/MFD9pllxlPNKezjydntoAGuLG6pZwlJMcu4CcCq6oXDKYgWJ/ hLCgZjmZ1bR2MhpsvfV1oNmUTNajj0kUb+irDjJrA/cESk+lDM0wY6/UYpDxUIfVH421 iuk93RinxIyVnOIZetTNPmGrzZSCxnY2tjGgapgti3NQtpcKerGWVrFk3KF98j64Qlxw awe+LDOQ7VWDhIH0iFtGRa3S5FNxPs3TD6kVQEOPqZbOyIDspxuuZxiaVknpDh9PRY/s uomOFaRzMU/BW7DL491QyM1i+l/N55yJizicFoM5WHanDUgTc8SqbZFrugyE1ZvSJ+2H qnHw== 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:subject:date:message-id; bh=qSTAvThd3YyrLgmN7LQoBxaEdcy6l1/WMexWSohWspw=; b=Ill5+cF1vIW4DWau5UPN5uAAgwkui8me0CNqFBf0uCErOYPb9HPProFNE39cfVE0Ma 2czz4aqRPDjLv1rDVm89i1bjsEY63RqBlWuQNDMaurHGmVVxVD+3WT/oUY7NNYJZ41AG vHKAwonoqbW4xrpDwYD4V36dGf+HR3k+ico/wjSyCSQLEUS5XRZqWeJZaXPCron/DMmf ht6uFQL5U6PZhC/b1h2b5bM4iCRv1Rtv4Zncy139lmbzEu9kco+7c/mExJPzNvU3+W0g BjU1dUYUHt9tGUAh5+2CsJ/2funJbqc7K/PqtPtVuVZjCd07pdjZzn8ErgsIwbG9nBaq Q0Yw== X-Gm-Message-State: ALKqPwcPu6dd9WBKOYFAfhS20GHBzykIPVUasSVqAVO5fBYETQb5CoBN AKf1VapWOIkcoXXru6FOCGQDhUCj X-Google-Smtp-Source: AB8JxZrcdtOa781amcKwv6qd1+hPbrft/NCjfcGJGRElnqrA2hnZECFCwBQN0K0xCGh7VmP22zZReA== X-Received: by 2002:a17:902:758d:: with SMTP id j13-v6mr18480625pll.188.1527018588726; Tue, 22 May 2018 12:49:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 May 2018 21:49:43 +0200 Message-Id: <20180522194943.24871-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH] 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-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- 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