From patchwork Tue Nov 1 16:43:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 690057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t7dLm6GfVz9t2D for ; Wed, 2 Nov 2016 04:21:36 +1100 (AEDT) Received: from localhost ([::1]:49508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1ckf-0002bN-Ra for incoming@patchwork.ozlabs.org; Tue, 01 Nov 2016 13:21:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1c9e-0004Aw-Oy for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1c9b-0002LA-Ja for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:43:18 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:17625) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1c1c9b-0002Ky-EG for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:43:15 -0400 X-IronPort-AV: E=Sophos;i="5.31,580,1473120000"; d="scan'208";a="395786492" From: Wei Liu To: Date: Tue, 1 Nov 2016 16:43:11 +0000 Message-ID: <1478018591-26425-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Subject: [Qemu-devel] [PATCH RFC] PCMachineState: introduce acpi_build_enabled field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , Eduardo Habkost , Sander Eikelenboom , Igor Mammedov , Anthony PERARD , Xen-devel Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Introduce this field to control whether ACPI build is enabled by a particular machine or accelerator. It defaults to true so that PC machine has ACPI build by default. Xen accelerator will disable it because Xen is in charge of building ACPI tables for the guest. Signed-off-by: Wei Liu --- Cc: Igor Mammedov Cc: Eduardo Habkost Cc: Anthony PERARD Cc: Stefano Stabellini Cc: Sander Eikelenboom Tested a backport version which only involves trivial code movement. It worked with both -m xenfv and -m pc,accel=xen. Sander, if you want the backported patch please let me know. --- hw/i386/acpi-build.c | 2 +- hw/i386/pc.c | 19 +++++++++++++++++++ include/hw/i386/pc.h | 3 +++ xen-common.c | 6 ++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 93be96f..a5cd2fd 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2954,7 +2954,7 @@ void acpi_setup(void) return; } - if (!pcmc->has_acpi_build) { + if (!pcmc->has_acpi_build || !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 f56ea0f..3e7982f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2143,6 +2143,20 @@ static bool pc_machine_get_nvdimm(Object *obj, Error **errp) return pcms->acpi_nvdimm_state.is_enabled; } +static bool pc_machine_get_acpi_build(Object *obj, Error **errp) +{ + PCMachineState *pcms = PC_MACHINE(obj); + + return pcms->acpi_build_enabled; +} + +static void pc_machine_set_acpi_build(Object *obj, bool value, Error **errp) +{ + PCMachineState *pcms = PC_MACHINE(obj); + + pcms->acpi_build_enabled = value; +} + static void pc_machine_set_nvdimm(Object *obj, bool value, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); @@ -2159,6 +2173,8 @@ static void pc_machine_initfn(Object *obj) pcms->vmport = ON_OFF_AUTO_AUTO; /* nvdimm is disabled on default. */ pcms->acpi_nvdimm_state.is_enabled = false; + /* acpi build is enabled by default. */ + pcms->acpi_build_enabled = true; } static void pc_machine_reset(void) @@ -2319,6 +2335,9 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, PC_MACHINE_NVDIMM, pc_machine_get_nvdimm, pc_machine_set_nvdimm, &error_abort); + + object_class_property_add_bool(oc, PC_MACHINE_ACPI_BUILD, + pc_machine_get_acpi_build, pc_machine_set_acpi_build, &error_abort); } static const TypeInfo pc_machine_info = { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 17fff80..ec8cd0c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -63,6 +63,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; @@ -87,6 +89,7 @@ struct PCMachineState { #define PC_MACHINE_VMPORT "vmport" #define PC_MACHINE_SMM "smm" #define PC_MACHINE_NVDIMM "nvdimm" +#define PC_MACHINE_ACPI_BUILD "acpi-build" /** * PCMachineClass: diff --git a/xen-common.c b/xen-common.c index e641ad1..b1858d7 100644 --- 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");