Re: [PATCH 5/9] hw/i386/pc: Defer smbios_set_defaults() to machine_done

[Philippe Mathieu-Daudé]

On 8/2/24 23:03, Bernhard Beschow wrote:
> Handling most of smbios data generation in the machine_done notifier is similar
> to how the ARM virt machine handles it which also calls smbios_set_defaults()
> there. The result is that all pc machines are freed from explicitly worrying
> about smbios setup.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/i386/fw_cfg.h     |  3 ++-
>   include/hw/i386/pc.h |  1 -
>   hw/i386/fw_cfg.c     | 12 +++++++++++-
>   hw/i386/pc.c         |  2 +-
>   hw/i386/pc_piix.c    | 10 ----------
>   hw/i386/pc_q35.c     |  9 ---------
>   6 files changed, 14 insertions(+), 23 deletions(-)
>
> diff --git a/hw/i386/fw_cfg.h b/hw/i386/fw_cfg.h
> index 86ca7c1c0c..1e1de6b4a3 100644
> --- a/hw/i386/fw_cfg.h
> +++ b/hw/i386/fw_cfg.h
> @@ -10,6 +10,7 @@
>   #define HW_I386_FW_CFG_H


> @@ -22,7 +23,7 @@
>   FWCfgState *fw_cfg_arch_create(MachineState *ms,
>                                  uint16_t boot_cpus,
>                                  uint16_t apic_id_limit);
> -void fw_cfg_build_smbios(MachineState *ms, FWCfgState *fw_cfg);
> +void fw_cfg_build_smbios(PCMachineState *ms, FWCfgState *fw_cfg);

s/ms/pcms/

Otherwise, nice cleanup:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
> index 7362daa45a..98a478c276 100644
> --- a/hw/i386/fw_cfg.c
> +++ b/hw/i386/fw_cfg.c
> @@ -48,15 +48,25 @@ const char *fw_cfg_arch_key_name(uint16_t key)
>       return NULL;
>   }
>   
> -void fw_cfg_build_smbios(MachineState *ms, FWCfgState *fw_cfg)
> +void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg)