diff options
| author | Greg Kurz <gkurz@linux.vnet.ibm.com> | 2016-02-18 12:32:18 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-03-17 17:17:33 -0500 |
| commit | c06f342009eefdce1773cba6f351cc85bc398541 (patch) | |
| tree | bb2f7ef162b72097a59ff8bc41be7a2d581001a3 | |
| parent | cb873eaa6dc7e56b3f7394e5cdc9bbd8f9e23d1d (diff) | |
| download | hqemu-c06f342009eefdce1773cba6f351cc85bc398541.zip hqemu-c06f342009eefdce1773cba6f351cc85bc398541.tar.gz | |
spapr: skip configuration section during migration of older machines
Since QEMU 2.4, we have a configuration section in the migration stream.
This must be skipped for older machines, like it is already done for x86.
This patch fixes the migration of pseries-2.3 from/to QEMU 2.3, but it
breaks migration of the same machine from/to QEMU 2.4/2.4.1/2.5. We do
that anyway because QEMU 2.3 is likely to be more widely deployed than
newer QEMU versions.
Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit 09b5e30da5b19f44768a5429f603caaede216757)
Conflicts:
hw/ppc/spapr.c
*remove dep on 5013c5474
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/ppc/spapr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6bfb908..ff1537a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2327,6 +2327,7 @@ static void spapr_compat_2_3(Object *obj) { savevm_skip_section_footers(); global_state_set_optional(); + savevm_skip_configuration(); } static void spapr_compat_2_2(Object *obj) |
