From 48a18b3c698295e4d891f34e919615e84e20f027 Mon Sep 17 00:00:00 2001 From: Hervé Poussineau Date: Thu, 15 Dec 2011 22:09:51 +0100 Subject: isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NULL is a valid bus/device, so there is no change in behaviour. Signed-off-by: Hervé Poussineau Signed-off-by: Anthony Liguori --- hw/ide/isa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/ide/isa.c') diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 01a9e59cb9..219f3a4c6b 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -73,13 +73,13 @@ static int isa_ide_initfn(ISADevice *dev) return 0; }; -ISADevice *isa_ide_init(int iobase, int iobase2, int isairq, +ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1) { ISADevice *dev; ISAIDEState *s; - dev = isa_create("isa-ide"); + dev = isa_create(bus, "isa-ide"); qdev_prop_set_uint32(&dev->qdev, "iobase", iobase); qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2); qdev_prop_set_uint32(&dev->qdev, "irq", isairq); -- cgit 1.4.1