| Message ID | 1454840944-29299-3-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote: > 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. Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ? It's also a guest-visible change as acpi tables change ... I'm all for cleaning up this old cruft, but I think it would be cleaner to just drop the old (pre-migration support) q35 machine types instead of changing them in subtle ways ... cheers, Gerd
On Mon, Feb 15, 2016 at 11:58:24AM +0100, Gerd Hoffmann wrote: > On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote: > > 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. > > Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ? I think I said this somewhere but I'll repeat it here: I think we should just mark the old machine types non migrateable. > It's also a guest-visible change as acpi tables change ... acpi tables change yes but not too much - there are just bugfixes. We change acpi tables without versioning within reason. For example, recent change by Igor completely removed SSDT and affected old machine types too. > I'm all for cleaning up this old cruft, but I think it would be cleaner > to just drop the old (pre-migration support) q35 machine types instead > of changing them in subtle ways ... > > cheers, > Gerd Easier, sure. Not sure about the cleaner ...
Gerd Hoffmann <kraxel@redhat.com> writes: > On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote: >> 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. > > Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ? > It's also a guest-visible change as acpi tables change ... Madness. > I'm all for cleaning up this old cruft, but I think it would be cleaner > to just drop the old (pre-migration support) q35 machine types instead > of changing them in subtle ways ... Yup.
On Mon, Feb 15, 2016 at 01:30:49PM +0200, Michael S. Tsirkin wrote: > On Mon, Feb 15, 2016 at 11:58:24AM +0100, Gerd Hoffmann wrote: > > On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote: > > > 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. > > > > Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ? > > I think I said this somewhere but I'll repeat it here: I think we should > just mark the old machine types non migrateable. If you are making changes that break migration, I believe you need to mark the machines as non-migratable before making those changes. ...or we could stop wasting time changing those old machines and remove them.
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,
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 <mst@redhat.com> --- hw/i386/pc_q35.c | 8 -------- 1 file changed, 8 deletions(-)