diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2013-02-23 00:40:38 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-28 12:59:23 -0500 |
| commit | d93a8a435cbd7f874ef71d4da5677c5f88d8435a (patch) | |
| tree | a971129ae986ecff1ea08774ceb25979dd045e7f /hw | |
| parent | 57a0f0c651a63d3e1e02d74e5c59d2648037b087 (diff) | |
| download | qemu-d93a8a435cbd7f874ef71d4da5677c5f88d8435a.tar.gz qemu-d93a8a435cbd7f874ef71d4da5677c5f88d8435a.tar.bz2 qemu-d93a8a435cbd7f874ef71d4da5677c5f88d8435a.zip | |
piix_pci: Use DEVICE() and ISA_BUS()
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1361580039-4459-3-git-send-email-dwmw2@infradead.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/piix_pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index c29eee0e6c..1e05d499cd 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -300,8 +300,7 @@ static PCIBus *i440fx_common_init(const char *device_name, pci_bus_set_route_irq_fn(b, piix3_route_intx_pin_to_irq); } piix3->pic = pic; - *isa_bus = DO_UPCAST(ISABus, qbus, - qdev_get_child_bus(&piix3->dev.qdev, "isa.0")); + *isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); *piix3_devfn = piix3->dev.devfn; @@ -548,7 +547,7 @@ static int piix3_initfn(PCIDevice *dev) { PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev); - isa_bus_new(&d->dev.qdev, pci_address_space_io(dev)); + isa_bus_new(DEVICE(d), pci_address_space_io(dev)); memory_region_init_io(&d->rcr_mem, &rcr_ops, d, "piix3-reset-control", 1); memory_region_add_subregion_overlap(pci_address_space_io(dev), RCR_IOPORT, |