From nobody Fri Apr 08 00:04: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 5D1011A88959; Fri, 8 Apr 2022 00:04: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 4KZJPr6tLYz4lCv; Fri, 8 Apr 2022 00:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376241; 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=2eJgBsA1nKftGFBvEUUG+HkRcpuDJ/8acXdQBvI30KM=; b=W5OcRbZfiV0XIdUl2VajZLVnG6wW1uWSH/r38hQk4Ta5du7C3mrEIgXanllCFYLfx5IqrX EE1mniAhMPsT1RAA2hy5YC01/nkdpsneb0q4pjXvI4yqb5O5/rxMGG3Zog82ppxhCtaa7r XbjUgH9vT59PJFkqvaJ8ztqjZn25/Ou9kndWb4m76SZMaEMRMncnrtzUr3I9ppXKXdaG5D WXa3g1a0eR8+beqhyZZs1t8oyaxMx6dy/NXIaVTvAR8A/Tj9kphz10ziohp5zgZ1DH3kyt BhglV6q0b0OY2VHP4G6BCeheeJSreuw4o1qo2sWRDitBYgmDUDIzIIOWeHnXUA== 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 714FE1A345; Fri, 8 Apr 2022 00:04: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 238040dF087094; Fri, 8 Apr 2022 00:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238040Av087093; Fri, 8 Apr 2022 00:04:00 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:04:00 GMT Message-Id: <202204080004.238040Av087093@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: 572edd3dae9f - main - vmm: Re-quiet set but unused warnings. 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: 572edd3dae9fc3e67dfb1cb9ba023e8d3fe2a9bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376241; 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=2eJgBsA1nKftGFBvEUUG+HkRcpuDJ/8acXdQBvI30KM=; b=uQFwf2+dGF+HFPF/XhhOZlzQRDY9YaoMInzb3rqOr/ub4cJD3m5DtY+1yoUkXtNCBFzK5X /wwg0IV+qxQv8zbRb2FqC2BIvFnqaw9epxm1Fq3iCPMuk4o7NhCTopkMujRYPzMHwZjX+9 Jaq+Wnf2DPWvHhAztbGnxS69B79Jn+5I/w/khlbgbqCvhW0nMPT8IpRV5IfauWco6WDidK jyRTWQ84Sg4PbjDRbqqmQv2rU2dbwao7ZAX+91NU6Lg8WYxOV2JIgK4NFeSG25NllbBsQq ueKnBsA/uy4+H+QziX1Zm/6Sw/gFlNd3GYPs4TRehFs3twC29Rkq+PeAVqXRgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376241; a=rsa-sha256; cv=none; b=fWHHw0d4x2lVRN8DJZUQ2DuUhFrmhHGVWFinlcrMognsk5i939zCkHzvH4aKPwdGrznsca MjSQODA8DYQoW6k+F498FTrs86wsAHkAlR5BudnifZEBMJXO4gbayDdHBDqXmMn0PCLljK +HgB1SS+xeIsIxRk9dJ/zSODxhWOu8S2idJnqbSH5S2ERLNF04Aq6sCD2uPQaKCowHZPLF s7EE1+Wt/XfHhv9T+kmaNPqpS08YAKtXw1jFpwNU6nD9gRttJBkW0XxtduR7tbSPNu3tch AOnBHrxCTGIT3k/Q43TnVRJ1n37aT6zrUCOxA6HWoRvwFj/9l/e9g9OSSL4iug== 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=572edd3dae9fc3e67dfb1cb9ba023e8d3fe2a9bb commit 572edd3dae9fc3e67dfb1cb9ba023e8d3fe2a9bb Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:29 +0000 vmm: Re-quiet set but unused warnings. __diagused is no longer used for KTR, so instead use #ifdef KTR or expand KTR-only variables into their values in traces. --- sys/amd64/vmm/io/vrtc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/io/vrtc.c b/sys/amd64/vmm/io/vrtc.c index dd32b279cf03..10bab96700e4 100644 --- a/sys/amd64/vmm/io/vrtc.c +++ b/sys/amd64/vmm/io/vrtc.c @@ -285,12 +285,13 @@ rtc_to_secs(struct vrtc *vrtc) struct clocktime ct; struct timespec ts; struct rtcdev *rtc; - struct vm *vm __diagused; +#ifdef KTR + struct vm *vm = vtrc->vm; +#endif int century, error, hour, pm, year; KASSERT(VRTC_LOCKED(vrtc), ("%s: vrtc not locked", __func__)); - vm = vrtc->vm; rtc = &vrtc->rtcdev; bzero(&ct, sizeof(struct clocktime)); @@ -401,7 +402,6 @@ static int vrtc_time_update(struct vrtc *vrtc, time_t newtime, sbintime_t newbase) { struct rtcdev *rtc; - sbintime_t oldbase __diagused; time_t oldtime; uint8_t alarm_sec, alarm_min, alarm_hour; @@ -416,9 +416,8 @@ vrtc_time_update(struct vrtc *vrtc, time_t newtime, sbintime_t newbase) VM_CTR2(vrtc->vm, "Updating RTC secs from %#lx to %#lx", oldtime, newtime); - oldbase = vrtc->base_uptime; VM_CTR2(vrtc->vm, "Updating RTC base uptime from %#lx to %#lx", - oldbase, newbase); + vrtc->base_uptime, newbase); vrtc->base_uptime = newbase; if (newtime == oldtime)