From nobody Wed Apr 6 23:46:04 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 7BD0F1A82D53; Wed, 6 Apr 2022 23:46:05 +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 4KYh3d00Dkz4Qmr; Wed, 6 Apr 2022 23:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288765; 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=LEWG28RF3HZPdUbWyBI50cWOOtRHFc1I8jTY9KOF/Mc=; b=jU+71lsdLOXfN9eAf4UEyt/bCASzxbWVxxU+ga0SmLOuNq2C1B8KddrKr9KltASxmlXNnq IquTdKIBJ79SzN/ig9BwPxwv7QJGVaq5kiWDh3U+W12FHR47n1rI7a8tWqor/p5MHHXYuS /WooGh9OMNZpgz8S4CtrBSvuIj6ZGLtIdRn/Gg32uKNy5efGpQhK5A3xD71l1Q2FgxUPCj kgzBJLWU6jcgyg019Nd/DQoVvRpYa0HIqWBe5VY5wkeXtknP0sKVa9NlSRZn/E/hfczdCf NuIyxO3lgnVv+Ls1YiwQ1V2h7/qSoWbFXhhcEP7lsh2KgOU3Cnur1TiZG557gg== 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 1F84C24E13; Wed, 6 Apr 2022 23:46:04 +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 236Nk4Ip008745; Wed, 6 Apr 2022 23:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236Nk47u008744; Wed, 6 Apr 2022 23:46:04 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:46:04 GMT Message-Id: <202204062346.236Nk47u008744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7650d4b67e53 - main - xen netback: Remove write-only variables. 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/main X-Git-Reftype: branch X-Git-Commit: 7650d4b67e53d3916313eb23d618cac50fdec9cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288765; 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=LEWG28RF3HZPdUbWyBI50cWOOtRHFc1I8jTY9KOF/Mc=; b=BPXT6dX47RvQ8I9xNxcC4OqyVkae3RKkDjxMP0YiB/2bg0Rmhg86WrnCpJvvDFk28/2p2o DoQsznBuliSX/kCV3YYoK3+wHkkdYdyEyGLz8rAHfKNcPMQZH9bkvDGHZz4DLmAketb3ca kiDcYUwLrxs6Y7ExGwRN27U5DpDNJdmBMEie6O9Zb0rWB+n+vy3+Gdbco48uwEJPo51S2q vJdDdnWgHnkCv23CIB3NBBNF0DERW0VKAistD+DBrTmfiRI4VUS1xeDUlBDCuSyYpp+6NB 45tqOjkTKdcsecA9H2cfI3IyJFG3ZA1HJTdGWUhewG1803lhcxuea5SsH2O7CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288765; a=rsa-sha256; cv=none; b=pSketxbVJbi96lQHrloCCCRPVd9IYbZMBu8IpmKH1pJdK+k+6bYxD6LwJbEBxaht9eOH/j 9+FzQngO8Tw+TwrcLEBvcv9TWA/cpmpprE9ANqjeFK6+HrSyJ+ywyDHvbzQUIRGj+02E1g +PMrmEpCepcSeLq4Gsj0Qu6BdRSYKibiDY6Dx6OHHAJrizvxaE+sRJ7OKtzMvBowTIIVic SOU2cuUqpktzTQxuMyb0eQdF4kcFm7nEVYBfKFJCj9SvVVIFmRBN4kbmR5g+mwIDPOvgdY FzowDrAfl0snjkjtKkACWQILRmDAdaIQ2sojSC1aufJGOjb7L0ZIREAMsJow8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7650d4b67e53d3916313eb23d618cac50fdec9cc commit 7650d4b67e53d3916313eb23d618cac50fdec9cc Author: John Baldwin AuthorDate: 2022-04-06 23:45:27 +0000 Commit: John Baldwin CommitDate: 2022-04-06 23:45:27 +0000 xen netback: Remove write-only variables. --- sys/dev/xen/netback/netback.c | 4 ++-- sys/dev/xen/netback/netback_unit_tests.c | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index bf54f3a2f28e..bcc7d2541203 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -2393,7 +2393,7 @@ xnb_send(netif_rx_back_ring_t *ring, domid_t otherend, const struct mbuf *mbufc, gnttab_copy_table gnttab) { struct xnb_pkt pkt; - int error, n_entries, n_reqs; + int error, n_entries; RING_IDX space; space = ring->sring->req_prod - ring->req_cons; @@ -2408,7 +2408,7 @@ xnb_send(netif_rx_back_ring_t *ring, domid_t otherend, const struct mbuf *mbufc, hv_ret)); } - n_reqs = xnb_rxpkt2rsp(&pkt, gnttab, n_entries, ring); + xnb_rxpkt2rsp(&pkt, gnttab, n_entries, ring); return 0; } diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c index ace143e064ea..82af6ba89f11 100644 --- a/sys/dev/xen/netback/netback_unit_tests.c +++ b/sys/dev/xen/netback/netback_unit_tests.c @@ -648,15 +648,13 @@ xnb_ring2pkt_wraps(char *buffer, size_t buflen) static void xnb_txpkt2rsp_emptypkt(char *buffer, size_t buflen) { - int num_consumed; struct xnb_pkt pkt; netif_tx_back_ring_t txb_backup = xnb_unit_pvt.txb; netif_tx_sring_t txs_backup = *xnb_unit_pvt.txs; pkt.list_len = 0; /* must call xnb_ring2pkt just to intialize pkt */ - num_consumed = xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, - xnb_unit_pvt.txb.req_cons); + xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, xnb_unit_pvt.txb.req_cons); xnb_txpkt2rsp(&pkt, &xnb_unit_pvt.txb, 0); XNB_ASSERT( memcmp(&txb_backup, &xnb_unit_pvt.txb, sizeof(txb_backup)) == 0); @@ -901,7 +899,6 @@ static void xnb_txpkt2rsp_wraps(char *buffer, size_t buflen) { struct xnb_pkt pkt; - int num_consumed; struct netif_tx_request *req; struct netif_tx_response *rsp; unsigned int rsize; @@ -943,8 +940,7 @@ xnb_txpkt2rsp_wraps(char *buffer, size_t buflen) RING_PUSH_REQUESTS(&xnb_unit_pvt.txf); - num_consumed = xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, - xnb_unit_pvt.txb.req_cons); + xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, xnb_unit_pvt.txb.req_cons); xnb_txpkt2rsp(&pkt, &xnb_unit_pvt.txb, 0); @@ -986,14 +982,12 @@ xnb_get1pkt(struct xnb_pkt *pkt, size_t size, uint16_t flags) static void xnb_pkt2mbufc_empty(char *buffer, size_t buflen) { - int num_consumed; struct xnb_pkt pkt; struct mbuf *pMbuf; pkt.list_len = 0; /* must call xnb_ring2pkt just to intialize pkt */ - num_consumed = xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, - xnb_unit_pvt.txb.req_cons); + xnb_ring2pkt(&pkt, &xnb_unit_pvt.txb, xnb_unit_pvt.txb.req_cons); pkt.size = 0; pMbuf = xnb_pkt2mbufc(&pkt, xnb_unit_pvt.ifp); safe_m_freem(&pMbuf);