[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/15] s390x/event-facility: fix error propagation
From: |
Cornelia Huck |
Subject: |
[PULL 05/15] s390x/event-facility: fix error propagation |
Date: |
Mon, 27 Jan 2020 13:20:06 +0100 |
We currently check (by error) if the passed-in Error pointer errp
is non-null and return after realizing the first child of the
event facility in that case. Symptom is that 'virsh shutdown'
does not work, as the sclpquiesce device is not realized.
Fix this by (correctly) checking the local Error err.
Reported-by: Christian Borntraeger <address@hidden>
Fixes: 3d508334dd2c ("s390x/event-facility: Fix realize() error API violations")
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/event-facility.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 8a93b8a1da97..9d6972afa8b3 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -338,7 +338,7 @@ static void sclp_events_bus_realize(BusState *bus, Error
**errp)
DeviceState *dev = kid->child;
object_property_set_bool(OBJECT(dev), true, "realized", &err);
- if (errp) {
+ if (err) {
error_propagate(errp, err);
return;
}
--
2.21.1
- [PULL 00/15] s390x update, Cornelia Huck, 2020/01/27
- [PULL 01/15] s390x/sclp.c: remove unneeded label in sclp_service_call(), Cornelia Huck, 2020/01/27
- [PULL 02/15] intc/s390_flic_kvm.c: remove unneeded label in kvm_flic_load(), Cornelia Huck, 2020/01/27
- [PULL 03/15] s390x/event-facility.c: remove unneeded labels, Cornelia Huck, 2020/01/27
- [PULL 04/15] s390x: adapter routes error handling, Cornelia Huck, 2020/01/27
- [PULL 05/15] s390x/event-facility: fix error propagation,
Cornelia Huck <=
- [PULL 06/15] target/s390x: Remove duplicated ifdef macro, Cornelia Huck, 2020/01/27
- [PULL 07/15] docs/devel: fix stable process doc formatting, Cornelia Huck, 2020/01/27
- [PULL 09/15] target/s390x: Move struct DisasFields definition earlier, Cornelia Huck, 2020/01/27
- [PULL 08/15] target/s390x/kvm: Enable adapter interruption suppression again, Cornelia Huck, 2020/01/27
- [PULL 10/15] target/s390x: Remove DisasFields argument from callbacks, Cornelia Huck, 2020/01/27
- [PULL 12/15] target/s390x: Move DisasFields into DisasContext, Cornelia Huck, 2020/01/27
- [PULL 14/15] hw/s390x: Add a more verbose comment about get_machine_class() and the wrappers, Cornelia Huck, 2020/01/27
- [PULL 13/15] target/s390x: Remove DisasFields argument from extract_insn, Cornelia Huck, 2020/01/27
- [PULL 15/15] s390x: sigp: Fix sense running reporting, Cornelia Huck, 2020/01/27
- [PULL 11/15] target/s390x: Pass DisasContext to get_field and have_field, Cornelia Huck, 2020/01/27