From nobody Mon May 12 12:20:52 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=1695048516; cv=none; d=zohomail.com; s=zohoarc; b=Dkh3T5WZ49Q4LwZMRi3Kr9RJB3t8MJNH0UDsCJ3D/c4iSARutxtNad17A5KIBUcgnEhMKZY7H/3uxErwwqUlYVhpjktXLmFNEAdNEkXLCqrCWI/A9O2FPa1V6qkUNUUVrIUbxMK20W5bnZ8ra5MCruQnAxlLJqmV9Pf9RR6Kqn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048516; 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=+GuWSGE7zxNvVSCuNA8qH/BysLhGCrLP8dSZ5tIdTtw=; b=kdWRQkyY42XovHbBheUhzZLqAQ/8E7s1aC/OV/W0In2F5lpyq7VdIfwEWmjZaIYZPVibpmUUWH0MrxwNtfCr6rLwGTjLcRHc1Oa6NqIhjPfjUsZRWopnmR1kghtBkbTeiCIV/JrLDSyCi2hNllXcrCaY9DMpZOdyIFf3rl+MLs4= 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 1695048516871744.7079172425649; Mon, 18 Sep 2023 07:48:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFSY-00038A-94; Mon, 18 Sep 2023 10:42:46 -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 1qiFSH-0002vz-8U for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:30 -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 1qiFS2-0002a6-KM for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:28 -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-96-1-egC8rdNluzZOJGjXXgLA-1; Mon, 18 Sep 2023 10:42:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 267683800BA6 for ; Mon, 18 Sep 2023 14:42:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 04BD21005E28 for ; Mon, 18 Sep 2023 14:42:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0347921E6910; Mon, 18 Sep 2023 16:42:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695048131; 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=+GuWSGE7zxNvVSCuNA8qH/BysLhGCrLP8dSZ5tIdTtw=; b=JwXj8bU/7O6/bHLRm3njK3+Rw6QaK5IBJXCH+byI9B8oqr+3Mt2Es0u82gmMJLNfv30tHi i/QGgnWamj+iAU7DHy123kGscI7yT96PpamTCNDiNLXFG3aCUp/ZBQUBBym7hOX38BVRnf TFtOZ1e97GPtsDOo3PzLqcWNFlTqiU0= X-MC-Unique: 1-egC8rdNluzZOJGjXXgLA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 09/52] migration/rdma: Put @errp parameter last Date: Mon, 18 Sep 2023 16:41:23 +0200 Message-ID: <20230918144206.560120-10-armbru@redhat.com> In-Reply-To: <20230918144206.560120-1-armbru@redhat.com> References: <20230918144206.560120-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1695048518400100012 Content-Type: text/plain; charset="utf-8" include/qapi/error.h demands: * - Functions that use Error to report errors have an Error **errp * parameter. It should be the last parameter, except for functions * taking variable arguments. qemu_rdma_connect() does not conform. Clean it up. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas Reviewed-by: Li Zhijian --- migration/rdma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 4339fcc7b2..2b40bbcbb0 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2532,7 +2532,8 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdm= a, } } =20 -static int qemu_rdma_connect(RDMAContext *rdma, Error **errp, bool return_= path) +static int qemu_rdma_connect(RDMAContext *rdma, bool return_path, + Error **errp) { RDMACapabilities cap =3D { .version =3D RDMA_CONTROL_VERSION_CURRENT, @@ -4175,7 +4176,7 @@ void rdma_start_outgoing_migration(void *opaque, } =20 trace_rdma_start_outgoing_migration_after_rdma_source_init(); - ret =3D qemu_rdma_connect(rdma, errp, false); + ret =3D qemu_rdma_connect(rdma, false, errp); =20 if (ret) { goto err; @@ -4196,7 +4197,7 @@ void rdma_start_outgoing_migration(void *opaque, goto return_path_err; } =20 - ret =3D qemu_rdma_connect(rdma_return_path, errp, true); + ret =3D qemu_rdma_connect(rdma_return_path, true, errp); =20 if (ret) { goto return_path_err; --=20 2.41.0