diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 13:39:38 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | 53a5500244a9d38505174bac56d81a8be2979f39 (patch) | |
| tree | 1e7730b469b7e7d36e0086f764970b34bc2c0561 | |
| parent | 31e17060829f26292d4095c93e3408d740ce6f3d (diff) | |
hw: move SCSI controllers to hw/scsi/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/ppc/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/scsi/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/scsi/spapr_vscsi.c (renamed from hw/spapr_vscsi.c) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 42c7d08782..2d51ae9b42 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 b76b9c3733..aab0e9b494 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 index e92b09a522..e92b09a522 100644 --- a/hw/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c |