Re: [PATCH 06/12] hw/loongarch/virt: prefix ACPI helper with loongarch_virt_

鍦 2026/8/23 涓嬪崍11:07, Yonggang Luo 鍐欓亾:
> - virt_acpi_setup is the same C symbol used by ARM and RISC-V virt.
>    Rename it now so a later combined binary does not need meson -D
>    prefixes for LoongArch.
> - Rename the file-local virt_is_acpi_enabled to
>    loongarch_virt_is_acpi_enabled to match.
>
> Signed-off-by: Yonggang Luo <[email protected]>
> ---
>   hw/loongarch/virt-acpi-build.c | 6 +++---
>   hw/loongarch/virt.c            | 2 +-
>   include/hw/loongarch/virt.h    | 2 +-
>   3 files changed, 5 insertions(+), 5 deletions(-)
Reviewed-by: Song Gao <[email protected]>

Thanks.
Song Gao
> diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
> index a0b445f297b..bbbac289b49 100644
> --- a/hw/loongarch/virt-acpi-build.c
> +++ b/hw/loongarch/virt-acpi-build.c
> @@ -674,7 +674,7 @@ static const VMStateDescription vmstate_acpi_build = {
>       },
>   };
>   
> -static bool virt_is_acpi_enabled(LoongArchVirtMachineState *lvms)
> +static bool loongarch_virt_is_acpi_enabled(LoongArchVirtMachineState *lvms)
>   {
>       if (lvms->acpi == ON_OFF_AUTO_OFF) {
>           return false;
> @@ -682,7 +682,7 @@ static bool virt_is_acpi_enabled(LoongArchVirtMachineState *lvms)
>       return true;
>   }
>   
> -void virt_acpi_setup(LoongArchVirtMachineState *lvms)
> +void loongarch_virt_acpi_setup(LoongArchVirtMachineState *lvms)
>   {
>       AcpiBuildTables tables;
>       AcpiBuildState *build_state;
> @@ -692,7 +692,7 @@ void virt_acpi_setup(LoongArchVirtMachineState *lvms)
>           return;
>       }
>   
> -    if (!virt_is_acpi_enabled(lvms)) {
> +    if (!loongarch_virt_is_acpi_enabled(lvms)) {
>           ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n");
>           return;
>       }
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index 6693dea647b..74c9668b6e6 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -242,7 +242,7 @@ static void virt_done(Notifier *notifier, void *data)
>       LoongArchVirtMachineState *lvms = container_of(notifier,
>                                         LoongArchVirtMachineState, machine_done);
>       virt_build_smbios(lvms);
> -    virt_acpi_setup(lvms);
> +    loongarch_virt_acpi_setup(lvms);
>       virt_fdt_setup(lvms);
>   }
>   
> diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
> index d39a9bbf5dd..72268466def 100644
> --- a/include/hw/loongarch/virt.h
> +++ b/include/hw/loongarch/virt.h
> @@ -132,7 +132,7 @@ struct LoongArchVirtMachineState {
>   
>   #define TYPE_LOONGARCH_VIRT_MACHINE  MACHINE_TYPE_NAME("virt")
>   OBJECT_DECLARE_SIMPLE_TYPE(LoongArchVirtMachineState, LOONGARCH_VIRT_MACHINE)
> -void virt_acpi_setup(LoongArchVirtMachineState *lvms);
> +void loongarch_virt_acpi_setup(LoongArchVirtMachineState *lvms);
>   void virt_fdt_setup(LoongArchVirtMachineState *lvms);
>   
>   static inline bool virt_has_dmsi(LoongArchVirtMachineState *lvms)