diff options
| author | Janosch Frank <frankja@linux.ibm.com> | 2020-03-26 10:05:05 -0400 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2020-04-29 14:34:24 +0200 |
| commit | 7152c9ecc6530ea145c122b0a58cc28802f630c6 (patch) | |
| tree | 06a0bac1ae03fb31fd64cd531903d50773022042 /hw/s390x | |
| parent | 572c0826615737f1c095b1b6d9e381ec40f72eb5 (diff) | |
| download | qemu-7152c9ecc6530ea145c122b0a58cc28802f630c6.zip qemu-7152c9ecc6530ea145c122b0a58cc28802f630c6.tar.gz qemu-7152c9ecc6530ea145c122b0a58cc28802f630c6.tar.bz2 | |
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: Janosch Frank <frankja@linux.ibm.com>
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Fixes: 0141e1b47707 ("s390x: protvirt: Add migration blocker")
Message-Id: <20200326140505.2432-1-frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index db45249..b268907 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -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; |