From nobody Thu Jan 26 19:28:38 2023 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 4P2rNQ5Vq4z3bTfr; Thu, 26 Jan 2023 19:28:38 +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 4P2rNQ3qRnz4LZV; Thu, 26 Jan 2023 19:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761318; 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=n18EZKkdl4vGAg4dvW3yOYxIVbvsEfmMmOgLdZiCfqY=; b=Xvocgw6V1SbJkgdTNTz53DV16cBJldan5zsksc9OZZLIzhyDO4viOUx1tL/yPucBt//O/P /cL9dL0PyWTqW6Pe9N0d3Dfd2j9eCO2Tn5RFiC95mjD+U0RQidvZRZn1oqQoMjgCUULRAL NzTUKiCLWYl/bEsLWBJMJauf4Z/dkhu4Px9tK9D4zF5QDs6dQJ3HAgv+Av5P0hr13dMqKx tm4TMRGV01zEJ0J9rPxff9q7BQKLnHpKq8Fa8R3Hsa7Rp4FSUbMbb8ouOcoG2ppebyNMtF PYUR0znSGzdU1hJPYTQpOxOVK1sZA8MGDz0QK5DFJ+gIY3gl8GkXxZD5AVnQlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761318; 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=n18EZKkdl4vGAg4dvW3yOYxIVbvsEfmMmOgLdZiCfqY=; b=ScNpfgJWAa/80fH/xBNELQ4M8CI1KMI/I6i5vwTxBWc69UpWlo5lg4HX3OO/2CvwB7ckbI HG0/gmtq0Ds4yURhGwFGOGc68mA6Cj1thKOkYOTdQCZc6te1+C3AVnq8uMplrvMGuMG8hC GxPPaUgwpD3icfYB189BnOmMnAUzyq4jWMiitN76HruPxE7kNnrHP2sKVEwXGcOVvu/KeN XL81ii/M5anev3l//f1F8qhx2toSyH+/eJ/ShxmsQhuZph8v/PmB20bvvJFQCH1CBonDEI 0Pu67sGjJYCTzlIu3YAIRL+j2gBc7YxVaKRLcbzW9sHp4hfulNnshaXC22y+zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761318; a=rsa-sha256; cv=none; b=nhFsrC0enJ+0cVveA69GPR7JZe4xa8PFZS9W4hFSL7yaNMUwrgGTwZdaiFvUb/hItTpz4t XLBuDH2R1CdE0UVPsNJZChZ/iXQRED06oDPuMrquBnb18ub1UfV99c5aZfbPCFm799LuCR J+aGw4AGVpJXujOJVg6jdhpW5Go2z+jqqkC+vUyFZ8Nn3L8Y3c0of7mkCFx09aZy21yo0N RPLNhUQDbhz6T6plmsE4iyvUgwMu8jiGWWdlHQOaOGS3m/X+M/3dgeRRHtSLIVc2aCpvLH vorDwSsTGQiDmDLF3Iibnjv3EhQEDR6wLR0i3hseWS9+Pu8x06ulWUZagm5zTA== 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 4P2rNQ2xQ5zgsx; Thu, 26 Jan 2023 19:28:38 +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 30QJScBG078741; Thu, 26 Jan 2023 19:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJScrl078740; Thu, 26 Jan 2023 19:28:38 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:28:38 GMT Message-Id: <202301261928.30QJScrl078740@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: 0bf049af5a8b - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0bf049af5a8be17a25c029622bd81791ba2157f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0bf049af5a8be17a25c029622bd81791ba2157f5 commit 0bf049af5a8be17a25c029622bd81791ba2157f5 Author: John Baldwin AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:26:25 +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. (cherry picked from commit 572edd3dae9fc3e67dfb1cb9ba023e8d3fe2a9bb) --- 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)