From nobody Mon Feb 9 09:33:26 2026 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=1584463232; cv=none; d=zohomail.com; s=zohoarc; b=fiUbiOJVwjUg0HEdd0Cctk1wUjo4jw8YkhoKPp0/SLR7YCzJPdkLsfTRhssGNf5bY9JoIROULZJKlkedffhitPt3gRjiziVm1hWyvAcd8HOjTUycRKaiWg3IRQdBpv7ucL7tuFB8qkDaKZMl+tIckhfeAMSE5fpMmz52OtNrKgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584463232; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wqB72yCY1p7yCeZkg0uizrFc4d/XuUya1TSV3J9ObRM=; b=KSTOTWhXTQSgfbVxrcmYqyz/3XJjmQv55u7SE3uUIkjJ2UxwCnWoUf4cvXXO+ymhw1wQjXfXsGIyNMAeM8YHk675mRDInVpbXSsnVwGrovDilSSSd2ZoiNdCmB3PX+lonuPaB6fd+vJ6JyQKYcPCLt9vJkgJ7kag3Mo9SJDnNi4= 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 1584463232261183.11581362502557; Tue, 17 Mar 2020 09:40:32 -0700 (PDT) Received: from localhost ([::1]:36644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFGZ-0004Gl-7C for importer@patchew.org; Tue, 17 Mar 2020 12:40:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFA6-0006q2-Ku for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFA5-0004il-2a for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:50 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:43077) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEFA4-0004dF-TJ for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:48 -0400 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-240-RZ1_-SaDO0C8Q-2_uGCGfg-1; Tue, 17 Mar 2020 12:33:46 -0400 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 59B30800D5B; Tue, 17 Mar 2020 16:33:45 +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 27ADC9080A; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AA3CB11366CF; Tue, 17 Mar 2020 17:33:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584462828; 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=wqB72yCY1p7yCeZkg0uizrFc4d/XuUya1TSV3J9ObRM=; b=DRgUPiUwQvbX6et7whYnM1UwZNhrBkUiq40KY3U+IsJgB9GpBITVjibtH8Q8C1F8fFcDal 6l5wUEKqOBrgJ8ktNR4Nm+8X3RdDDJVnEJg65jJTb1dp4ZrsQIstK6NaCTVo+5KGId9rvH ZucsfWI8gl9+tOFCvkY32vJzVetKtF4= X-MC-Unique: RZ1_-SaDO0C8Q-2_uGCGfg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/4] xen-block: Use one Error * variable instead of two Date: Tue, 17 Mar 2020 17:33:42 +0100 Message-Id: <20200317163343.25028-4-armbru@redhat.com> In-Reply-To: <20200317163343.25028-1-armbru@redhat.com> References: <20200317163343.25028-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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] X-Received-From: 63.128.21.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: Peter Maydell , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" While there, tidy up indentation, and add return just for consistency and robustness. Signed-off-by: Markus Armbruster Message-Id: <20200313170517.22480-4-armbru@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/block/xen-block.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 3885464513..07bb32e22b 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -998,29 +998,27 @@ static void xen_block_device_destroy(XenBackendInstan= ce *backend, XenBlockVdev *vdev =3D &blockdev->props.vdev; XenBlockDrive *drive =3D blockdev->drive; XenBlockIOThread *iothread =3D blockdev->iothread; + Error *local_err =3D NULL; =20 trace_xen_block_device_destroy(vdev->number); =20 object_unparent(OBJECT(xendev)); =20 if (iothread) { - Error *local_err =3D NULL; - xen_block_iothread_destroy(iothread, &local_err); if (local_err) { error_propagate_prepend(errp, local_err, - "failed to destroy iothread: "); + "failed to destroy iothread: "); return; } } =20 if (drive) { - Error *local_err =3D NULL; - xen_block_drive_destroy(drive, &local_err); if (local_err) { error_propagate_prepend(errp, local_err, - "failed to destroy drive: "); + "failed to destroy drive: "); + return; } } } --=20 2.21.1