From patchwork Thu Oct 27 13:51:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9399315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DFE6600BA for ; Thu, 27 Oct 2016 13:52:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E31362A2DB for ; Thu, 27 Oct 2016 13:52:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D78402A2E2; Thu, 27 Oct 2016 13:52:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1DB622A2DB for ; Thu, 27 Oct 2016 13:52:14 +0000 (UTC) Received: from localhost ([::1]:41620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzl6K-0002sI-RP for patchwork-qemu-devel@patchwork.kernel.org; Thu, 27 Oct 2016 09:52:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzl5u-0002ou-H8 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 09:51:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzl5p-0000RN-N1 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 09:51:46 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:22973) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzl5p-0000Qn-G1 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 09:51:41 -0400 X-IronPort-AV: E=Sophos;i="5.31,404,1473120000"; d="scan'208";a="394966102" From: Wei Liu To: Date: Thu, 27 Oct 2016 14:51:09 +0100 Message-ID: <1477576269-31748-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 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 v2] xenfv: set has_acpi_build to false 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 , Sander Eikelenboom , Igor Mammedov , Anthony PERARD , Xen-devel Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Wei Liu Reviewed-by: Igor Mammedov Tested-by: Sander Eikelenboom --- Cc: Igor Mammedov Cc: Anthony PERARD Cc: Stefano Stabellini Cc: Sander Eikelenboom --- 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,