From patchwork Tue Apr 2 14:58:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DCC42C0147 for ; Wed, 3 Apr 2013 02:02:21 +1100 (EST) Received: from localhost ([::1]:40902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2j5-00009w-LK for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:02:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gm-0005gu-Ed for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2gl-0001OG-68 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:56 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:43180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gk-0001O3-Vp for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:55 -0400 Received: by mail-ee0-f50.google.com with SMTP id e53so282787eek.37 for ; Tue, 02 Apr 2013 07:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=LzDKcsqSpiF4C01LqVj9WRxnRKornuWJt+6uVS+sjZc=; b=j/qI7MRBTnEDB2Ge+PbtFO/3Ij72DlQOSmHE4XByqjEpBpGXbDwKqJyQQzBLeKdqXC NbBXAOHgjM46S/dEW3guz/rYEu08KrqyQMhkPooiWRZPyvLadCgwZdHqLPIxL83EBzPl sLm+X4yvvh1n9/lacw1r1v0C/vbuKh4IQTvn17ueZYeAw28FmW+WR6KyhM/ZINvZD26f jNyR/2Xs/p8XZwVuvhhQpFBDrPvUgjByZXOVIyLsrjbZf1o6yK0Lqv6+gMNLj1YvYCed /YqzBe4tqCfD6WcGzykPzg/MknKoJlOWx4OlCqkx6ELtXtJ0Zv7KV53a5j6iqPtdDkNK aC+w== X-Received: by 10.14.1.130 with SMTP id 2mr49759229eed.15.1364914794202; Tue, 02 Apr 2013 07:59:54 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.07.59.52 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 07:59:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:58:51 +0200 Message-Id: <1364914749-11141-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.50 Subject: [Qemu-devel] [PATCH 17/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/ppc/Makefile.objs | 2 +- hw/scsi/Makefile.objs | 1 + hw/{ => scsi}/spapr_vscsi.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename hw/{ => scsi}/spapr_vscsi.c (100%) diff --git a/hw/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c similarity index 100% rename from hw/spapr_vscsi.c rename to hw/scsi/spapr_vscsi.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 42c7d08..2d51ae9 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,5 @@ # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_vscsi.o +obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_PSERIES) += spapr_pci.o obj-$(CONFIG_PSERIES) += spapr_nvram.o # PowerPC 4xx boards diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index b76b9c3..aab0e9b 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -4,4 +4,5 @@ common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o common-obj-$(CONFIG_ESP) += esp.o common-obj-$(CONFIG_ESP_PCI) += esp-pci.o +obj-$(CONFIG_PSERIES) += spapr_vscsi.o obj-$(CONFIG_VIRTIO) += virtio-scsi.o