From nobody Tue Apr 30 19:40:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629872715; cv=none; d=zohomail.com; s=zohoarc; b=hRcs1Z99Uhx4s9983rJ3/p5pSUU+gZn4vNBdkj/BgFtrcoFKoEqywKk5RYWW43wheOjxZwnihKdy37w41+Oj+VMxgSIsbNvW/pvnV2EbFtyZTsDiHYkM8/Q5bGz40cY2CDrO6SG41180imtooaxCa6JYQJwTs+KaK4QposEiSic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629872715; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=H+MRKVY1+87PTphWJ8h52+nwJ2uKSZ2hmxJNZxE9nXo=; b=EpISaFg533owgVUrjuTd7MtNSA5daDrBSAhAuUQQINZzJMNIN5hMUIm0R0c8z8ajRO5lMpr43OYCALnFuTVd5YQVpYyAtm95dKQOL7KTxu0bIPWfaDKIy7fwDNCBad3nBhf+YffHVpAYoPHOMUC0YGOE7U9Cw4dJjM0d9MN0T3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1629872715085185.44132659022478; Tue, 24 Aug 2021 23:25:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.171792.313482 (Exim 4.92) (envelope-from ) id 1mImLN-00081q-B5; Wed, 25 Aug 2021 06:25:01 +0000 Received: by outflank-mailman (output) from mailman id 171792.313482; Wed, 25 Aug 2021 06:25:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mImLN-00081j-7R; Wed, 25 Aug 2021 06:25:01 +0000 Received: by outflank-mailman (input) for mailman id 171792; Wed, 25 Aug 2021 06:25:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mImLM-00081d-4G for xen-devel@lists.xenproject.org; Wed, 25 Aug 2021 06:25:00 +0000 Received: from mail-qt1-x830.google.com (unknown [2607:f8b0:4864:20::830]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bac558df-42b3-4ef6-aa83-f24392793d4d; Wed, 25 Aug 2021 06:24:59 +0000 (UTC) Received: by mail-qt1-x830.google.com with SMTP id g11so18957019qtk.5 for ; Tue, 24 Aug 2021 23:24:59 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id x21sm12230230qkf.76.2021.08.24.23.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 23:24:58 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bac558df-42b3-4ef6-aa83-f24392793d4d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H+MRKVY1+87PTphWJ8h52+nwJ2uKSZ2hmxJNZxE9nXo=; b=lNnsvZ9zCh3fplemTR+tcxkriS3QKZIZLdaJZkqv5zvSAKOZoF/3pG9iu9nv0AwN+F 1sia09hBrJreeyYAJxAbkjBmBwKxp7yOhm1STA4OCSuOI+pUetXHvZy3fEF/I8aI4ni6 TGOmWIlaJuIBrsbdybMAtqO7fXHFJPx02VQYNWMartU6FqtrJ8SyP5xIfnLL2POU+EGS MeedmeZytni0SUraPlOfvXHi1LtPsZoPOAL+PErYa7NalOtRwP53RQrl9UwGAuJYb9RJ T0Fpl62XKZJgGXGN44fZ9XmlyubrcY+f//XYprPV3GPSIlp1uTXNOSst/6ye+7wjF8Pi cW6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H+MRKVY1+87PTphWJ8h52+nwJ2uKSZ2hmxJNZxE9nXo=; b=rVHR3GTEaqHbwHXC3/KPSogkwzQKqhxXufh8DxQWcrF8WNO7ShuTj/FDdnFtBNFnT0 yN8fJ3uDnrLJ55lHU9qszs4D+JeocUf8gIq+56Fu/X+Jfd5Wet7RUyvv/OaCJY4Ag8w3 RiTPxthy7vfZxiR8+lajooXDGgo4z2wcyh2G49TZHO0ezXFTUFZYQ/HdkXB3xcWLz2Ls uCR7YKIYsdq+H0MApf4z2gjxvV8UDB5QOfzKsi8I23BgR1/NkXpmnZRn+XyayleIXCTY fu/8UUJ53QVCH6s43dlC4/bQsA+ednHQIl2S6QHSbnSPzOfN/wmZqKJL1TPbjI1J0XUn fBqA== X-Gm-Message-State: AOAM533h6x2S1GFkRAS35we/xqRAp5rkyuEqcevbsRxkpGjGxfLHMYPL XJknWdDWIBDhgGLzu++Y6+4= X-Google-Smtp-Source: ABdhPJwf1PRn7cZFQeT0fJnXp5soDZNvOCrbFR4hEF/wie/akfgVagQZDWM+cKIFVM+z3wxi1mdwPw== X-Received: by 2002:ac8:51da:: with SMTP id d26mr12769253qtn.331.1629872699257; Tue, 24 Aug 2021 23:24:59 -0700 (PDT) From: CGEL X-Google-Original-From: CGEL To: Boris Ostrovsky Cc: Juergen Gross , Stefano Stabellini , SeongJae Park , Roger Pau Monne , xen-devel@lists.xenproject.org, Jing Yangyang , Zeal Robot Subject: [PATCH linux-next] drivers/xen/xenbus/xenbus_client.c: fix bugon.cocci warnings Date: Tue, 24 Aug 2021 23:24:51 -0700 Message-Id: <20210825062451.69998-1-deng.changcheng@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1629872716186100001 Content-Type: text/plain; charset="utf-8" From: Jing Yangyang Use BUG_ON instead of a if condition followed by BUG. Generated by: scripts/coccinelle/misc/bugon.cocci Reported-by: Zeal Robot Signed-off-by: Jing Yangyang Reviewed-by: Juergen Gross Reviewed-by: SeongJae Park --- drivers/xen/xenbus/xenbus_client.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus= _client.c index 0cd7289..e8bed1c 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -542,8 +542,7 @@ static int __xenbus_map_ring(struct xenbus_device *dev, } } =20 - if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, info->unmap, j)) - BUG(); + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, info->unmap, j= )); =20 *leaked =3D false; for (i =3D 0; i < j; i++) { @@ -581,8 +580,7 @@ static int xenbus_unmap_ring(struct xenbus_device *dev,= grant_handle_t *handles, gnttab_set_unmap_op(&unmap[i], vaddrs[i], GNTMAP_host_map, handles[i]); =20 - if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i)) - BUG(); + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i)); =20 err =3D GNTST_okay; for (i =3D 0; i < nr_handles; i++) { @@ -778,8 +776,7 @@ static int xenbus_unmap_ring_pv(struct xenbus_device *d= ev, void *vaddr) unmap[i].handle =3D node->handles[i]; } =20 - if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i)) - BUG(); + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i)); =20 err =3D GNTST_okay; leaked =3D false; --=20 1.8.3.1