summary refs log tree commit diff stats
path: root/hw
diff options
context:
space:
mode:
authorCornelia Huck <cohuck@redhat.com>2020-01-21 10:41:00 +0100
committerCornelia Huck <cohuck@redhat.com>2020-01-27 12:13:09 +0100
commitd6a9858d24df4fc8633e1c3cb7bf928b80b9685c (patch)
tree411fa0d13618c5333ad8e15a6217043fd0e97f58 /hw
parent3c5fd8074335c67777d9391b84f97070c35d9c63 (diff)
downloadfocaccia-qemu-d6a9858d24df4fc8633e1c3cb7bf928b80b9685c.tar.gz
focaccia-qemu-d6a9858d24df4fc8633e1c3cb7bf928b80b9685c.zip
s390x/event-facility: fix error propagation
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 <borntraeger@de.ibm.com>
Fixes: 3d508334dd2c ("s390x/event-facility: Fix realize() error API violations")
Message-Id: <20200121095506.8537-1-cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/s390x/event-facility.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 8a93b8a1da..9d6972afa8 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;
         }