Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B279C2BB1D for ; Tue, 17 Mar 2020 15:16:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC23320714 for ; Tue, 17 Mar 2020 15:16:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jUNz1eqR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC23320714 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEDxY-0001pw-U7 for qemu-devel@archiver.kernel.org; Tue, 17 Mar 2020 11:16:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58225) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEDu9-0006kN-UK for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEDu8-0007Lg-Mn for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:39644) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEDu8-0007IL-H7 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584457996; 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: in-reply-to:in-reply-to:references:references; bh=cMe4gcpCk7gBo8FlkVtx2v5//di/8sRY0Wyy5DbXA7k=; b=jUNz1eqRGm2Bv9S9PfAVhf+FNHhxc3nmQdT1pjrPWruf1WukPDgnVOeqz6OC7C3+a8EFi0 r+3h9Trbd8qArMVo+qDdoBOPrYrqE8xOQgJqxjreTeQI6unBpyxBW0rBYBpuJPLjiutlLG novuBBu6pEuv34IX+aZru2vkpK6Maq4= 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-31-plY_EUf6Nxyfs8zpxnx4cg-1; Tue, 17 Mar 2020 11:13:14 -0400 X-MC-Unique: plY_EUf6Nxyfs8zpxnx4cg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBE6A18B9FC1; Tue, 17 Mar 2020 15:13:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-130.ams2.redhat.com [10.36.112.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7DAB7E317; Tue, 17 Mar 2020 15:13:12 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3250A1138404; Tue, 17 Mar 2020 16:13:11 +0100 (CET) From: Markus Armbruster To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize References: <20200313170517.22480-1-armbru@redhat.com> <20200317125741.15301-1-vsementsov@virtuozzo.com> Date: Tue, 17 Mar 2020 16:13:11 +0100 In-Reply-To: <20200317125741.15301-1-vsementsov@virtuozzo.com> (Vladimir Sementsov-Ogievskiy's message of "Tue, 17 Mar 2020 15:57:41 +0300") Message-ID: <87lfnz6mm0.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain 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: 216.205.24.74 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: qemu-block@nongnu.org, qemu-devel@nongnu.org, alxndr@bu.edu, paul.durrant@citrix.com, ashijeetacharya@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Vladimir Sementsov-Ogievskiy writes: > It's wrong to use same err object as errp parameter for several > function calls without intermediate checking for error: we'll crash if > try to set err object twice. Fix that. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > > Forgive me for sending this into your series, but seems it is very > appropriate. > > It's rephrasing of my > [PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize > for partI series but but without use of ERRP_AUTO_PROPAGATE. > > hw/sd/ssi-sd.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c > index 91db069212..829797b597 100644 > --- a/hw/sd/ssi-sd.c > +++ b/hw/sd/ssi-sd.c > @@ -255,13 +255,25 @@ static void ssi_sd_realize(SSISlave *d, Error **err= p) > carddev =3D qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); > if (dinfo) { > qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo)= , &err); > + if (err) { > + goto fail; > + } > } > + > object_property_set_bool(OBJECT(carddev), true, "spi", &err); > + if (err) { > + goto fail; > + } > + > object_property_set_bool(OBJECT(carddev), true, "realized", &err); > if (err) { > - error_setg(errp, "failed to init SD card: %s", error_get_pretty(= err)); > - return; > + goto fail; > } > + > + return; > + > +fail: > + error_propagate_prepend(errp, err, "failed to init SD card: "); > } > =20 > static void ssi_sd_reset(DeviceState *dev) Reviewed-by: Markus Armbruster