From nobody Mon May 12 14:52:47 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695907385; cv=none; d=zohomail.com; s=zohoarc; b=RF3GRYkkcw1ZFRpzEadzAnbuq1DcClNWlfqomfvOi0qlcYRlD66iXVxFt/qJPf23T3dpbxhdsbTccvgd442sAfWgRdTLpydITSpnKbOhPAdGdTDTmgfYURTfjcluN6xUsJuo3PDyq1+5qMXQdqB/eSWLM12q39da7quvy+SPRjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695907385; 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=lxK3GnnQQW4HaZmTR/EwmYQ8JkLBURQkkY1XY0uKZmU=; b=Stqw/ltZxswspt25MJTRewnOnP/u8L1h74HIEUPpkR40ebMATNDWyEbKZM1bvipKM7S8D445r1/zOS/p5Rf5bgdiM3tlPfkqUCQ7wpRCl7/jGy/FTbcGm3l0JGyleIF1ev5Yqr8VHc/RrtDpOVHg6BnqYAnZjvkB++oFFrrmxKA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695907385389172.14527009258245; Thu, 28 Sep 2023 06:23:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlqwz-0003po-1z; Thu, 28 Sep 2023 09:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlqwb-0003bI-U0 for qemu-devel@nongnu.org; Thu, 28 Sep 2023 09:20:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlqwP-0008GC-Ca for qemu-devel@nongnu.org; Thu, 28 Sep 2023 09:20:41 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-318-36YkolvgNKu_xazYt7c0rA-1; Thu, 28 Sep 2023 09:20:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 292AB1C00D19; Thu, 28 Sep 2023 13:20:22 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0698E2026D68; Thu, 28 Sep 2023 13:20:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E0E4521E6913; Thu, 28 Sep 2023 15:20:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695907227; 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=lxK3GnnQQW4HaZmTR/EwmYQ8JkLBURQkkY1XY0uKZmU=; b=OmEn99eCwBgSG6C2LvxOK2/pGhHtTtgeSt3SSt4mhLvhoT3nKQDIG5HkIYNE1FYmABc/t/ TJ9RRBllyM5iyKk9l7Y4ppBbbNr7p1YMzKwSlfKLXskmfohug9zMUrWwnt/eddOtIwAM5q NiHdYdDYqO5YNDclCCApD3F6wnFxgfQ= X-MC-Unique: 36YkolvgNKu_xazYt7c0rA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com, farosas@suse.de, lizhijian@fujitsu.com, eblake@redhat.com Subject: [PATCH v2 11/53] migration/rdma: Eliminate error_propagate() Date: Thu, 28 Sep 2023 15:19:37 +0200 Message-ID: <20230928132019.2544702-12-armbru@redhat.com> In-Reply-To: <20230928132019.2544702-1-armbru@redhat.com> References: <20230928132019.2544702-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695907385689100009 Content-Type: text/plain; charset="utf-8" When all we do with an Error we receive into a local variable is propagating to somewhere else, we can just as well receive it there right away. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas Reviewed-by: Li Zhijian Reviewed-by: Juan Quintela --- migration/rdma.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 176fe1a5f1..380d550229 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2445,7 +2445,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **= errp) { int ret, idx; - Error *local_err =3D NULL, **temp =3D &local_err; =20 /* * Will be validated against destination's actual capabilities @@ -2453,14 +2452,14 @@ static int qemu_rdma_source_init(RDMAContext *rdma,= bool pin_all, Error **errp) */ rdma->pin_all =3D pin_all; =20 - ret =3D qemu_rdma_resolve_host(rdma, temp); + ret =3D qemu_rdma_resolve_host(rdma, errp); if (ret) { goto err_rdma_source_init; } =20 ret =3D qemu_rdma_alloc_pd_cq(rdma); if (ret) { - ERROR(temp, "rdma migration: error allocating pd and cq! Your mloc= k()" + ERROR(errp, "rdma migration: error allocating pd and cq! Your mloc= k()" " limits may be too low. Please check $ ulimit -a # an= d " "search for 'ulimit -l' in the output"); goto err_rdma_source_init; @@ -2468,13 +2467,13 @@ static int qemu_rdma_source_init(RDMAContext *rdma,= bool pin_all, Error **errp) =20 ret =3D qemu_rdma_alloc_qp(rdma); if (ret) { - ERROR(temp, "rdma migration: error allocating qp!"); + ERROR(errp, "rdma migration: error allocating qp!"); goto err_rdma_source_init; } =20 ret =3D qemu_rdma_init_ram_blocks(rdma); if (ret) { - ERROR(temp, "rdma migration: error initializing ram blocks!"); + ERROR(errp, "rdma migration: error initializing ram blocks!"); goto err_rdma_source_init; } =20 @@ -2489,7 +2488,7 @@ static int qemu_rdma_source_init(RDMAContext *rdma, b= ool pin_all, Error **errp) for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { ret =3D qemu_rdma_reg_control(rdma, idx); if (ret) { - ERROR(temp, "rdma migration: error registering %d control!", + ERROR(errp, "rdma migration: error registering %d control!", idx); goto err_rdma_source_init; } @@ -2498,7 +2497,6 @@ static int qemu_rdma_source_init(RDMAContext *rdma, b= ool pin_all, Error **errp) return 0; =20 err_rdma_source_init: - error_propagate(errp, local_err); qemu_rdma_cleanup(rdma); return -1; } @@ -4103,7 +4101,6 @@ void rdma_start_incoming_migration(const char *host_p= ort, Error **errp) { int ret; RDMAContext *rdma; - Error *local_err =3D NULL; =20 trace_rdma_start_incoming_migration(); =20 @@ -4113,13 +4110,12 @@ void rdma_start_incoming_migration(const char *host= _port, Error **errp) return; } =20 - rdma =3D qemu_rdma_data_init(host_port, &local_err); + rdma =3D qemu_rdma_data_init(host_port, errp); if (rdma =3D=3D NULL) { goto err; } =20 - ret =3D qemu_rdma_dest_init(rdma, &local_err); - + ret =3D qemu_rdma_dest_init(rdma, errp); if (ret) { goto err; } @@ -4142,7 +4138,6 @@ void rdma_start_incoming_migration(const char *host_p= ort, Error **errp) cleanup_rdma: qemu_rdma_cleanup(rdma); err: - error_propagate(errp, local_err); if (rdma) { g_free(rdma->host); g_free(rdma->host_port); --=20 2.41.0