From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQC8-0006zd-GT for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:53:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBQC7-0000pV-OZ for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:53:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQC7-0000pR-IJ for qemu-devel@nongnu.org; Tue, 22 Dec 2015 11:53:51 -0500 Date: Tue, 22 Dec 2015 18:53:48 +0200 From: "Michael S. Tsirkin" Message-ID: <1450803119-4223-25-git-send-email-mst@redhat.com> References: <1450803119-4223-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1450803119-4223-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 24/55] 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: Peter Maydell , Richard Henderson , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini From: Gerd Hoffmann 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 342e9cf..942ef7e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -117,7 +117,10 @@ static void pc_q35_init(MachineState *machine) } pc_cpus_init(pcms); - pc_acpi_init("q35-acpi-dsdt.aml"); + if (!pcmc->has_acpi_build) { + /* only machine types 1.7 & older need this */ + pc_acpi_init("q35-acpi-dsdt.aml"); + } kvmclock_create(); -- MST