Skip to content

Commit 0c86b2d

Browse files
vivierdgibson
authored andcommitted
pseries: fix TCG migration
Migration of pseries is broken with TCG because QEMU tries to restore KVM MMU state unconditionally. The result is a SIGSEGV in kvm_vm_ioctl(): #0 kvm_vm_ioctl (s=0x0, type=-2146390353) at qemu/accel/kvm/kvm-all.c:2032 camthesaxman#1 0x00000001003e3e2c in kvmppc_configure_v3_mmu (cpu=<optimized out>, radix=<optimized out>, gtse=<optimized out>, proc_tbl=<optimized out>) at qemu/target/ppc/kvm.c:396 irixxxx#2 0x00000001002f8b88 in spapr_post_load (opaque=0x1019103c0, version_id=<optimized out>) at qemu/hw/ppc/spapr.c:1578 irixxxx#3 0x000000010059e4cc in vmstate_load_state (f=0x106230000, vmsd=0x1009479e0 <vmstate_spapr>, opaque=0x1019103c0, version_id=<optimized out>) at qemu/migration/vmstate.c:165 qemu#4 0x00000001005987e0 in vmstate_load (f=<optimized out>, se=<optimized out>) at qemu/migration/savevm.c:748 This patch fixes the problem by not calling the KVM function with the TCG mode. Fixes: d39c90f ("spapr: Fix migration of Radix guests") Signed-off-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
1 parent c11d612 commit 0c86b2d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hw/ppc/spapr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,7 @@ static int spapr_post_load(void *opaque, int version_id)
15701570
err = spapr_rtc_import_offset(&spapr->rtc, spapr->rtc_offset);
15711571
}
15721572

1573-
if (spapr->patb_entry) {
1573+
if (kvm_enabled() && spapr->patb_entry) {
15741574
PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
15751575
bool radix = !!(spapr->patb_entry & PATBE1_GR);
15761576
bool gtse = !!(cpu->env.spr[SPR_LPCR] & LPCR_GTSE);

0 commit comments

Comments
 (0)