On 01/26/16 15:59, Eduardo Habkost wrote:
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> 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 <ler...@redhat.com>
