From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 2 Apr 2013 16:58:51 +0200 Message-Id: <1364914749-11141-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 17/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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/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 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 -- 1.8.1.4