ahci: Don't allow creating slave drives
PATCH 1/1 ahci: Don't allow creating slave drives
An IDE bus provided by AHCI can only take a single IDE drive. If you add a drive as slave, qemu used to accept the command line but the device wouldn't be actually usable. Catch the situation instead and error out.
Signed-off-by Kevin Wolf <[email protected]>
--- hw/ide/ahci.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/internal.h | 3 ++- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/mmio.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/qdev.c | 10 +++++++++- hw/ide/via.c | 2 +- 9 files changed, 18 insertions(+), 9 deletions(-)
hw/ide/ahci.c +1 -1
@@ -1163,7 +1163,7 @@ void ahci_init(AHCIState *s, DeviceState *qdev, DMAContext *dma, int ports)for (i =0 ; i < s->ports; i++) {AHCIDevice *ad = &s->dev[i]; -ide_bus_new (&ad->port, qdev, i); +ide_bus_new (&ad->port, qdev, i,1 );ide_init2 (&ad->port, irqs[i]); ad->hba = s;
hw/ide/cmd646.c +1 -1
@@ -281,7 +281,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) irq =qemu_allocate_irqs (cmd646_set_irq, d,2 );for (i =0 ; i <2 ; i++) { -ide_bus_new (&d->bus[i], &d->dev.qdev, i); +ide_bus_new (&d->bus[i], &d->dev.qdev, i,2 );ide_init2 (&d->bus[i], irq[i]);bmdma_init (&d->bus[i], &d->bmdma[i], d);
hw/ide/internal.h +2 -1
@@ -450,6 +450,7 @@ struct IDEBus {IDEDevice *slave;IDEState ifs[2 ];int bus_id; +int max_units;IDEDMA *dma;uint8_t unit;uint8_t cmd;
@@ -574,7 +575,7 @@ void ide_atapi_cmd(IDEState *s);void ide_atapi_cmd_reply_end (IDEState *s);/* hw/ide/qdev.c */ -void ide_bus_new (IDEBus *idebus,DeviceState *dev,int bus_id); +void ide_bus_new (IDEBus *idebus,DeviceState *dev,int bus_id,int max_units);IDEDevice *ide_create_drive (IDEBus *bus,int unit,DriveInfo *drive);#endif /* HW_IDE_INTERNAL_H */
hw/ide/isa.c +1 -1
@@ -69,7 +69,7 @@ static int isa_ide_initfn(ISADevice *dev) {ISAIDEState *s =ISA_IDE (dev); -ide_bus_new (&s->bus,DEVICE (dev),0 ); +ide_bus_new (&s->bus,DEVICE (dev),0 ,2 );ide_init_ioport (&s->bus, dev, s->iobase, s->iobase2);isa_init_irq (dev, &s->irq, s->isairq);ide_init2 (&s->bus, s->irq);
hw/ide/macio.c +1 -1
@@ -334,7 +334,7 @@ static void macio_ide_initfn(Object *obj)SysBusDevice *d =SYS_BUS_DEVICE (obj);MACIOIDEState *s =MACIO_IDE (obj); -ide_bus_new (&s->bus,DEVICE (obj),0 ); +ide_bus_new (&s->bus,DEVICE (obj),0 ,2 );memory_region_init_io (&s->mem, &pmac_ide_ops, s,"pmac-ide" ,0x1000 );sysbus_init_mmio (d, &s->mem);sysbus_init_irq (d, &s->irq);
hw/ide/mmio.c +1 -1
@@ -137,7 +137,7 @@ static void mmio_ide_initfn(Object *obj)SysBusDevice *d =SYS_BUS_DEVICE (obj);MMIOState *s =MMIO_IDE (obj); -ide_bus_new (&s->bus,DEVICE (obj),0 ); +ide_bus_new (&s->bus,DEVICE (obj),0 ,2 );sysbus_init_irq (d, &s->irq); }
hw/ide/piix.c +1 -1
@@ -135,7 +135,7 @@ static void pci_piix_init_ports(PCIIDEState *d) {int i;for (i =0 ; i <2 ; i++) { -ide_bus_new (&d->bus[i], &d->dev.qdev, i); +ide_bus_new (&d->bus[i], &d->dev.qdev, i,2 );ide_init_ioport (&d->bus[i],NULL , port_info[i].iobase, port_info[i].iobase2);ide_init2 (&d->bus[i],isa_get_irq (NULL , port_info[i].isairq));
hw/ide/qdev.c +9 -1
@@ -47,10 +47,11 @@ static const TypeInfo ide_bus_info = { .class_init = ide_bus_class_init, }; -void ide_bus_new (IDEBus *idebus,DeviceState *dev,int bus_id) +void ide_bus_new (IDEBus *idebus,DeviceState *dev,int bus_id,int max_units) {qbus_create_inplace (&idebus->qbus,TYPE_IDE_BUS , dev,NULL ); idebus->bus_id = bus_id; + idebus->max_units = max_units; }static char *idebus_get_fw_dev_path (DeviceState *dev)
@@ -76,6 +77,13 @@ static int ide_qdev_init(DeviceState *qdev)if (dev->unit ==-1 ) { dev->unit = bus->master ?1 :0 ; } + +if (dev->unit >= bus->max_units) { +error_report ("Can't create IDE unit %d, bus supports only %d units" , + dev->unit, bus->max_units); + goto err; + } +switch (dev->unit) {case 0 :if (bus->master) {
hw/ide/via.c +1 -1
@@ -158,7 +158,7 @@ static void vt82c686b_init_ports(PCIIDEState *d) {int i;for (i =0 ; i <2 ; i++) { -ide_bus_new (&d->bus[i], &d->dev.qdev, i); +ide_bus_new (&d->bus[i], &d->dev.qdev, i,2 );ide_init_ioport (&d->bus[i],NULL , port_info[i].iobase, port_info[i].iobase2);ide_init2 (&d->bus[i],isa_get_irq (NULL , port_info[i].isairq));
Signature · 1 line
1.8.1.4
Quoted 5 lines · Kevin Wolf
An IDE bus provided by AHCI can only take a single IDE drive. If you add a drive as slave, qemu used to accept the command line but the device wouldn't be actually usable. Catch the situation instead and error out.
Signed-off-by Kevin Wolf <[email protected]>
Quoted 11 lines
--- hw/ide/ahci.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/internal.h | 3 ++- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/mmio.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/qdev.c | 10 +++++++++- hw/ide/via.c | 2 +- 9 files changed, 18 insertions(+), 9 deletions(-)
Reviewed-by Stefan Hajnoczi <[email protected]>