From nobody Tue Nov 29 01:10:54 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 4NLkmb0tY6z4jSR2; Tue, 29 Nov 2022 01:10:55 +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 4NLkmb0PdMz42Pn; Tue, 29 Nov 2022 01:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669684255; 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=chp8cpHbxhROltznT90AGmsv0kZT6T7qCKXLQGtIi8Y=; b=ZQYmW3qiANrfvcFCSMko7gsOFWeTjiEEa1v9lR+tDA/Phl2hbTevFExzDPqpKjWSMs3Kwn 7KSNIt+9Kie6zOCN7w3QtbFqZ4oIiGqoGW9WAQrdjKsU81XkaDdoO6LQx+g4XZcfQmsz5M qXS0z+T44WNEkogAsPtaUavs/wsYzlpHtkdxU0GWJ2v5W3AzXpSMMZ05h36SudXOx7QnbK x5KJej9ny+JYdhaKfl1LdMXUIHi3r3CpQExUpPEMC1riRuQCDcPktXGWmyYUWRcdejHUeh 2DA4nYbn/OVgU6RcaA5Yjqas8WVW7DXpGWFzoNPea7/zuaV+htr4pfPTqIN6pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669684255; 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=chp8cpHbxhROltznT90AGmsv0kZT6T7qCKXLQGtIi8Y=; b=UquZUNcA3CJ/VbUGhk5MnQ+9Lzoqn3rMiHYvPdFbN9quWjr7Ia1pWAw4pe+xB/OTc2/dUT jHKtfCX34Yz4ecrNlt5FS3fVVcOzUaYBNjnFkWAILe96pJSWSZH0JsX/sqnDIwD7Na7QfY PoCB4rA9SSo4KSHNHoBW/Xn+3KoTMdCWx4cuL+T3nBNW/ysc9Xs5yXHMlXqmUm72dDB2ia 8Z75/516hU1yLslNgmQc4FFlMtO7zGPvXq8iMMTur/59gK0L8o8LmqhS3xx32wFRU4OA06 PJv8uRemn/sc5+Knqvm9QZ0rx83eCYMQ8r7TdCiaH21Zzg0hF2VCsu52NhbL1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669684255; a=rsa-sha256; cv=none; b=dSsJypH1+8w7SDuHSMbw1cdCucHySppGYFklfhyMeG1PcI4YCbJMzqEsMbZI2rhbW+nWMA 7SdOc2V7bXbmLE6kHSBJXaNBBx75SPIXVsPOtlfNAU1IYkkFESXJ1XJRztkNnI0BwcrmvF JqFG1mUp8IyJ0l6FiScxGrJ9PHrndGQA2j/bEcbWi2gTpTJx/injNz/ro5vKDH7suC/6wj 8oAPJ2yysDF/NVBjRWE8D0o0bb8cZKBDFa7E4Rn7TKMHPaFNKdPP46YN2LQoYO7ZNK5KlY tKXcJY45nNk1vqfCkH9z7KHQ+wMdwFmw1niYZCpJHgbiRBC1iUXQye+xJJbTUw== 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 4NLkmZ6LKSzyCZ; Tue, 29 Nov 2022 01:10:54 +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 2AT1As6m045187; Tue, 29 Nov 2022 01:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AT1AsoG045186; Tue, 29 Nov 2022 01:10:54 GMT (envelope-from git) Date: Tue, 29 Nov 2022 01:10:54 GMT Message-Id: <202211290110.2AT1AsoG045186@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: e7cd5ffff88f - main - bhyve: Fix sign compare warnings in the e1000 device model. 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: e7cd5ffff88f1f4dfba2693041cc78fcf3613fba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e7cd5ffff88f1f4dfba2693041cc78fcf3613fba commit e7cd5ffff88f1f4dfba2693041cc78fcf3613fba Author: John Baldwin AuthorDate: 2022-11-29 01:08:09 +0000 Commit: John Baldwin CommitDate: 2022-11-29 01:08:09 +0000 bhyve: Fix sign compare warnings in the e1000 device model. Adding a bare constant to a uint16_t promotes to a signed int which triggers these warnings. Changing the constant to be explicitly unsigned instead promotes the expression to unsigned int. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37485 --- usr.sbin/bhyve/pci_e82545.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index 21e01b22ec4b..9d991b124965 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1045,7 +1045,7 @@ e82545_transmit_checksum(struct iovec *iov, int iovcnt, struct ck_info *ck) DPRINTF("tx cksum: iovcnt/s/off/len %d/%d/%d/%d", iovcnt, ck->ck_start, ck->ck_off, ck->ck_len); - cklen = ck->ck_len ? ck->ck_len - ck->ck_start + 1 : UINT_MAX; + cklen = ck->ck_len ? ck->ck_len - ck->ck_start + 1U : UINT_MAX; cksum = e82545_iov_checksum(iov, iovcnt, ck->ck_start, cklen); *(uint16_t *)((uint8_t *)iov[0].iov_base + ck->ck_off) = ~cksum; } @@ -1231,9 +1231,9 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, if (!tso) { /* Estimate required writable space for checksums. */ if (ckinfo[0].ck_valid) - hdrlen = MAX(hdrlen, ckinfo[0].ck_off + 2); + hdrlen = MAX(hdrlen, ckinfo[0].ck_off + 2U); if (ckinfo[1].ck_valid) - hdrlen = MAX(hdrlen, ckinfo[1].ck_off + 2); + hdrlen = MAX(hdrlen, ckinfo[1].ck_off + 2U); /* Round up writable space to the first vector. */ if (hdrlen != 0 && iov[0].iov_len > hdrlen && iov[0].iov_len < hdrlen + 100) @@ -1282,26 +1282,26 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, * TCP | flags | 13 | 1 * UDP | len | 4 | 4 */ - if (hdrlen < ckinfo[0].ck_start + 6 || - hdrlen < ckinfo[0].ck_off + 2) { + if (hdrlen < ckinfo[0].ck_start + 6U || + hdrlen < ckinfo[0].ck_off + 2U) { WPRINTF("TSO hdrlen too small for IP fields (%d) " "-- dropped", hdrlen); goto done; } if (sc->esc_txctx.cmd_and_length & E1000_TXD_CMD_TCP) { - if (hdrlen < ckinfo[1].ck_start + 14) { + if (hdrlen < ckinfo[1].ck_start + 14U) { WPRINTF("TSO hdrlen too small for TCP fields " "(%d) -- dropped", hdrlen); goto done; } } else { - if (hdrlen < ckinfo[1].ck_start + 8) { + if (hdrlen < ckinfo[1].ck_start + 8U) { WPRINTF("TSO hdrlen too small for UDP fields " "(%d) -- dropped", hdrlen); goto done; } } - if (ckinfo[1].ck_valid && hdrlen < ckinfo[1].ck_off + 2) { + if (ckinfo[1].ck_valid && hdrlen < ckinfo[1].ck_off + 2U) { WPRINTF("TSO hdrlen too small for TCP/UDP fields " "(%d) -- dropped", hdrlen); goto done;