[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout |
Date: |
Thu, 26 Jun 2014 09:15:04 +0300 |
On Wed, Jun 25, 2014 at 04:19:07PM -0400, Don Slutz wrote:
> This will prevent correct migration from QEMU 1.7.0 for these
> machine types when -m 3.5G is specified.
>
> Paolo Bonzini asked that:
>
> smbios_legacy_mode = true;
> has_reserved_memory = false;
> option_rom_has_mr = true;
> rom_file_has_mr = false;
>
> also be done.
>
> Signed-off-by: Don Slutz <address@hidden>
I tweaked commit log so it's readable without
the subject.
Applied, thanks everyone.
> ---
>
> No idea how to test Paolo's changes. But they look good to me and
> compile cleanly.
>
> hw/i386/pc_piix.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 47546b7..2dccb34 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -392,6 +392,11 @@ static void pc_init_pci_no_kvmclock(MachineState
> *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
> enable_compat_apic_id_mode();
> pc_init1(machine, 1, 0);
> @@ -402,6 +407,11 @@ static void pc_init_isa(MachineState *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> if (!machine->cpu_model) {
> machine->cpu_model = "486";
> }
> --
> 1.8.4