diff options
| author | Cole Robinson <crobinso@redhat.com> | 2013-11-05 18:46:27 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-11-10 12:08:37 +0200 |
| commit | 04c7d8b8dea724f1007f0f6e76047ff03b4cb24f (patch) | |
| tree | 019e2c6abc0002a80903abd8fc4bc062aa156c33 /include/hw/pci-host | |
| parent | c2d30667760e3d7b81290d801e567d4f758825ca (diff) | |
| download | hqemu-04c7d8b8dea724f1007f0f6e76047ff03b4cb24f.zip hqemu-04c7d8b8dea724f1007f0f6e76047ff03b4cb24f.tar.gz | |
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>
Diffstat (limited to 'include/hw/pci-host')
| -rw-r--r-- | include/hw/pci-host/q35.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index aee91aa..309065f 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -61,6 +61,7 @@ typedef struct MCHPCIState { ram_addr_t above_4g_mem_size; uint64_t pci_hole64_size; PcGuestInfo *guest_info; + uint32_t short_root_bus; } MCHPCIState; typedef struct Q35PCIHost { |
