Rather than checking ACPI availability at compile time by
checking the CONFIG_ACPI definition from CONFIG_DEVICES,
check at runtime via acpi_builtin().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/virtio/virtio-mem.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 7b140add765..5f57eccbb66 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -28,7 +28,7 @@
 #include "migration/misc.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-#include CONFIG_DEVICES
+#include "hw/acpi/acpi.h"
 #include "trace.h"
 
 static const VMStateDescription vmstate_virtio_mem_device_early;
@@ -883,10 +883,8 @@ static uint64_t virtio_mem_get_features(VirtIODevice *vdev, uint64_t features,
     MachineState *ms = MACHINE(qdev_get_machine());
     VirtIOMEM *vmem = VIRTIO_MEM(vdev);
 
-    if (ms->numa_state) {
-#if defined(CONFIG_ACPI)
+    if (ms->numa_state && acpi_builtin()) {
         virtio_add_feature(&features, VIRTIO_MEM_F_ACPI_PXM);
-#endif
     }
     assert(vmem->unplugged_inaccessible != ON_OFF_AUTO_AUTO);
     if (vmem->unplugged_inaccessible == ON_OFF_AUTO_ON) {
-- 
2.47.1

On 3/7/25 07:15, Philippe Mathieu-Daudé wrote:
> Rather than checking ACPI availability at compile time by
> checking the CONFIG_ACPI definition from CONFIG_DEVICES,
> check at runtime via acpi_builtin().
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/virtio/virtio-mem.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 7b140add765..5f57eccbb66 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -28,7 +28,7 @@
>   #include "migration/misc.h"
>   #include "hw/boards.h"
>   #include "hw/qdev-properties.h"
> -#include CONFIG_DEVICES
> +#include "hw/acpi/acpi.h"
>   #include "trace.h"
>   
>   static const VMStateDescription vmstate_virtio_mem_device_early;
> @@ -883,10 +883,8 @@ static uint64_t virtio_mem_get_features(VirtIODevice *vdev, uint64_t features,
>       MachineState *ms = MACHINE(qdev_get_machine());
>       VirtIOMEM *vmem = VIRTIO_MEM(vdev);
>   
> -    if (ms->numa_state) {
> -#if defined(CONFIG_ACPI)
> +    if (ms->numa_state && acpi_builtin()) {
>           virtio_add_feature(&features, VIRTIO_MEM_F_ACPI_PXM);
> -#endif
>       }
>       assert(vmem->unplugged_inaccessible != ON_OFF_AUTO_AUTO);
>       if (vmem->unplugged_inaccessible == ON_OFF_AUTO_ON) {

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

On 07.03.25 16:15, Philippe Mathieu-Daudé wrote:
> Rather than checking ACPI availability at compile time by
> checking the CONFIG_ACPI definition from CONFIG_DEVICES,
> check at runtime via acpi_builtin().
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Cheers,

David / dhildenb