From nobody Wed Dec 17 21:57:49 2025 Delivered-To: importer@patchew.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=1616408674; cv=none; d=zohomail.com; s=zohoarc; b=hJsdAc9kMf082O6IOw1t63un/pjBzGlLNX2uwaZblVfe84hS+pG7BqkVYpp+NRVTpvOEqxfbQaT+H6+LivIbaDnQWsw6Jdc+i1xFcKxeND1DOyEKsU4zS0KYomjQWIr6KCMMIrrRvQoC0xwd+gcrfwWTHrAjV6yUsv+0A+gT3ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616408674; 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=XKu0TbXoKOvidXAk/MBHagsiUWfE2nlmZQxzlW+PyTM=; b=oBmvhFIgBh23CFKStV0yAmkASoCTRoA3SJFEmzBD44PaWg2Clu74iuHTdR+Rkjgt4LZpmr4qQkbhNKMZCuaGt1yYX+fQuEQi4/UVxi3g6Bs3CLwqOIcZMedJYcIOtHzy3lhsdUODDksQI3Qkgcgk/4lSpTOk8kOCSgU7Dhce+tE= 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 1616408674507185.2443359078485; Mon, 22 Mar 2021 03:24:34 -0700 (PDT) Received: from localhost ([::1]:33218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOHjd-0006KA-Dy for importer@patchew.org; Mon, 22 Mar 2021 06:24:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOHUu-0000Ob-4Y for qemu-devel@nongnu.org; Mon, 22 Mar 2021 06:09:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOHUq-0003EJ-Eq for qemu-devel@nongnu.org; Mon, 22 Mar 2021 06:09:19 -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-439-9bz8FdzlMDqgAZI_KdMF5A-1; Mon, 22 Mar 2021 06:09:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E6AC87A83A; Mon, 22 Mar 2021 10:09:09 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-83.pek2.redhat.com [10.72.12.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id C91B35D9CD; Mon, 22 Mar 2021 10:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616407752; 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=XKu0TbXoKOvidXAk/MBHagsiUWfE2nlmZQxzlW+PyTM=; b=E1A39rs/6t5DB+j8IrcirH+rywaMWhIsDiRQkFoDCO049DUSNRcrTFS9j12wLYU8usXHSE 1ZktLUfYZXxbmN+iQ2vVv97Qy/c2CSj+LKrGc2dec+6NsuEPuJu6ignIhpY4Z53DwdRZZX RtdP9i3zOneip0hZ89aVmUzT1/iTBjI= X-MC-Unique: 9bz8FdzlMDqgAZI_KdMF5A-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 13/13] net/eth: Add an assert() and invert if() statement to simplify code Date: Mon, 22 Mar 2021 18:08:12 +0800 Message-Id: <1616407692-693-14-git-send-email-jasowang@redhat.com> In-Reply-To: <1616407692-693-1-git-send-email-jasowang@redhat.com> References: <1616407692-693-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , =?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) From: Philippe Mathieu-Daud=C3=A9 To simplify the function body, invert the if() statement, returning earlier. Since we already checked there is enough data in the iovec buffer, simply add an assert() call to consume the bytes_read variable. Reviewed-by: Stefano Garzarella Reviewed-by: Miroslav Rezanina Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jason Wang --- net/eth.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/eth.c b/net/eth.c index b2704fb..fe876d1 100644 --- a/net/eth.c +++ b/net/eth.c @@ -416,15 +416,14 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int= pkt_frags, bytes_read =3D iov_to_buf(pkt, pkt_frags, ext_hdr_offset, &rt_hdr, sizeof(rt_hdr)); assert(bytes_read =3D=3D sizeof(rt_hdr)); - - if ((rt_hdr.rtype =3D=3D 2) && (rt_hdr.segleft =3D=3D 1)) { - bytes_read =3D iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(= rt_hdr), - dst_addr, sizeof(*dst_addr)); - - return bytes_read =3D=3D sizeof(*dst_addr); + if ((rt_hdr.rtype !=3D 2) || (rt_hdr.segleft !=3D 1)) { + return false; } + bytes_read =3D iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(rt_h= dr), + dst_addr, sizeof(*dst_addr)); + assert(bytes_read =3D=3D sizeof(*dst_addr)); =20 - return false; + return true; } =20 static bool --=20 2.7.4