From nobody Tue Apr 30 11:27:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579600722; cv=none; d=zohomail.com; s=zohoarc; b=Fk2Jte3Ahohv6Y8bTexbtvnpLs2vRrx6FUbiVokeEaYX25d3r+n0N9RScMGDL1cwTFgxpNB+uN2zVEWkWNNWv606y7Yl5gI8dOuwtEkbdNqx2K7qYWYyp07ZRd8OxnovgiUDtTt3GeiioboVd6pP4m41Zo7eUHwgM5Y/ln/iRyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579600722; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JFtQi7X5O9S0H7Cnwdmrnm+saB1n2yEL3XL+Mjc5ZQA=; b=FBTTyi2fx0MBKLpFjqgheu0n3bZagKwaxewP5bnFP9bNUtT9fhx4dSKJOJV3sdenlieJVLSsdWExYZbVLORvUFQv7/CYYrONnmieTG5N+BRTc114sPBbUTMqVY1kkZdSbmeNWN83NuNyS7p6TLKzc7YkDX8V0/21m/DfVJQl6zk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579600722870894.2360810657997; Tue, 21 Jan 2020 01:58:42 -0800 (PST) Received: from localhost ([::1]:50836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itqIz-0007FY-SZ for importer@patchew.org; Tue, 21 Jan 2020 04:58:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60862) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itqFt-0003Lx-7p for qemu-devel@nongnu.org; Tue, 21 Jan 2020 04:55:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itqFo-00076U-Mu for qemu-devel@nongnu.org; Tue, 21 Jan 2020 04:55:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:45988 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itqFo-00076N-Jz for qemu-devel@nongnu.org; Tue, 21 Jan 2020 04:55:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-69--1AV7HBMNIql8dsbXwtR7Q-1; Tue, 21 Jan 2020 04:55:14 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F2381922960; Tue, 21 Jan 2020 09:55:13 +0000 (UTC) Received: from localhost (dhcp-192-195.str.redhat.com [10.33.192.195]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E2BE7DB34; Tue, 21 Jan 2020 09:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579600524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFtQi7X5O9S0H7Cnwdmrnm+saB1n2yEL3XL+Mjc5ZQA=; b=ONZlPPJWLcRQlHU+nyY4jezvMTEG34h1fhm3re6CU0YLXyQbWT01fCVBoUHoC9tqQEnSI9 rWHF5ge77EXKA2XraOQ/zH6rTugLtpdLggcmS+q7ua4oIlaXcxglu3r5Svczf6kriz7s4f ifB77+sldfg8M+VSJk+CWzBvj5R+vJY= From: Cornelia Huck To: qemu-s390x@nongnu.org Subject: [PATCH] s390x/event-facility: fix error propagation Date: Tue, 21 Jan 2020 10:55:06 +0100 Message-Id: <20200121095506.8537-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: -1AV7HBMNIql8dsbXwtR7Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Borntraeger , Cornelia Huck , qemu-devel@nongnu.org, Markus Armbruster , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Fixes: 3d508334dd2c ("s390x/event-facility: Fix realize() error API violati= ons") Signed-off-by: Cornelia Huck Reviewed-by: David Hildenbrand Reviewed-by: Markus Armbruster Reviewed-by: Thomas Huth Tested-by: Christian Borntraeger --- 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, Erro= r **errp) DeviceState *dev =3D kid->child; =20 object_property_set_bool(OBJECT(dev), true, "realized", &err); - if (errp) { + if (err) { error_propagate(errp, err); return; } --=20 2.21.1