[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/20] s390x: protvirt: Fix stray error_report_err in s390_machine
From: |
Cornelia Huck |
Subject: |
[PULL 18/20] s390x: protvirt: Fix stray error_report_err in s390_machine_protect |
Date: |
Thu, 30 Apr 2020 11:44:43 +0200 |
From: Janosch Frank <address@hidden>
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 <address@hidden>
Reported-by: Marc Hartmayer <address@hidden>
Fixes: 0141e1b47707 ("s390x: protvirt: Add migration blocker")
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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 db45249320ab..b2689073953e 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;
--
2.21.1
- [PULL 08/20] s390x: Add SIDA memory ops, (continued)
- [PULL 08/20] s390x: Add SIDA memory ops, Cornelia Huck, 2020/04/30
- [PULL 09/20] s390x: protvirt: Move STSI data over SIDAD, Cornelia Huck, 2020/04/30
- [PULL 10/20] s390x: protvirt: SCLP interpretation, Cornelia Huck, 2020/04/30
- [PULL 11/20] s390x: protvirt: Set guest IPL PSW, Cornelia Huck, 2020/04/30
- [PULL 12/20] s390x: protvirt: Move diag 308 data over SIDA, Cornelia Huck, 2020/04/30
- [PULL 13/20] s390x: protvirt: Disable address checks for PV guest IO emulation, Cornelia Huck, 2020/04/30
- [PULL 14/20] s390x: protvirt: Move IO control structures over SIDA, Cornelia Huck, 2020/04/30
- [PULL 15/20] s390x: protvirt: Handle SIGP store status correctly, Cornelia Huck, 2020/04/30
- [PULL 16/20] docs: system: Add protvirt docs, Cornelia Huck, 2020/04/30
- [PULL 17/20] s390x: Add unpack facility feature to GA1, Cornelia Huck, 2020/04/30
- [PULL 18/20] s390x: protvirt: Fix stray error_report_err in s390_machine_protect,
Cornelia Huck <=
- [PULL 19/20] s390x/pv: Retry ioctls on -EINTR, Cornelia Huck, 2020/04/30
- [PULL 20/20] s390x/s390-virtio-ccw: Fix build on systems without KVM, Cornelia Huck, 2020/04/30
- Re: [PULL 00/20] first set of s390x patches for 5.1, Peter Maydell, 2020/04/30
- Re: [PULL 00/20] first set of s390x patches for 5.1, no-reply, 2020/04/30