]> xenbits.xensource.com Git - qemu-xen.git/commit
Fix pc migration from qemu <= 1.5
authorCole Robinson <crobinso@redhat.com>
Tue, 5 Nov 2013 23:46:27 +0000 (18:46 -0500)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 9 Dec 2013 17:40:20 +0000 (11:40 -0600)
commit53e8cf93b3ecdb32ca4aa93d04b0a959988456fa
treea4ddf5286738ac1236a780b7d980329e291c1f7e
parent2c8187434f90fceb20ee1f0031fb591e5382674d
Fix pc migration from qemu <= 1.5

The following commit introduced a migration incompatibility:

commit 568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe
Author: David Gibson <david@gibson.dropbear.id.au>
Date:   Thu Jun 6 18:48:49 2013 +1000

    pci: Replace pci_find_domain() with more general pci_root_bus_path()

The issue is that i440fx savevm idstr went from 0000:00:00.0/I440FX to
0000:00.0/I440FX. Unfortunately we are stuck with the breakage for
1.6 machine types.

Add a compat property to maintain the busted idstr for the 1.6 machine
types, but revert to the old style format for 1.7+, and <= 1.5.

Tested with migration from qemu 1.5, qemu 1.6, and qemu.git.

Cc: qemu-stable@nongnu.org
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 04c7d8b8dea724f1007f0f6e76047ff03b4cb24f)

Conflicts:

include/hw/i386/pc.h

*removed 1.6 compat properties
*enabled short_root_bus by default to enable for 1.6 (no 1.6 compat
 fields to do so in 1.6.x)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/pci-host/piix.c
hw/pci-host/q35.c
include/hw/i386/pc.h
include/hw/pci-host/q35.h