From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO7Oc-0006p7-9s for qemu-devel@nongnu.org; Tue, 26 Jan 2016 12:27:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO7Ob-0007jL-Dh for qemu-devel@nongnu.org; Tue, 26 Jan 2016 12:27:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO7Ob-0007jA-9B for qemu-devel@nongnu.org; Tue, 26 Jan 2016 12:27:13 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id EFB4121A6 for ; Tue, 26 Jan 2016 17:27:12 +0000 (UTC) References: <1453564933-29638-1-git-send-email-ehabkost@redhat.com> <20160126145917.GG4218@thinpad.lan.raisama.net> From: Laszlo Ersek Message-ID: <56A7AC6D.8060607@redhat.com> Date: Tue, 26 Jan 2016 18:27:09 +0100 MIME-Version: 1.0 In-Reply-To: <20160126145917.GG4218@thinpad.lan.raisama.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 6/5] pc: Remove unused pc_acpi_init() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Markus Armbruster , Paolo Bonzini , Igor Mammedov , John Snow On 01/26/16 15:59, Eduardo Habkost wrote: > Signed-off-by: Eduardo Habkost > --- > 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); > > Reviewed-by: Laszlo Ersek