[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 4/5] Revert "spapr: Fix migration of PCI host bridges
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 4/5] Revert "spapr: Fix migration of PCI host bridges from qemu-2.7" |
Date: |
Mon, 21 Nov 2016 15:58:35 +1100 |
This reverts commit 9b54ca0ba781012eeea4237b7c4832ba2ea81d89.
The commit above corrected a migration breakage between qemu-2.7 and
qemu-2.8. However it did so by advancing the migration version for
the PCI host bridge, which obviously breaks migration backwards to
earlier qemu versions.
Although it's not totally essential, we'd like to maintain the
possibility for backwards migration, so revert the change in
preparation for a better fix.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_pci.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 661f7d8..e429c94 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1680,25 +1680,19 @@ static int spapr_pci_post_load(void *opaque, int
version_id)
return 0;
}
-static bool version_before_3(void *opaque, int version_id)
-{
- return version_id < 3;
-}
-
static const VMStateDescription vmstate_spapr_pci = {
.name = "spapr_pci",
- .version_id = 3,
+ .version_id = 2,
.minimum_version_id = 2,
.pre_save = spapr_pci_pre_save,
.post_load = spapr_pci_post_load,
.fields = (VMStateField[]) {
VMSTATE_UINT64_EQUAL(buid, sPAPRPHBState),
- VMSTATE_UNUSED_TEST(version_before_3,
- sizeof(uint32_t) /* dma_liobn[0] */
- + sizeof(uint64_t) /* mem_win_addr */
- + sizeof(uint64_t) /* mem_win_size */
- + sizeof(uint64_t) /* io_win_addr */
- + sizeof(uint64_t) /* io_win_size */),
+ VMSTATE_UINT32_EQUAL(dma_liobn[0], sPAPRPHBState),
+ VMSTATE_UINT64_EQUAL(mem_win_addr, sPAPRPHBState),
+ VMSTATE_UINT64_EQUAL(mem_win_size, sPAPRPHBState),
+ VMSTATE_UINT64_EQUAL(io_win_addr, sPAPRPHBState),
+ VMSTATE_UINT64_EQUAL(io_win_size, sPAPRPHBState),
VMSTATE_STRUCT_ARRAY(lsi_table, sPAPRPHBState, PCI_NUM_PINS, 0,
vmstate_spapr_pci_lsi, struct spapr_pci_lsi),
VMSTATE_INT32(msi_devs_num, sPAPRPHBState),
--
2.7.4
- [Qemu-ppc] [PATCH 0/5] Last minute ppc migration fixes, David Gibson, 2016/11/20
- [Qemu-ppc] [PATCH 5/5] spapr: Fix 2.7<->2.8 migration of PCI host bridge, David Gibson, 2016/11/20
- [Qemu-ppc] [PATCH 1/5] target-ppc: Fix CPU migration from qemu-2.6 <-> later versions, David Gibson, 2016/11/20
- [Qemu-ppc] [PATCH 2/5] migration: Add VMSTATE_UINTTL_TEST(), David Gibson, 2016/11/20
- [Qemu-ppc] [PATCH 3/5] target-ppc: Allow eventual removal of old migration mistakes, David Gibson, 2016/11/20
- [Qemu-ppc] [PATCH 4/5] Revert "spapr: Fix migration of PCI host bridges from qemu-2.7",
David Gibson <=
- Re: [Qemu-ppc] [PATCH 0/5] Last minute ppc migration fixes, David Gibson, 2016/11/21