[Qemu-devel] [PATCH v2] xenfv: set has_acpi_build to false

[Wei Liu]

Xen's toolstack is in charge of building ACPI tables. Skip ACPI table
building and loading in QEMU by setting has_acpi_build to false for
xenfv machine.

This issue is discovered due to direct kernel boot on Xen doesn't boot
anymore, because the new ACPI tables cause the guest to exceed its
memory allocation limit.

Reported-by: Sander Eikelenboom <address@hidden>
Signed-off-by: Wei Liu <address@hidden>
---
Cc: Igor Mammedov <address@hidden>
Cc: Anthony PERARD <address@hidden>
Cc: Stefano Stabellini <address@hidden>
Cc: Sander Eikelenboom <address@hidden>
---
 hw/i386/pc_piix.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a54a468..08596a1 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -1094,10 +1094,14 @@ DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
 #ifdef CONFIG_XEN
 static void xenfv_machine_options(MachineClass *m)
 {
+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
+
     m->desc = "Xen Fully-virtualized PC";
     m->max_cpus = HVM_MAX_VCPUS;
     m->default_machine_opts = "accel=xen";
     m->hot_add_cpu = pc_hot_add_cpu;
+
+    pcmc->has_acpi_build = false;
 }
 
 DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
-- 
2.1.4