Commit cad2b59c authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kwolf/for-anthony' into staging 



# By Kevin Wolf (7) and Fam Zheng (3)
# Via Kevin Wolf
* kwolf/for-anthony:
  qemu-iotests: fix 017 018 for vmdk
  qemu-iotests: exclude vmdk and qcow from 043
  qemu-iotests: exclude vmdk for test 042
  qtest/ide-test: Test short and long PRDTs
  qtest/ide-test: Add simple DMA read/write test case
  qtest: Add IDE test case
  libqos/pci: Enable bus mastering
  ide: Reset BMIDEA bit when the bus master is stopped
  de_DE.po: Add missing leading spaces
  ahci: Don't allow creating slave drives

Message-id: 1368023344-29731-1-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 5f5a1318 794d00f7

hw/ide/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);