From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS05n-0003Aq-Cr for qemu-devel@nongnu.org; Wed, 19 Aug 2015 05:55:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZS05k-0003AG-3J for qemu-devel@nongnu.org; Wed, 19 Aug 2015 05:55:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS05j-00039s-Mh for qemu-devel@nongnu.org; Wed, 19 Aug 2015 05:55:31 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 20F8896C5 for ; Wed, 19 Aug 2015 09:55:31 +0000 (UTC) Date: Wed, 19 Aug 2015 10:55:26 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20150819095526.GB2332@work-vm> References: <1439939502-4722-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1439939502-4722-1-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH] q35: Remove old machine versions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: "Michael S. Tsirkin" , John Snow , Marcel Apfelbaum , Markus Armbruster , qemu-devel@nongnu.org, Paolo Bonzini , Laszlo Ersek * Eduardo Habkost (ehabkost@redhat.com) wrote: > Migration with q35 was not possible before commit > 04329029a8c539eb5f75dcb6d8b016f0c53a031a, because q35 unconditionally creates > an ich9-ahci device, that was marked as unmigratable. So all q35 machines > before pc-q35-2.4 were unmigratable, and there's no point in keeping > compatibility code for them. > > Remove all old pc-q35 machine classes and keep only pc-q35-2.4. But doesn't that mean that anyone who has a machine configured with one of those machine types will suddenly find it wont start? Dave > > Signed-off-by: Eduardo Habkost > --- > hw/i386/pc_q35.c | 153 ------------------------------------------------------- > 1 file changed, 153 deletions(-) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 4ee653e..e482f2f 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -272,60 +272,6 @@ static void pc_q35_init(MachineState *machine) > } > } > > -static void pc_compat_2_3(MachineState *machine) > -{ > - PCMachineState *pcms = PC_MACHINE(machine); > - savevm_skip_section_footers(); > - if (kvm_enabled()) { > - pcms->smm = ON_OFF_AUTO_OFF; > - } > - global_state_set_optional(); > - savevm_skip_configuration(); > -} > - > -static void pc_compat_2_2(MachineState *machine) > -{ > - pc_compat_2_3(machine); > - machine->suppress_vmdesc = true; > -} > - > -static void pc_compat_2_1(MachineState *machine) > -{ > - PCMachineState *pcms = PC_MACHINE(machine); > - > - pc_compat_2_2(machine); > - pcms->enforce_aligned_dimm = false; > - x86_cpu_compat_kvm_no_autodisable(FEAT_8000_0001_ECX, CPUID_EXT3_SVM); > -} > - > -static void pc_compat_2_0(MachineState *machine) > -{ > - pc_compat_2_1(machine); > -} > - > -static void pc_compat_1_7(MachineState *machine) > -{ > - pc_compat_2_0(machine); > - option_rom_has_mr = true; > - x86_cpu_compat_kvm_no_autoenable(FEAT_1_ECX, CPUID_EXT_X2APIC); > -} > - > -static void pc_compat_1_6(MachineState *machine) > -{ > - pc_compat_1_7(machine); > - rom_file_has_mr = false; > -} > - > -static void pc_compat_1_5(MachineState *machine) > -{ > - pc_compat_1_6(machine); > -} > - > -static void pc_compat_1_4(MachineState *machine) > -{ > - pc_compat_1_5(machine); > -} > - > #define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \ > static void pc_init_##suffix(MachineState *machine) \ > { \ > @@ -358,102 +304,3 @@ static void pc_q35_2_4_machine_options(MachineClass *m) > > DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, > pc_q35_2_4_machine_options); > - > - > -static void pc_q35_2_3_machine_options(MachineClass *m) > -{ > - pc_q35_2_4_machine_options(m); > - m->no_floppy = 0; > - m->no_tco = 1; > - m->alias = NULL; > - SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > -} > - > -DEFINE_Q35_MACHINE(v2_3, "pc-q35-2.3", pc_compat_2_3, > - pc_q35_2_3_machine_options); > - > - > -static void pc_q35_2_2_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_2_3_machine_options(m); > - SET_MACHINE_COMPAT(m, PC_COMPAT_2_2); > - pcmc->rsdp_in_ram = false; > -} > - > -DEFINE_Q35_MACHINE(v2_2, "pc-q35-2.2", pc_compat_2_2, > - pc_q35_2_2_machine_options); > - > - > -static void pc_q35_2_1_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_2_2_machine_options(m); > - m->default_display = NULL; > - SET_MACHINE_COMPAT(m, PC_COMPAT_2_1); > - pcmc->smbios_uuid_encoded = false; > -} > - > -DEFINE_Q35_MACHINE(v2_1, "pc-q35-2.1", pc_compat_2_1, > - pc_q35_2_1_machine_options); > - > - > -static void pc_q35_2_0_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_2_1_machine_options(m); > - SET_MACHINE_COMPAT(m, PC_COMPAT_2_0); > - pcmc->has_reserved_memory = false; > - pcmc->smbios_legacy_mode = true; > - pcmc->acpi_data_size = 0x10000; > -} > - > -DEFINE_Q35_MACHINE(v2_0, "pc-q35-2.0", pc_compat_2_0, > - pc_q35_2_0_machine_options); > - > - > -static void pc_q35_1_7_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_2_0_machine_options(m); > - m->default_machine_opts = NULL; > - SET_MACHINE_COMPAT(m, PC_COMPAT_1_7); > - pcmc->smbios_defaults = false; > - pcmc->gigabyte_align = false; > -} > - > -DEFINE_Q35_MACHINE(v1_7, "pc-q35-1.7", pc_compat_1_7, > - pc_q35_1_7_machine_options); > - > - > -static void pc_q35_1_6_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - pc_q35_machine_options(m); > - 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, > - pc_q35_1_6_machine_options); > - > - > -static void pc_q35_1_5_machine_options(MachineClass *m) > -{ > - pc_q35_1_6_machine_options(m); > - SET_MACHINE_COMPAT(m, PC_COMPAT_1_5); > -} > - > -DEFINE_Q35_MACHINE(v1_5, "pc-q35-1.5", pc_compat_1_5, > - pc_q35_1_5_machine_options); > - > - > -static void pc_q35_1_4_machine_options(MachineClass *m) > -{ > - pc_q35_1_5_machine_options(m); > - m->hot_add_cpu = NULL; > - SET_MACHINE_COMPAT(m, PC_COMPAT_1_4); > -} > - > -DEFINE_Q35_MACHINE(v1_4, "pc-q35-1.4", pc_compat_1_4, > - pc_q35_1_4_machine_options); > -- > 2.1.0 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK