[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/8] sun4u: switch to using qdev to instantiate fw_c
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH 2/8] sun4u: switch to using qdev to instantiate fw_cfg interface |
Date: |
Tue, 11 Jul 2017 22:53:21 +0100 |
Signed-off-by: Mark Cave-Ayland <address@hidden>
---
hw/sparc64/sun4u.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 7738856..8932be9 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -512,7 +512,15 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
graphic_width, graphic_height, graphic_depth,
(uint8_t *)&nd_table[0].macaddr);
- fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);
+ dev = qdev_create(NULL, TYPE_FW_CFG_IO);
+ qdev_prop_set_bit(dev, "dma_enabled", false);
+ object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
+ OBJECT(dev), NULL);
+ qdev_init_nofail(dev);
+ memory_region_add_subregion(get_system_io(), BIOS_CFG_IOPORT,
+ &FW_CFG_IO(dev)->comb_iomem);
+
+ fw_cfg = FW_CFG(dev);
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
--
1.7.10.4
- [Qemu-devel] [PATCH 0/8] sun4u: change PCI topology to better match a real Ultra 5, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 2/8] sun4u: switch to using qdev to instantiate fw_cfg interface,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH 4/8] apb: fix up PCI bus nomenclature, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 3/8] sun4u: expose fw_cfg and NVRAM on ebus PCI IO address space, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 7/8] sun4u: create single default onboard ne2k_pci NIC for machine, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 6/8] apb: add busA qdev property to PBM PCI bridge, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 8/8] sun4u: move in-built devices behind PCI bridge A, Mark Cave-Ayland, 2017/07/11
- [Qemu-devel] [PATCH 1/8] sun4u: pass PCIDevice into pci_ebus_init() instead of PCIBus, Mark Cave-Ayland, 2017/07/11