From nobody Tue Mar 01 00:12:00 2022 X-Original-To: dev-commits-src-main@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 2D9B919F4226; Tue, 1 Mar 2022 00:12:01 +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 4K6yNd0qsvz3qH4; Tue, 1 Mar 2022 00:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646093521; 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=RjbuEcaD8bPRD0R9fupfyLWTve8J6RkuphaCSxszeZ4=; b=Ib1iw5s6WUFdD7n9wy8oOrSR98aAV6IRGq1vI0gkzKDpnUlAbdk++Ti1O9nbLkF3NYeR88 JJVZWTezqOo1ue+YPHb0AhE6TkmOGqlGPhVimEFNzs1m6UDahZNCiWPS8IJNpWOEkoZVB9 BmzsboVpArAYwdnSTH5EuBT7SsoOQnqt0YaqVg244ZMK3tnDdPvOavbu1q0JqBIJNjjtJN LG/az0dNWDHT2tOElqsimptYSaO0ZMa+OdcA2SVXyIxXlMEWiepuyN9ig5vJb+9hPTAMZ7 6dhZFmIBK/IbplrjeQJcD9tHz7YJtMKlY8RoKR+eFKMIuw7f+faDBkEiluZydw== 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 F10E9250E2; Tue, 1 Mar 2022 00:12: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 2210C0jH086662; Tue, 1 Mar 2022 00:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2210C0Mk086661; Tue, 1 Mar 2022 00:12:00 GMT (envelope-from git) Date: Tue, 1 Mar 2022 00:12:00 GMT Message-Id: <202203010012.2210C0Mk086661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 2062ce996ddd - main - vmm: fix "set but not used" warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2062ce996ddd39ba7a36c2caf8c898686d9cb2fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646093521; 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=RjbuEcaD8bPRD0R9fupfyLWTve8J6RkuphaCSxszeZ4=; b=VSnrdMWNb7dn5yLwboMwyDUpNqaOlj+bwHEpnEfMCUipnek88irUGMQpqXhbhiBR4VEDcv JF6asXOKLcvH/SNlwpVJwbbQePsSmVplcPQ1DAwfPSbXG+rfmitXpdNy/ucbDdvuyReEMD nMfKpifSpUKMI+nuJD37TYWTHM5xMk6/Q3wJgutwBIXjjnqZAuhq7xPw9MtuiCqY/cVXv3 Cs7yvmEEqt/IWaK6cy21uJBDOv8LrhReNTwLf2DOH5mjeyECPlJUmrrj5PyyHo12fqiYRx 57jBZxaMmVQsSBOXeN1G6WmkKcbvjUrTXtPWLPGvh+JLDIYc2k9npWPPXQxqgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646093521; a=rsa-sha256; cv=none; b=pRx0oKMT80a2muRrDj5lJfntvDH3MSXaFhjEskVYJIqdDS44AoJRyqf5yv+Ccv3dxc0WtR NXJstz2a+PwiAbzb/5ewqQnwRbIkafnR5/7LjddwyWCCBJoNxFNNLuJoY1Gc7NXo42BIAI cRcZwImbfl8w3RA8ydi0dHPrsMu1iL3gwiK+DotvYzVeuBjtColsbH+MQZEqbH9l70hiv4 S17Gph/PIjghEiaUvyyWGJm75JpQjiKcqhTgtQvX0/DE+BXPHZKUPlq4QJ53bjT+oOT3YL gqNOkCXq+G5nA9N14LoA2UrrQA1AdjSjTukMh5/9eJYa/nfHcG3glNLhTvGT+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=2062ce996ddd39ba7a36c2caf8c898686d9cb2fe commit 2062ce996ddd39ba7a36c2caf8c898686d9cb2fe Author: Robert Wing AuthorDate: 2022-03-01 00:09:32 +0000 Commit: Robert Wing CommitDate: 2022-03-01 00:09:32 +0000 vmm: fix "set but not used" warnings --- sys/amd64/vmm/io/vlapic.c | 2 +- sys/amd64/vmm/io/vrtc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index c0ca167ef11f..9599b4b4e62c 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -201,7 +201,7 @@ static uint32_t vlapic_get_ccr(struct vlapic *vlapic) { struct bintime bt_now, bt_rem; - struct LAPIC *lapic; + struct LAPIC *lapic __diagused; uint32_t ccr; ccr = 0; diff --git a/sys/amd64/vmm/io/vrtc.c b/sys/amd64/vmm/io/vrtc.c index 5d6968e3583e..dd32b279cf03 100644 --- a/sys/amd64/vmm/io/vrtc.c +++ b/sys/amd64/vmm/io/vrtc.c @@ -285,7 +285,7 @@ rtc_to_secs(struct vrtc *vrtc) struct clocktime ct; struct timespec ts; struct rtcdev *rtc; - struct vm *vm; + struct vm *vm __diagused; int century, error, hour, pm, year; KASSERT(VRTC_LOCKED(vrtc), ("%s: vrtc not locked", __func__)); @@ -401,7 +401,7 @@ static int vrtc_time_update(struct vrtc *vrtc, time_t newtime, sbintime_t newbase) { struct rtcdev *rtc; - sbintime_t oldbase; + sbintime_t oldbase __diagused; time_t oldtime; uint8_t alarm_sec, alarm_min, alarm_hour; @@ -545,7 +545,7 @@ vrtc_callout_handler(void *arg) struct vrtc *vrtc = arg; sbintime_t freqsbt, basetime; time_t rtctime; - int error; + int error __diagused; VM_CTR0(vrtc->vm, "vrtc callout fired"); @@ -581,7 +581,7 @@ done: static __inline void vrtc_callout_check(struct vrtc *vrtc, sbintime_t freq) { - int active; + int active __diagused; active = callout_active(&vrtc->callout) ? 1 : 0; KASSERT((freq == 0 && !active) || (freq != 0 && active), @@ -633,7 +633,7 @@ vrtc_set_reg_b(struct vrtc *vrtc, uint8_t newval) struct rtcdev *rtc; sbintime_t oldfreq, newfreq, basetime; time_t curtime, rtctime; - int error; + int error __diagused; uint8_t oldval, changed; KASSERT(VRTC_LOCKED(vrtc), ("%s: vrtc not locked", __func__));