]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commit
pc: make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout
authorDon Slutz <dslutz@verizon.com>
Wed, 25 Jun 2014 20:19:07 +0000 (16:19 -0400)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 6 Aug 2014 16:46:52 +0000 (11:46 -0500)
commitcab7dfcb062d22d2af68756c6b79eebc830e86e1
tree3fe5a8f3bdc4867b79df47e4f059ec2086e1e325
parentb5706a74b1307830d8d501413d197e1ab8a7324e
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>
(cherry picked from commit 5f8632d3c3d7bc5ef24166ba7cf90fcfb2adbf7d)

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: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/i386/pc_piix.c