Re: [Qemu-devel] [PATCH 2/4] Add device tree machine

[Gerd Hoffmann]

> +++ b/hw/arm-cpu.c

> +/* FIXME: Remove this and make the CPU emulation use the right names.  */
> +static const struct {
> +    const char *devname;
> +    const char *cpuname;
> +} cpu_device_name_map[] = {
> +    {"ARM,ARM926EJ-S", "arm926"},
> +    {"ARM,Cortex-A8", "cortex-a8"}
> +};

> +static void arm_cpu_register_devices(void)
> +{
> +    int i;
> +    CPUInfo *info;
> +
> +    for (i = 0; i<  ARRAY_SIZE(cpu_device_name_map); i++) {
> +        info = qemu_mallocz(sizeof(*info));
> +        info->sysbus.qdev.props = cpu_qdev_props;
> +        info->sysbus.init = arm_cpu_dev_init;
> +        info->cpuname = cpu_device_name_map[i].cpuname;
> +        sysbus_register_withprop(cpu_device_name_map[i].devname,
> +                                 sizeof(CPUDevice),
> +&info->sysbus);
> +    }

I would drop cpu_device_name_map[] and have static CPUInfo structs instead.

> +++ b/hw/dt-machine.c

> +void dt_fixup_sysbus_device(DeviceState *dev)
> +{

That doesn't belong here, it should go to sysbus.c.

With the businfo patch 
(http://git.et.redhat.com/?p=qemu-kraxel.git;a=commitdiff;h=c02134e1d986892df7e8cc1cd27cf340fcafec63) 
posted yesterday it is easy, just add a fixup_device() callback to the 
BusInfo struct.  I'd name it configure() instead of fixup() though.

> +    qdev_fixup_devices();

qdev_configure_devices() ?

> +DeviceState *qdev_from_phandle(uint32_t phandle)
> +{
> +    if (!main_system_bus) {
> +        return NULL;
> +    }
> +    return qdev_from_phandle1(main_system_bus, phandle);
> +}

What this is good for?  Seems to be unused in the existing board 
descriptions ...

cheers,
  Gerd