From patchwork Thu Aug 8 16:38:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 265767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E794D2C00A0 for ; Fri, 9 Aug 2013 02:39:00 +1000 (EST) Received: from localhost ([::1]:45186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7TEn-0001C0-Ob for incoming@patchwork.ozlabs.org; Thu, 08 Aug 2013 12:38:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7TEM-00019U-3W for qemu-devel@nongnu.org; Thu, 08 Aug 2013 12:38:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7TED-0004TO-5u for qemu-devel@nongnu.org; Thu, 08 Aug 2013 12:38:29 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:46256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7TED-0004SO-1u for qemu-devel@nongnu.org; Thu, 08 Aug 2013 12:38:21 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Aug 2013 12:38:16 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Aug 2013 12:38:14 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 9C2966E8047 for ; Thu, 8 Aug 2013 12:38:08 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r78GcDWJ081206 for ; Thu, 8 Aug 2013 12:38:13 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r78GcCEj012038 for ; Thu, 8 Aug 2013 13:38:12 -0300 Received: from titi.austin.ibm.com (titi.austin.ibm.com [9.41.105.234]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r78Gc8Uq011796; Thu, 8 Aug 2013 13:38:09 -0300 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Thu, 8 Aug 2013 11:38:08 -0500 Message-Id: <1375979888-4879-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13080816-5806-0000-0000-0000225AD0AB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] pc: drop external DSDT loading X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This breaks migration and is unneeded with modern SeaBIOS. Signed-off-by: Anthony Liguori --- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ab25458..daaff8a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -103,7 +103,6 @@ static void pc_init1(MemoryRegion *system_memory, OBJECT(icc_bridge), NULL); pc_cpus_init(cpu_model, icc_bridge); - pc_acpi_init("acpi-dsdt.aml"); if (kvm_enabled() && kvmclock_enabled) { kvmclock_create(); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2f35d12..8c6c7bc 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -86,7 +86,6 @@ static void pc_q35_init(QEMUMachineInitArgs *args) OBJECT(icc_bridge), NULL); pc_cpus_init(cpu_model, icc_bridge); - pc_acpi_init("q35-acpi-dsdt.aml"); kvmclock_create();