From patchwork Tue Jan 26 14:59:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 8123841 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D310FBEEE5 for ; Tue, 26 Jan 2016 14:59:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F71C20256 for ; Tue, 26 Jan 2016 14:59:39 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 8CBBD20220 for ; Tue, 26 Jan 2016 14:59:38 +0000 (UTC) Received: from localhost ([::1]:44543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO55i-0001Nd-QS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 09:59:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO55Z-0001Mv-Md for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:59:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO55U-0002SC-QS for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:59:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO55U-0002S7-Kg for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:59:20 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 0F1F5806 for ; Tue, 26 Jan 2016 14:59:19 +0000 (UTC) Received: from localhost (ovpn-113-176.phx2.redhat.com [10.3.113.176]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QExIhj010580; Tue, 26 Jan 2016 09:59:19 -0500 Date: Tue, 26 Jan 2016 12:59:17 -0200 From: Eduardo Habkost To: qemu-devel@nongnu.org Message-ID: <20160126145917.GG4218@thinpad.lan.raisama.net> References: <1453564933-29638-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1453564933-29638-1-git-send-email-ehabkost@redhat.com> X-Fnord: you can see the fnord User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcel Apfelbaum , John Snow , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Igor Mammedov , Laszlo Ersek Subject: [Qemu-devel] [PATCH 6/5] pc: Remove unused pc_acpi_init() function 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eduardo Habkost Reviewed-by: Laszlo Ersek --- Additional code we can remove after removing the old q35 machines. --- hw/i386/pc.c | 28 ---------------------------- include/hw/i386/pc.h | 1 - 2 files changed, 29 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 78cf8fa..f68c0c6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1233,34 +1233,6 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, pci_address_space, -1); } -void pc_acpi_init(const char *default_dsdt) -{ - char *filename; - - if (acpi_tables != NULL) { - /* manually set via -acpitable, leave it alone */ - return; - } - - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt); - if (filename == NULL) { - fprintf(stderr, "WARNING: failed to find %s\n", default_dsdt); - } else { - QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0, - &error_abort); - Error *err = NULL; - - qemu_opt_set(opts, "file", filename, &error_abort); - - acpi_table_add_builtin(opts, &err); - if (err) { - error_reportf_err(err, "WARNING: failed to load %s: ", - filename); - } - g_free(filename); - } -} - FWCfgState *xen_load_linux(PCMachineState *pcms, PcGuestInfo *guest_info) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 65e8f24..3bc9e62 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -230,7 +230,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(PCMachineState *pcms); void pc_hot_add_cpu(const int64_t id, Error **errp); -void pc_acpi_init(const char *default_dsdt); PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);