Commit 7152c9ec authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: Fix stray error_report_err in s390_machine_protect 



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.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Fixes: 0141e1b4 ("s390x: protvirt: Add migration blocker")
Message-Id: <20200326140505.2432-1-frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 572c0826

hw/s390x/s390-virtio-ccw.c

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,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;