mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hppa: move dino_init() from dino.c to machine.c

Browse Source 
Now that dino_init() is completely decoupled from dino.c it can be moved to
machine.c with the rest of the board configuration.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-20-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>
This commit is contained in:
Mark Cave-Ayland 2022-05-04 10:25:29 +01:00
parent 36f9bbdb17
commit 0d06899631
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/hppa/dino.c
View File

@ -399,20 +399,6 @@ static int dino_pci_map_irq(PCIDevice *d, int irq_num)
return slot & 0x03;
}
DinoState *dino_init(MemoryRegion *addr_space)
{
DeviceState *dev;
DinoState *s;
dev = qdev_new(TYPE_DINO_PCI_HOST_BRIDGE);
object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space),
&error_fatal);
s = DINO_PCI_HOST_BRIDGE(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
return s;
}
static void dino_pcihost_reset(DeviceState *dev)
{
DinoState *s = DINO_PCI_HOST_BRIDGE(dev);

2
hw/hppa/hppa_sys.h
View File

@ -9,9 +9,7 @@
#include "hw/intc/i8259.h"
#include "hppa_hardware.h"
#include "dino.h"
DinoState *dino_init(MemoryRegion *);
DeviceState *lasi_init(MemoryRegion *);
#define enable_lasi_lan() 0

12
hw/hppa/machine.c
View File

@ -122,6 +122,18 @@ static FWCfgState *create_fw_cfg(MachineState *ms)
return fw_cfg;
}
static DinoState *dino_init(MemoryRegion *addr_space)
{
DeviceState *dev;
dev = qdev_new(TYPE_DINO_PCI_HOST_BRIDGE);
object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space),
&error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
return DINO_PCI_HOST_BRIDGE(dev);
}
static void machine_hppa_init(MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;