diff options
| author | Don Slutz | 2014-06-25 22:19:07 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2014-06-29 17:59:41 +0200 |
| commit | 5f8632d3c3d7bc5ef24166ba7cf90fcfb2adbf7d (patch) | |
| tree | 2ea2215f565fa0916958eae98a8771be0f183c4c /hw/i386 | |
| parent | vhost-user: fix wrong ids in documentation (diff) | |
| download | qemu-5f8632d3c3d7bc5ef24166ba7cf90fcfb2adbf7d.tar.gz qemu-5f8632d3c3d7bc5ef24166ba7cf90fcfb2adbf7d.tar.xz qemu-5f8632d3c3d7bc5ef24166ba7cf90fcfb2adbf7d.zip | |
pc: make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout
QEMU 2.0 changed memory layout for isapc and pc-0.10 to pc-0.13.
This prevents 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.
Cc: qemu-stable@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Don Slutz <dslutz@verizon.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Fixes: https://bugs.launchpad.net/qemu/+bug/1334307
Tested-by: "Slutz, Donald Christopher" <dslutz@verizon.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 47546b72ae..2dccb3401b 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"; } |