From nobody Wed Nov 5 15:55:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497373476348646.7616608763516; Tue, 13 Jun 2017 10:04:36 -0700 (PDT) Received: from localhost ([::1]:44350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKpF4-0005nW-Sq for importer@patchew.org; Tue, 13 Jun 2017 13:04:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKp4b-0004W3-H8 for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKp4a-0000To-K5 for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKp4a-0000TT-EB for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:44 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 71B3DC04B941; Tue, 13 Jun 2017 16:53:43 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0598EA3941; Tue, 13 Jun 2017 16:53:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 71B3DC04B941 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 71B3DC04B941 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 13:53:11 -0300 Message-Id: <20170613165313.20954-14-ehabkost@redhat.com> In-Reply-To: <20170613165313.20954-1-ehabkost@redhat.com> References: <20170613165313.20954-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 13 Jun 2017 16:53:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 13/15] rdma: Simplify var declaration to avoid confusing Coccinelle X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For some reason the declaration: Error *local_err =3D NULL, **errp =3D &local_err; will be matched by Coccinelle even if we use: ... when !=3D local_err Error *local_err =3D NULL; ... when !=3D local_err This moves the declarations to separate lines just to avoid that issue. Signed-off-by: Eduardo Habkost --- migration/rdma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index c6078bf51b..5cb9572a5c 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2282,7 +2282,8 @@ 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; + Error *local_err =3D NULL; + Error **temp =3D &local_err; =20 /* * Will be validated against destination's actual capabilities @@ -3433,7 +3434,8 @@ static int qemu_rdma_registration_start(QEMUFile *f, = void *opaque, static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, uint64_t flags, void *data) { - Error *local_err =3D NULL, **errp =3D &local_err; + Error *local_err =3D NULL; + Error **errp =3D &local_err; QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(opaque); RDMAContext *rdma =3D rioc->rdma; RDMAControlHeader head =3D { .len =3D 0, .repeat =3D 1 }; @@ -3606,7 +3608,8 @@ static void rdma_accept_incoming_migration(void *opaq= ue) RDMAContext *rdma =3D opaque; int ret; QEMUFile *f; - Error *local_err =3D NULL, **errp =3D &local_err; + Error *local_err =3D NULL; + Error **errp =3D &local_err; =20 trace_qemu_rdma_accept_incoming_migration(); ret =3D qemu_rdma_accept(rdma); --=20 2.11.0.259.g40922b1