diff options
| author | Mark Cave-Ayland | 2022-05-04 11:25:23 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2022-05-08 19:52:36 +0200 |
| commit | 05245daf47b7c645d9952b476d63531f6d8aa7f8 (patch) | |
| tree | 979fbf3aad5f5dce483b7a533e09d542a18932bb /hw/hppa/dino.c | |
| parent | hppa: use new CONFIG_HPPA_B160L option instead of CONFIG_DINO to build hppa m... (diff) | |
| download | qemu-05245daf47b7c645d9952b476d63531f6d8aa7f8.tar.gz qemu-05245daf47b7c645d9952b476d63531f6d8aa7f8.tar.xz qemu-05245daf47b7c645d9952b476d63531f6d8aa7f8.zip | |
dino: change dino_init() to return the DINO device instead of PCIBus
This is in preparation for using more qdev APIs during the configuration of the
HPPA generic machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-14-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/hppa/dino.c')
| -rw-r--r-- | hw/hppa/dino.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 01546ff6fc..6c488c908e 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -409,12 +409,11 @@ static void dino_set_serial_irq(void *opaque, int irq, int level) dino_set_irq(opaque, 10, level); } -PCIBus *dino_init(MemoryRegion *addr_space, - qemu_irq *p_rtc_irq, qemu_irq *p_ser_irq) +DinoState *dino_init(MemoryRegion *addr_space, + qemu_irq *p_rtc_irq, qemu_irq *p_ser_irq) { DeviceState *dev; DinoState *s; - PCIBus *pci_bus; dev = qdev_new(TYPE_DINO_PCI_HOST_BRIDGE); object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space), @@ -428,8 +427,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, *p_rtc_irq = qemu_allocate_irq(dino_set_timer_irq, s, 0); *p_ser_irq = qemu_allocate_irq(dino_set_serial_irq, s, 0); - pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci")); - return pci_bus; + return s; } static void dino_pcihost_reset(DeviceState *dev) |