On Thu, 26 Mar 2020 10:05:05 -0400 Janosch Frank <fran...@linux.ibm.com> wrote:
> In case the protection of the machine fails at s390_pv_vm_enable(), > we'll currently report the local_error variable. Problem is that > there's no migration blocker error that we can report at this point so > the pointer is always NULL which leads to a SEGFAULT. > > Let's remove the error report. Yes, s390_pvm_vm_enable() will already moan on error. > > Signed-off-by: Janosch Frank <fran...@linux.ibm.com> > Reported-by: Marc Hartmayer <mhart...@linux.ibm.com> > Fixes: 520935eedf941da3 ("s390x: protvirt: Add migration blocker") Note to self: update commit ID before I send a pull request (I will at least need to rebase for a headers update...) > --- > hw/s390x/s390-virtio-ccw.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 3cf19c99f3468b7d..855ecf370d6e82fa 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -358,7 +358,6 @@ static int s390_machine_protect(S390CcwMachineState *ms) > rc = s390_pv_vm_enable(); > if (rc) { > qemu_balloon_inhibit(false); > - error_report_err(local_err); > migrate_del_blocker(pv_mig_blocker); > error_free_or_abort(&pv_mig_blocker); > return rc; Thanks, applied.