Skip to content
Commit cab7dfcb authored by Don Slutz's avatar Don Slutz Committed by Michael Roth
Browse files

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: default avatarDon Slutz <dslutz@verizon.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Fixes: https://bugs.launchpad.net/qemu/+bug/1334307


Tested-by: default avatar"Slutz, Donald Christopher" <dslutz@verizon.com>
(cherry picked from commit 5f8632d3)

Conflicts:
	hw/i386/pc_piix.c

*removed dependency on c97294ec: smbios_legacy_mode always true pre-2.1.0
*removed dependency on de268e13: has_reserved_memory always false pre-2.1.0

Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent b5706a74
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment