From nobody Thu Jan 26 22:12:17 2023 X-Original-To: dev-commits-src-branches@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 4P2w1G0Bqjz3c8k3; Thu, 26 Jan 2023 22:12:18 +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 4P2w1F5nY4z3wy2; Thu, 26 Jan 2023 22:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771137; 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=1TMomJg+rI0kaRUab/uV2lutXL8+7kmU6ws1cz+tjcc=; b=Nf3wlsSYxDEX0ehWTlyPd1TGZ5ake4rFwldhBX+tnlssc7dQU/ksQpHlSdBUejiSjbHvgC 7XXxKzyUU+YRw6RC11MgtTTe4wUFmeEw83+u3vMgoeQiqO26rLy9oqlHe/jviS5cDwysVs MPgrEa1+9//vCx8gk5frx2ug1N21lqLTIKkVYKC5SOj5kTtfiFUh9/pibY/r7LZAd7YhM5 iHCqljgsll96Bsmve+yUJAup59yxvjHZSKgcOma7+ysJT2AFmOPCCWv7kSTeC8ol7Cn1j+ Y9xMM+M9aeMQKcfDbUmcVO8rrjobPr97g/g/z65Mofp8hvzgIVS1/b/OUMhEQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771137; 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=1TMomJg+rI0kaRUab/uV2lutXL8+7kmU6ws1cz+tjcc=; b=J5LkQcOimRR94VlSLnB4uPOF0nZfD2R2AvKm2BabtfJVJwjufGQ7s6uT1WdLexsbgldEtZ bJ3WGK1hbEmqVpwOfZ/o35O/u5+ewWH2YTcRuFlKQqg9Biv24NNxUXkUWPT3ziml4rYNTq jOXI9tsFmaNC5uwN9H2SrOAcQ04gCZuen2FxfJAUQnvmHm03fVVJ9KBp4Q5mh62M1F2mnG fEg4XxPh39DeF/xB2mIgcpA654RKtcrTL7nrfXX9MYwVIctiQ1uJjnTKIhGDJRnvtEgNAx 6uU56xJ6OHGehk+wekgrEKoq5DcD0l8JzlkYUYU259t0Rb8CLYlN+C6H7Pq+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771137; a=rsa-sha256; cv=none; b=sBetHNE4o8bYkuEzZsV9kYhgDpsdRSdekqKfvkDiM0iXQQWOX8y9Tkc3nXPF0EwC1Mx223 YXmoy1FQzJ+obRsCMErhwNOQBARLzSnO2Kxs7Ad8u3g6j5rR+Xek3PxyQahm1eWGoFS5Ww LZpHFQ0p/pldfLvZPpSa2h9DYwfmNyP8FkMr113shoJfPA5V7aWQfLBMvuzp4tfL96OzKp gwV3eza2irk979qXHmHkXzVqKql8OjAWzqKWHa/Anxrt4C/AcBTwSP7yvypa9biOPHVXGg 0uu91v5Jrx+YE/EzQDubgf9aGPNj7aRXteACypXNixN4yB/phKxZtV5BYKdzeg== 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 4P2w1F4csRzlHh; Thu, 26 Jan 2023 22:12:17 +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 30QMCHqr022489; Thu, 26 Jan 2023 22:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMCHur022488; Thu, 26 Jan 2023 22:12:17 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:17 GMT Message-Id: <202301262212.30QMCHur022488@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: 20b3385d4236 - stable/13 - vmm: Fix non-INVARIANTS build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 20b3385d4236b7605b6f1d95c3ac6605e66b1ca0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=20b3385d4236b7605b6f1d95c3ac6605e66b1ca0 commit 20b3385d4236b7605b6f1d95c3ac6605e66b1ca0 Author: Cy Schubert AuthorDate: 2022-11-18 21:20:13 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:06:47 +0000 vmm: Fix non-INVARIANTS build Reported by: O. Hartmann Reviewed by: jhb Fixes: 58eefc67a1cf Differential Revision: https://reviews.freebsd.org/D37444 (cherry picked from commit d487cba33d777efb9f6f7d7967ad2eaa629bcb90) --- sys/amd64/vmm/intel/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 942caa6c58f8..b7b933eb9b18 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -1020,7 +1020,7 @@ vmx_setup_cr_shadow(int which, struct vmcs *vmcs, uint32_t initial) static void * vmx_init(struct vm *vm, pmap_t pmap) { - int error; + int error __diagused; struct vmx *vmx; vmx = malloc(sizeof(struct vmx), M_VMX, M_WAITOK | M_ZERO);