PCMachineState: introduce acpi_build_enabled field

Introduce this field to control whether ACPI build is enabled by a
particular machine or accelerator.

It defaults to true if the machine itself supports ACPI build. Xen
accelerator will disable it because Xen is in charge of building ACPI
tables for the guest.

upstream-commit-id: 021746c131cdfeab9d82ff918795a9f18d20d7ae

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Sander Eikelenboom <linux@eikelenboom.it>

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a26a4bb03fff9ec6854bc6f7885d808f5bd4b9a1..c42e02c5c17acfeb986c17c3a409f1b33c34a6ab 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2855,7 +2855,7 @@ void acpi_setup(void)
         return;
     }
 
-    if (!pcmc->has_acpi_build) {
+    if (!pcms->acpi_build_enabled) {
         ACPI_BUILD_DPRINTF("ACPI build disabled. Bailing out.\n");
         return;
     }

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 022dd1b2059b292246ebb6179bb8202b5485c2a5..9c4aaa1e0f01189eb924b9f937a1dfe7ae8a65c3 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2168,6 +2168,9 @@ static void pc_machine_initfn(Object *obj)
     pcms->acpi_nvdimm_state.is_enabled = false;
     object_property_add_bool(obj, PC_MACHINE_NVDIMM, pc_machine_get_nvdimm,
                              pc_machine_set_nvdimm, &error_abort);
+
+    /* acpi build is enabled by default if machine supports it */
+    pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
 }
 
 static void pc_machine_reset(void)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 74c175c1e5598957fd04f7f085a4114af1c04fc3..9a822b8909923201084c42fcd5733bf3a5cdd052 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -61,6 +61,8 @@ struct PCMachineState {
 
     AcpiNVDIMMState acpi_nvdimm_state;
 
+    bool acpi_build_enabled;
+
     /* RAM information (sizes, addresses, configuration): */
     ram_addr_t below_4g_mem_size, above_4g_mem_size;
 

diff --git a/xen-common.c b/xen-common.c
index e641ad1aeff8b0d325b6a98c4f2e3d32b1d47d58..b1858d74fb6fd0b6f894e6c94b9192ea04d055ec 100644 (file)
--- a/xen-common.c
+++ b/xen-common.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/i386/pc.h"
 #include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
 #include "sysemu/char.h"
@@ -114,6 +115,11 @@ static void xen_change_state_handler(void *opaque, int running,
 
 static int xen_init(MachineState *ms)
 {
+    PCMachineState *pcms = PC_MACHINE(ms);
+
+    /* Disable ACPI build because Xen handles it */
+    pcms->acpi_build_enabled = false;
+
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_be_printf(NULL, 0, "can't open xen interface\n");