From nobody Thu Aug 25 17:32:00 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 4MD94w4bSbz4b38s; Thu, 25 Aug 2022 17:32:00 +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 4MD94w458yz3MRt; Thu, 25 Aug 2022 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448720; 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=QGEIVtfv9+nZAVL74CLufc5QmBloZoViNfe1aiW2nw8=; b=V7xM05En7yp04NuDtlYZzrBefoS7k/Wc74b61Z5yE+il+c2a9IFGuOrXVk0p/lGpOLDXyW n0bnVm72rTLDAXWzGVAFXyPajNk8sJAlNWaAYn4fFEyUmaBDBBQuBm9HgLirEeCpHeVxSX BK7SskGsv0eBVujUIqWCfFnfWNegX45ZYj/tOLZLKcrS8Yzczw/OgRX9VFfsCvVkuIbrL5 zV1KgK2y/uLAMLk0Uk2UvoJie3wWuB0rCyHifyC6P6va55Vxkc8Cnx4MBL5yKq6lJX1AA5 L//MN56UuanQwRGSduFTJGbQaCqGr2Jfus2Bzhdzypvmm605wH1+9So9bkWheA== 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 4MD94w370vzwkM; Thu, 25 Aug 2022 17:32:00 +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 27PHW0Xk043952; Thu, 25 Aug 2022 17:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHW0wM043951; Thu, 25 Aug 2022 17:32:00 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:32:00 GMT Message-Id: <202208251732.27PHW0wM043951@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: 19f184797e2c - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 19f184797e2c22165a4798ccc8b3035648268824 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448720; 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=QGEIVtfv9+nZAVL74CLufc5QmBloZoViNfe1aiW2nw8=; b=x5/org9oBMoTvAZ5kkth/+WmTtTcgzdPWPdaiXk+2Hg/K6Bewin3wRvoph8Jacrr4fdegT 7pS6XcqTeQG/pMnQhQfS/B4xN1SIhrHo0kz0wHjiZ6ZDeWe4sl2X2tRdLB/ww0kl/S+veM yUvi85hLdc/vFfklCp0vaSwztWYh8jant2ubZrH/fiimzjCD9D0/zt9QXduwQfQKpaSAIn fYhYQPpn2GZPMq5E85wPgRcUijOPPr+/MvnRZSU0DEs2cEmarp12D6Rdp6J01E5WiQaqSr dCrxKgTYhX6mU+PeBhqwXd/ZxqEVdD76o5GNrFEt4ZBn9I+4T2D3xTePgBDvZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448720; a=rsa-sha256; cv=none; b=yK1pA2H9zSTESFFBK+S7cJwv4+pIus6pF2wxBiTDx04Rpk9geG25scozLgxy/Hh8TtUAC8 Ox72rjbKrBINxQ23AgwJ2vFiKBPWH4dtB5kQLmmmUGgJexzsvOO+7OvobuDSznqT2bt5QZ dAEkYj/3sHmDwafL7TtrNIvNBhRfb5cW+qBeTFtqQXQcoYb2x7XzyJxYQswufONt5lmp+0 avC9Vf3b/x8QBCsXoz2LG/WMl5JzKJNQj7ZWRY2jlgybfl7k7j7akYk6exfu8vOqYbHtGW XotZRHWObz67zhQvke5i+wOUg8b5QDIvPb9BSXeG/TJ6oAfVTQjd/rJkN1Ek6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=19f184797e2c22165a4798ccc8b3035648268824 commit 19f184797e2c22165a4798ccc8b3035648268824 Author: Robert Wing AuthorDate: 2021-12-06 19:52:08 +0000 Commit: John Baldwin CommitDate: 2022-08-25 16:39: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 2a1e54d89c59..aeef3f84ee5d 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1081,7 +1081,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; @@ -1089,7 +1089,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; @@ -1147,7 +1146,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);