@@ -71,9 +71,9 @@ petalogix_ml605_init(MachineState *machine)
{
ram_addr_t ram_size = machine->ram_size;
MemoryRegion *address_space_mem = get_system_memory();
- DeviceState *dev, *dma, *eth0;
+ DeviceState *cpu, *dev, *dma, *eth0;
Object *ds, *cs;
- MicroBlazeCPU *cpu;
+ MicroBlazeCPU *mbcpu;
SysBusDevice *busdev;
DriveInfo *dinfo;
int i;
@@ -82,16 +82,16 @@ petalogix_ml605_init(MachineState *machine)
qemu_irq irq[32];
/* init CPUs */
- cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
- object_property_set_str(OBJECT(cpu), "version", "8.10.a", &error_abort);
+ cpu = DEVICE(object_new(TYPE_MICROBLAZE_CPU));
+ mbcpu = MICROBLAZE_CPU(cpu);
+ qdev_prop_set_string(cpu, "version", "8.10.a");
/* Use FPU but don't use floating point conversion and square
* root instructions
*/
- object_property_set_int(OBJECT(cpu), "use-fpu", 1, &error_abort);
- object_property_set_bool(OBJECT(cpu), "dcache-writeback", true,
- &error_abort);
- object_property_set_bool(OBJECT(cpu), "endianness", true, &error_abort);
- qdev_realize(DEVICE(cpu), NULL, &error_abort);
+ qdev_prop_set_uint8(cpu, "use-fpu", 1);
+ qdev_prop_set_bit(cpu, "dcache-writeback", true);
+ qdev_prop_set_bit(cpu, "endianness", true);
+ qdev_realize(cpu, NULL, &error_abort);
/* Attach emulated BRAM through the LMB. */
memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram",
@@ -115,7 +115,7 @@ petalogix_ml605_init(MachineState *machine)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
- qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ));
+ qdev_get_gpio_in(cpu, MB_CPU_IRQ));
for (i = 0; i < 32; i++) {
irq[i] = qdev_get_gpio_in(dev, i);
}
@@ -148,10 +148,8 @@ petalogix_ml605_init(MachineState *machine)
qdev_set_nic_properties(eth0, &nd_table[0]);
qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
qdev_prop_set_uint32(eth0, "txmem", 0x1000);
- object_property_set_link(OBJECT(eth0), "axistream-connected", ds,
- &error_abort);
- object_property_set_link(OBJECT(eth0), "axistream-control-connected", cs,
- &error_abort);
+ qdev_prop_set_link(eth0, "axistream-connected", ds);
+ qdev_prop_set_link(eth0, "axistream-control-connected", cs);
sysbus_realize_and_unref(SYS_BUS_DEVICE(eth0), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(eth0), 0, irq[AXIENET_IRQ]);
@@ -161,10 +159,8 @@ petalogix_ml605_init(MachineState *machine)
cs = object_property_get_link(OBJECT(eth0),
"axistream-control-connected-target", NULL);
qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000);
- object_property_set_link(OBJECT(dma), "axistream-connected", ds,
- &error_abort);
- object_property_set_link(OBJECT(dma), "axistream-control-connected", cs,
- &error_abort);
+ qdev_prop_set_link(dma, "axistream-connected", ds);
+ qdev_prop_set_link(dma, "axistream-control-connected", cs);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(dma), 0, irq[AXIDMA_IRQ0]);
@@ -200,11 +196,11 @@ petalogix_ml605_init(MachineState *machine)
}
/* setup PVR to match kernel settings */
- cpu->cfg.pvr_regs[4] = 0xc56b8000;
- cpu->cfg.pvr_regs[5] = 0xc56be000;
- cpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */
+ mbcpu->cfg.pvr_regs[4] = 0xc56b8000;
+ mbcpu->cfg.pvr_regs[5] = 0xc56be000;
+ mbcpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */
- microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size,
+ microblaze_load_kernel(mbcpu, MEMORY_BASEADDR, ram_size,
machine->initrd_filename,
BINARY_DEVICE_TREE_FILE,
NULL);
@@ -70,7 +70,7 @@ petalogix_s3adsp1800_init(MachineState *machine)
MemoryRegion *sysmem = get_system_memory();
cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
- object_property_set_str(OBJECT(cpu), "version", "7.10.d", &error_abort);
+ qdev_prop_set_string(DEVICE(cpu), "version", "7.10.d");
qdev_realize(DEVICE(cpu), NULL, &error_abort);
/* Attach emulated BRAM through the LMB. */
@@ -18,6 +18,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "exec/address-spaces.h"
+#include "hw/qdev-properties.h"
#include "hw/boards.h"
#include "cpu.h"
#include "boot.h"
@@ -76,35 +77,26 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj)
static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp)
{
XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(dev);
+ DeviceState *cpu = DEVICE(&s->cpu);
- object_property_set_uint(OBJECT(&s->cpu), "base-vectors",
- XLNX_ZYNQMP_PMU_ROM_ADDR, &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "use-stack-protection", true,
- &error_abort);
- object_property_set_uint(OBJECT(&s->cpu), "use-fpu", 0, &error_abort);
- object_property_set_uint(OBJECT(&s->cpu), "use-hw-mul", 0, &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "use-barrel", true,
- &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "use-msr-instr", true,
- &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "use-pcmp-instr", true,
- &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "use-mmu", false, &error_abort);
- object_property_set_bool(OBJECT(&s->cpu), "endianness", true,
- &error_abort);
- object_property_set_str(OBJECT(&s->cpu), "version", "8.40.b",
- &error_abort);
- object_property_set_uint(OBJECT(&s->cpu), "pvr", 0, &error_abort);
+ qdev_prop_set_uint32(cpu, "base-vectors", XLNX_ZYNQMP_PMU_ROM_ADDR);
+ qdev_prop_set_bit(cpu, "use-stack-protection", true);
+ qdev_prop_set_uint8(cpu, "use-fpu", 0);
+ qdev_prop_set_uint8(cpu, "use-hw-mul", 0);
+ qdev_prop_set_bit(cpu, "use-barrel", true);
+ qdev_prop_set_bit(cpu, "use-msr-instr", true);
+ qdev_prop_set_bit(cpu, "use-pcmp-instr", true);
+ qdev_prop_set_bit(cpu, "use-mmu", false);
+ qdev_prop_set_bit(cpu, "endianness", true);
+ qdev_prop_set_string(cpu, "version", "8.40.b");
+ qdev_prop_set_uint8(cpu, "pvr", 0);
if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) {
return;
}
- object_property_set_uint(OBJECT(&s->intc), "intc-intr-size", 0x10,
- &error_abort);
- object_property_set_uint(OBJECT(&s->intc), "intc-level-edge", 0x0,
- &error_abort);
- object_property_set_uint(OBJECT(&s->intc), "intc-positive", 0xffff,
- &error_abort);
+ qdev_prop_set_uint32(DEVICE(&s->intc), "intc-intr-size", 0x10);
+ qdev_prop_set_uint32(DEVICE(&s->intc), "intc-level-edge", 0x0);
+ qdev_prop_set_uint32(DEVICE(&s->intc), "intc-positive", 0xffff);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->intc), errp)) {
return;
}
No need to use the low-level QOM API when an object inherits from QDev. Directly use the QDev API to set its properties. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/microblaze/petalogix_ml605_mmu.c | 40 +++++++++++------------- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 40 ++++++++++-------------- 3 files changed, 35 insertions(+), 47 deletions(-)