hw: move SCSI controllers to hw/scsi/, configure via default-configs/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 42c7d087823fb354c0c065c1afa20b007e689077..2d51ae9b42f57c9dbb0c1c9c8fcbc12118c6fe8a 100644 (file)
--- 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 b76b9c3733c981502ab426d09e4d79cebbf035ce..aab0e9b494c3d54899558d3846ccff7649c0cd6c 100644 (file)
--- 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