On Fri, Dec 18, 2015 at 10:41:45AM +0100, Gerd Hoffmann wrote: > On Do, 2015-12-17 at 15:27 -0200, Eduardo Habkost 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 > > machine classes before pc-q35-2.4 were not migratable, so there's no > > point in keeping compatibility code for them. > > > > Remove all old pc-q35 machine classes and keep only pc-q35-2.4. > > > -static void pc_compat_1_6(MachineState *machine) > > -{ > > - pc_compat_1_7(machine); > > - rom_file_has_mr = false; > > - has_acpi_build = false; > > After applying this patch has_acpi_build is always true and can be > dropped, together with some other code elsewhere which depends on > has_acpi_build. The same is probably true for other variables as well > (gigabyte_align?). Guess it's best to do this as one-per-variable > incremental patches.
The static variables will be replaced by PCMachineClass fields. See: Subject: [Qemu-devel] [PATCH v3 0/6] pc: Initialization and compat function cleanup Date: Tue, 1 Dec 2015 20:58:02 -0200 Message-Id: <1449010688-19205-1-git-send-email-ehabk...@redhat.com> > > Reviewed-by: Gerd Hoffmann <kra...@gmail.com> Thanks! -- Eduardo