Message ID | 20171128173224.1138-1-lvivier@redhat.com |
---|---|
State | New |
Headers | show |
Series | pseries: fix TCG migration | expand |
On 28/11/2017 18:32, Laurent Vivier wrote: > 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(): > > at qemu/accel/kvm/kvm-all.c:2032 > radix=<optimized out>, gtse=<optimized out>, proc_tbl=<optimized out>) > at qemu/target/ppc/kvm.c:396 > version_id=<optimized out>) at /home/lvivier/qemu/hw/ppc/spapr.c:1578 > vmsd=0x1009479e0 <vmstate_spapr>, opaque=0x1019103c0, > version_id=<optimized out>) at /home/lvivier/qemu/migration/vmstate.c:165 > at qemu/migration/savevm.c:748 > I'm going to resend the patch because the lines starting with "#" have been removed... Thanks, Laurent
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9efddeaee5..a471de6cab 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1570,7 +1570,7 @@ static int spapr_post_load(void *opaque, int version_id) err = spapr_rtc_import_offset(&spapr->rtc, spapr->rtc_offset); } - if (spapr->patb_entry) { + if (kvm_enabled() && spapr->patb_entry) { PowerPCCPU *cpu = POWERPC_CPU(first_cpu); bool radix = !!(spapr->patb_entry & PATBE1_GR); bool gtse = !!(cpu->env.spr[SPR_LPCR] & LPCR_GTSE);
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(): at qemu/accel/kvm/kvm-all.c:2032 radix=<optimized out>, gtse=<optimized out>, proc_tbl=<optimized out>) at qemu/target/ppc/kvm.c:396 version_id=<optimized out>) at /home/lvivier/qemu/hw/ppc/spapr.c:1578 vmsd=0x1009479e0 <vmstate_spapr>, opaque=0x1019103c0, version_id=<optimized out>) at /home/lvivier/qemu/migration/vmstate.c:165 at qemu/migration/savevm.c:748 This patch fixes the problem by not calling the KVM function with the TCG mode. Fixes: d39c90f5f3 ("spapr: Fix migration of Radix guests") Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- hw/ppc/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)