From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9Vzg-0004Bo-H5 for qemu-devel@nongnu.org; Thu, 17 Dec 2015 05:41:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9Vzc-0001xt-LR for qemu-devel@nongnu.org; Thu, 17 Dec 2015 05:41:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9Vzc-0001xm-Fr for qemu-devel@nongnu.org; Thu, 17 Dec 2015 05:41:04 -0500 From: Gerd Hoffmann Date: Thu, 17 Dec 2015 11:40:49 +0100 Message-Id: <1450348849-21204-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1450348849-21204-1-git-send-email-kraxel@redhat.com> References: <1450348849-21204-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] q35: skip q35-acpi-dsdt.aml load if not needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , seabios@seabios.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson Only old machine types which don't use the acpi builder (qemu 1.7 + older) have to load that file for proper acpi support. Signed-off-by: Gerd Hoffmann --- hw/i386/pc_q35.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 133bc68..727269e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -129,7 +129,10 @@ static void pc_q35_init(MachineState *machine) } pc_cpus_init(pcms); - pc_acpi_init("q35-acpi-dsdt.aml"); + if (!has_acpi_build) { + /* only machine types 1.7 & older need this */ + pc_acpi_init("q35-acpi-dsdt.aml"); + } kvmclock_create(); -- 1.8.3.1