On Sun, Nov 1, 2026 at 12:40 AM Yonggang Luo <[email protected]> wrote:
>
> Expand DEFINE_MACHINE() in hw/xtensa/virt.c to xtensa_virt_machine_typeinfo
> and xtensa_virt_machine_register_types() calling type_register_static().
>
> Signed-off-by: Yonggang Luo <[email protected]>
> ---
>  hw/xtensa/virt.c | 18 ++++++++++++++++--
>  1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
> index 271f06e0953..8c8fdad72f0 100644
> --- a/hw/xtensa/virt.c
> +++ b/hw/xtensa/virt.c
> @@ -115,8 +115,10 @@ static void xtensa_virt_init(MachineState *machine)
>      xtensa_sim_load_kernel(cpu, machine);
>  }
>
> -static void xtensa_virt_machine_init(MachineClass *mc)
> +static void xtensa_virt_machine_class_init(ObjectClass *oc, const void *data)
>  {
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +
>      mc->desc = "virt machine (" XTENSA_DEFAULT_CPU_MODEL ")";
>      mc->init = xtensa_virt_init;
>      mc->max_cpus = 32;
> @@ -124,4 +126,16 @@ static void xtensa_virt_machine_init(MachineClass *mc)
>      mc->default_nic = "virtio-net-pci";
>  }
>
> -DEFINE_MACHINE("virt", xtensa_virt_machine_init)
> +static const TypeInfo xtensa_virt_machine_typeinfo = {
> +    .name       = MACHINE_TYPE_NAME("virt"),
> +    .parent     = TYPE_MACHINE,
> +    .class_init = xtensa_virt_machine_class_init,
> +    .instance_size = sizeof(MachineState),
> +};

In case I forgot,     .instance_size = sizeof(MachineState), should be removed
from this, it's redundant. And maybe for less boilerplate, we should
use DEFINE_TYPES
instead.


> +
> +static void xtensa_virt_machine_register_types(void)
> +{
> +    type_register_static(&xtensa_virt_machine_typeinfo);
> +}
> +
> +type_init(xtensa_virt_machine_register_types)
> --
> 2.55.0.windows.3
>


-- 
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

Reply via email to