On 10/01/20 18:22, Philippe Mathieu-Daudé wrote:
> While APEI is a generic ACPI feature (usable by X86 and ARM64), only
> the 'virt' machine uses it, by enabling the RAS Virtualization. See
> commit 2afa8c8519: "hw/arm/virt: Introduce a RAS machine option").
>
> Restrict the APEI tables generation code to the single user: the virt
> machine. If another machine wants to use it, it simply has to 'select
> ACPI_APEI' in its Kconfig.
>
> Fixes: aa16508f1d ("ACPI: Build related register address fields via hardware
> error fw_cfg blob")
> Acked-by: Michael S. Tsirkin <[email protected]>
> Reviewed-by: Dongjiu Geng <[email protected]>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> v2: Reworded
>
> Cc: Laszlo Ersek <[email protected]>
> Cc: Xiang Zheng <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Cc: Igor Mammedov <[email protected]>
> ---
> default-configs/arm-softmmu.mak | 1 -
> hw/arm/Kconfig | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 9a94ebd0be..08a32123b4 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=y
> CONFIG_FSL_IMX6UL=y
> CONFIG_SEMIHOSTING=y
> CONFIG_ALLWINNER_H3=y
> -CONFIG_ACPI_APEI=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index f303c6bead..7d040827af 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -26,6 +26,7 @@ config ARM_VIRT
> select ACPI_MEMORY_HOTPLUG
> select ACPI_HW_REDUCED
> select ACPI_NVDIMM
> + select ACPI_APEI
>
> config CHEETAH
> bool
>
Acked-by: Laszlo Ersek <[email protected]>