From nobody Thu Aug 25 17:31:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MD94W4z1Fz4b2wJ; Thu, 25 Aug 2022 17:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MD94W1SyDz3L5x; Thu, 25 Aug 2022 17:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0dOHP+2ssiPGCixXi+GNIvpEyQ52KCIRXgEc8IUW4Q=; b=ZR2x9psWloCQfgo+ki1on83DQDU8A9OrC3LQFVi5aHnY8g0RVOncnF5cnQAg4guCNTsCam XTUD87YzCOaEUotCgpVvIifa18Y1cY0JXiSl1U6iTFmVIf0YsVPEolm9GBBKS+PmhkQPg7 G2XPaTo0BTlAIaa5Lyg+MowkiuThDdGMhuuFqFADN2K5LWI/gZd9iTmk3qDwYJL5j1kV94 repOqkdjAMU9US1+bD4d7B+AgHFmD9ACqB+I4rRkffyY+UK/4V0E8zbj4An98spTjgTgPP ChtADF01ltrzqjjfK5y7V+MkOImbeMVl9TI+yJjEQVqttnaSzpA0fszau+IM7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MD94V6NdvzwX2; Thu, 25 Aug 2022 17:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PHVcKm043184; Thu, 25 Aug 2022 17:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHVcaf043183; Thu, 25 Aug 2022 17:31:38 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:31:38 GMT Message-Id: <202208251731.27PHVcaf043183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 574f63650323 - stable/13 - bhyve: fix -Wunused-but-set-variable warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 574f636503231c67a10e01713742428ae8392c71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0dOHP+2ssiPGCixXi+GNIvpEyQ52KCIRXgEc8IUW4Q=; b=sRRjcinMoMNZBSFmEsm//K4F/WKZbcPbBCz6xHXCSBbzX7oMZBaHXnwmSOlkAzWGNLG5rz zYd/TEYEaB0gAQFyDOugF4jWuFrRjXmowqO58rNN/C8NTweoL16/8OXaeR67CyKTbv7KYC CnHDjPRdelx4m49BIZgerR21IEqkXonnAUCJoORjmMOt+Xa42RHScW2PdQFvah9iJo1FWO S94b53aAue/OrMePSrkUXNjRZY/lPoNUYgelVTybSqo4bFuHQnMF/d0gbzGcxz89SJF/vf +yrOqR1GUDiPn+uO/dCgoKMfLx0iu3DhZeFnZEREX7QB9xmcSjRwp29NmamPwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448699; a=rsa-sha256; cv=none; b=wdMiNQjrZLOYFj5Ju5ECuryIUwo18B1JQVksZWH2UXXNA7Hmqg0FoM76CpnoZT9++JWxjJ a+SXDUe4LHmJJBUF4pswSfKBieZI96zo2xsg+0kPeR2lizBq6cHx6YmiRTZ+zMsKgRiRtg Mvbk/ifLXXd1XMNYeIs+BNoi8s1VSDmWrbBaLiGwTnBYCNqvok6OtJ2uGtwRn4DMPv+9MC wIEynPxnPSSqT1zVPo/gawx/fUj6c5lj9sTXMqxDsuODCftFs+4DVzwKGx8pF+eEqunOq9 fS2snkIKptt5eiCfBU/lheCnsB2D83QkxkN448WhDc5gOJWwdH3UGan23SKlxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=574f636503231c67a10e01713742428ae8392c71 commit 574f636503231c67a10e01713742428ae8392c71 Author: Robert Wing AuthorDate: 2021-12-06 19:52:08 +0000 Commit: John Baldwin CommitDate: 2022-08-25 16:36:56 +0000 bhyve: fix -Wunused-but-set-variable warning Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D33306 (cherry picked from commit 2616ee608cd54e544259ee738cd8b8ff71334ced) --- usr.sbin/bhyve/pci_e82545.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index fa3b82f94d5c..ff92ee0ed4cc 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1084,7 +1084,7 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, struct ck_info ckinfo[2]; struct iovec *iov; union e1000_tx_udesc *dsc; - int desc, dtype, len, ntype, iovcnt, tlen, tcp, tso; + int desc, dtype, len, ntype, iovcnt, tcp, tso; int mss, paylen, seg, tiovcnt, left, now, nleft, nnow, pv, pvoff; unsigned hdrlen, vlen; uint32_t tcpsum, tcpseq; @@ -1092,7 +1092,6 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, ckinfo[0].ck_valid = ckinfo[1].ck_valid = 0; iovcnt = 0; - tlen = 0; ntype = 0; tso = 0; ohead = head; @@ -1150,7 +1149,6 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, if ((dsc->td.lower.data & E1000_TXD_CMD_EOP) != 0 && (dsc->td.lower.data & E1000_TXD_CMD_IFCS) == 0) len -= 2; - tlen += len; if (iovcnt < I82545_MAX_TXSEGS) { iov[iovcnt].iov_base = paddr_guest2host( sc->esc_ctx, dsc->td.buffer_addr, len);