summary refs log tree commit diff stats
path: root/include/hw/pci-host/apb.h
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2017-12-21 07:32:57 +0000
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2018-01-09 21:48:15 +0000
commitcacd05805eeea393ec929fe841f9a68aa2140d92 (patch)
tree23c44d5a3b5c3990487511e2f9459a92ed6e14a8 /include/hw/pci-host/apb.h
parent4272ad40189c73324da59047f5232ec795111c4b (diff)
downloadfocaccia-qemu-cacd05805eeea393ec929fe841f9a68aa2140d92.tar.gz
focaccia-qemu-cacd05805eeea393ec929fe841f9a68aa2140d92.zip
apb: remove pci_apb_init() and instantiate APB device using qdev
By making the special_base and mem_base values qdev properties, we can move
the remaining parts of pci_apb_init() into the pbm init() and realize()
functions.

This finally allows us to instantiate the APB directly using standard qdev
create/init functions in sun4u.c.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to '')
-rw-r--r--include/hw/pci-host/apb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h
index ae15d8ce59..f0074f7a51 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -62,6 +62,8 @@ typedef struct IOMMUState {
 typedef struct APBState {
     PCIHostState parent_obj;
 
+    hwaddr special_base;
+    hwaddr mem_base;
     MemoryRegion apb_config;
     MemoryRegion pci_config;
     MemoryRegion pci_mmio;
@@ -93,6 +95,4 @@ typedef struct PBMPCIBridge {
 #define PBM_PCI_BRIDGE(obj) \
     OBJECT_CHECK(PBMPCIBridge, (obj), TYPE_PBM_PCI_BRIDGE)
 
-APBState *pci_apb_init(hwaddr special_base,
-                       hwaddr mem_base);
 #endif