From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSMbD-00028Q-SC for qemu-devel@nongnu.org; Sun, 07 Feb 2016 05:29:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSMbA-0006m0-LE for qemu-devel@nongnu.org; Sun, 07 Feb 2016 05:29:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35065) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSMbA-0006lw-GH for qemu-devel@nongnu.org; Sun, 07 Feb 2016 05:29:44 -0500 Date: Sun, 7 Feb 2016 12:29:39 +0200 From: "Michael S. Tsirkin" Message-ID: <1454840944-29299-3-git-send-email-mst@redhat.com> References: <1454840944-29299-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454840944-29299-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Marcel Apfelbaum , Laszlo Ersek , Markus Armbruster , Igor Mammedov , Paolo Bonzini , John Snow , Richard Henderson We don't ship bios without support for loading ACPI anymore, and old q35 machine types don't allow migrating such bios. Drop it, as well as has_*mr flags that are there for migration compatibility. Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_q35.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 208a224..22a0fdc 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -116,10 +116,6 @@ static void pc_q35_init(MachineState *machine) } pc_cpus_init(pcms); - if (!pcmc->has_acpi_build) { - /* only machine types 1.7 & older need this */ - pc_acpi_init("q35-acpi-dsdt.aml"); - } kvmclock_create(); @@ -435,7 +431,6 @@ static void pc_q35_1_7_machine_options(MachineClass *m) pc_q35_2_0_machine_options(m); m->hw_version = "1.7.0"; m->default_machine_opts = NULL; - m->option_rom_has_mr = true; SET_MACHINE_COMPAT(m, PC_COMPAT_1_7); pcmc->smbios_defaults = false; pcmc->gigabyte_align = false; @@ -447,12 +442,9 @@ DEFINE_Q35_MACHINE(v1_7, "pc-q35-1.7", pc_compat_1_7, static void pc_q35_1_6_machine_options(MachineClass *m) { - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); m->hw_version = "1.6.0"; - m->rom_file_has_mr = false; SET_MACHINE_COMPAT(m, PC_COMPAT_1_6); - pcmc->has_acpi_build = false; } DEFINE_Q35_MACHINE(v1_6, "pc-q35-1.6", pc_compat_1_6, -- MST