[Qemu-devel] [PATCH v2 6/6] vl: Do not set acpi_enabled when ACPI is disabled at build time

[Philippe Mathieu-Daudé]

When building with CONFIG_ACPI disabled, the 'acpi_enabled' is
still initialized to '1' (enabled).

Remove the confusion by moving the variable to hw/core/acpi.c,
and adding a similar stub.

Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
 hw/acpi/core.c | 1 +
 stubs/acpi.c   | 2 ++
 vl.c           | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 9ed1629f367..b2730aec8a0 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -59,6 +59,7 @@ static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - 
ACPI_TABLE_PFX_SIZE] =
     "QEMU\1\0\0\0"           /* ASL compiler ID (4), version (4) */
     ;
 
+int acpi_enabled = 1;
 char unsigned *acpi_tables;
 size_t acpi_tables_len;
 
diff --git a/stubs/acpi.c b/stubs/acpi.c
index cd0119f9fb1..f1ef6b8e795 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,8 @@
 #include "qapi/qmp/qerror.h"
 #include "hw/acpi/acpi.h"
 
+int acpi_enabled;
+
 size_t acpi_tables_len;
 
 char unsigned *acpi_tables;
diff --git a/vl.c b/vl.c
index ff5dfb6fbc3..c9364b4ec10 100644
--- a/vl.c
+++ b/vl.c
@@ -166,7 +166,6 @@ int smp_cpus;
 unsigned int max_cpus;
 int smp_cores = 1;
 int smp_threads = 1;
-int acpi_enabled = 1;
 int no_hpet = 0;
 int fd_bootchk = 1;
 static int no_reboot;
-- 
2.20.1