On Wed, Mar 07, 2018 at 10:08:14AM +0100, Thomas Huth wrote: > The global hack for creating SCSI devices has recently been removed, > but this apparently broke SCSI devices on some boards that were not > ready for this change yet. For the 40p machine you now get: > > $ ppc64-softmmu/qemu-system-ppc64 -M 40p -cdrom x.iso > qemu-system-ppc64: -cdrom x.iso: machine type does not support > if=scsi,bus=0,unit=2 > > Fix it by providing a lsi53c810_create() function that takes care > of calling scsi_bus_legacy_handle_cmdline() after creating the > corresponding SCSI controller. > > Fixes: 1454509726719e0933c800fad00d6999752688ea > Signed-off-by: Thomas Huth <th...@redhat.com>
Applied, thanks. > --- > hw/ppc/prep.c | 2 +- > hw/scsi/lsi53c895a.c | 7 +++++++ > include/hw/pci/pci.h | 1 + > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index 096d4d4..3361509 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -788,7 +788,7 @@ static void ibm_40p_init(MachineState *machine) > qdev_prop_set_uint32(dev, "equipment", 0xc0); > qdev_init_nofail(dev); > > - pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "lsi53c810"); > + lsi53c810_create(pci_bus, PCI_DEVFN(1, 0)); > > /* XXX: s3-trio at PCI_DEVFN(2, 0) */ > pci_vga_init(pci_bus); > diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c > index f3d4c4d..160657f 100644 > --- a/hw/scsi/lsi53c895a.c > +++ b/hw/scsi/lsi53c895a.c > @@ -2279,3 +2279,10 @@ void lsi53c895a_create(PCIBus *bus) > > scsi_bus_legacy_handle_cmdline(&s->bus); > } > + > +void lsi53c810_create(PCIBus *bus, int devfn) > +{ > + LSIState *s = LSI53C895A(pci_create_simple(bus, devfn, "lsi53c810")); > + > + scsi_bus_legacy_handle_cmdline(&s->bus); > +} > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index d8c18c7..e255941 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -708,6 +708,7 @@ PCIDevice *pci_create(PCIBus *bus, int devfn, const char > *name); > PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); > > void lsi53c895a_create(PCIBus *bus); > +void lsi53c810_create(PCIBus *bus, int devfn); > > qemu_irq pci_allocate_irq(PCIDevice *pci_dev); > void pci_set_irq(PCIDevice *pci_dev, int level); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature