From patchwork Wed Nov 24 11:16:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 72852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D97B4B70A3 for ; Wed, 24 Nov 2010 23:19:57 +1100 (EST) Received: from localhost ([127.0.0.1]:42815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLDoQ-0008T1-Gd for incoming@patchwork.ozlabs.org; Wed, 24 Nov 2010 06:46:58 -0500 Received: from [140.186.70.92] (port=53565 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLDI3-00068V-Fi for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLDHw-0005op-QH for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:31 -0500 Received: from cantor.suse.de ([195.135.220.2]:60542 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLDHw-0005o3-GX for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:24 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 133BC947EC; Wed, 24 Nov 2010 12:13:23 +0100 (CET) From: Hannes Reinecke To: qemu-devel@nongnu.org Date: Wed, 24 Nov 2010 12:16:10 +0100 Message-Id: <1290597370-21365-16-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290597370-21365-1-git-send-email-hare@suse.de> References: <1290597370-21365-1-git-send-email-hare@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: stefanha@gmail.com, nab@linux-iscsi.org, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 15/15] Make SCSI HBA configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch introduces configuration variables CONFIG_SCSI_LSI CONFIG_SCSI_MEGASAS and renames the existing CONFIG_ESP to CONFIG_SCSI_ESP. With this the available SCSI HBAs can be configured for each target configuration instead of compiling it in for everyone. Signed-off-by: Hannes Reinecke Acked-By: Paolo Bonzini Acked-by: Jes Sorensen --- Makefile.objs | 5 +++-- default-configs/i386-softmmu.mak | 2 ++ default-configs/mips-softmmu.mak | 2 +- default-configs/mips64-softmmu.mak | 2 +- default-configs/mips64el-softmmu.mak | 2 +- default-configs/mipsel-softmmu.mak | 2 +- default-configs/ppc-softmmu.mak | 2 ++ default-configs/ppc64-softmmu.mak | 2 ++ default-configs/ppcemb-softmmu.mak | 2 ++ default-configs/sparc-softmmu.mak | 2 +- default-configs/sparc64-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 2 ++ 12 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 89c8661..3b040cd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -231,8 +231,9 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o hw-obj-$(CONFIG_IDE_VIA) += ide/via.o # SCSI layer -hw-obj-y += lsi53c895a.o megasas.o -hw-obj-$(CONFIG_ESP) += esp.o +hw-obj-$(CONFIG_SCSI_LSI) += lsi53c895a.o +hw-obj-$(CONFIG_SCSI_MEGASAS) += megasas.o +hw-obj-$(CONFIG_SCSI_ESP) += esp.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o hw-obj-y += qdev-addr.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index ed00471..130c157 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -19,6 +19,8 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 3d0af83..7e840a4 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for mips-softmmu CONFIG_ISA_MMIO=y -CONFIG_ESP=y +CONFIG_SCSI_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 0030de4..3816be3 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for mips64-softmmu CONFIG_ISA_MMIO=y -CONFIG_ESP=y +CONFIG_SCSI_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index fa2a3ff..21c59e0 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for mips64el-softmmu CONFIG_ISA_MMIO=y -CONFIG_ESP=y +CONFIG_SCSI_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 238b73a..3cf853a 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for mipsel-softmmu CONFIG_ISA_MMIO=y -CONFIG_ESP=y +CONFIG_SCSI_ESP=y CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 940f4bf..0cc5914 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y CONFIG_IDE_MACIO=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_VIRTIO_PCI=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index e1bc6b8..ce83254 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y CONFIG_IDE_MACIO=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_VIRTIO_PCI=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 8f1cc09..44111c3 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -29,6 +29,8 @@ CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y CONFIG_IDE_MACIO=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_VIRTIO_PCI=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index becf880..872929d 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for sparc-softmmu CONFIG_ECC=y -CONFIG_ESP=y +CONFIG_SCSI_ESP=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_PTIMER=y diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index 1cc3f13..b4a3c27 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -13,4 +13,6 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_VIRTIO_PCI=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 5183203..f28b66d 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -19,6 +19,8 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y +CONFIG_SCSI_LSI=y +CONFIG_SCSI_MEGASAS=y CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y