diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-08 15:54:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-08 15:54:36 -0500 |
| commit | cad2b59c198340a636c5e015fb90e0326a1d3dd7 (patch) | |
| tree | 1441c300722db4bda79e32a1e61e9e1c7f997a43 /hw/ide/mmio.c | |
| parent | 5f5a1318653c08e435cfa52f60b6a712815b659d (diff) | |
| parent | 794d00f71d39e3d18eafade579b2ecb665d6d481 (diff) | |
| download | qemu-cad2b59c198340a636c5e015fb90e0326a1d3dd7.zip qemu-cad2b59c198340a636c5e015fb90e0326a1d3dd7.tar.gz qemu-cad2b59c198340a636c5e015fb90e0326a1d3dd7.tar.bz2 | |
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: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide/mmio.c')
| -rw-r--r-- | hw/ide/mmio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index ce88c3a..e80e7e5 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -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); } |