From nobody Sun Nov 20 15:01:09 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 4NFYcj55Wmz4hJ1M; Sun, 20 Nov 2022 15:01:09 +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 4NFYcj4f92z42Wf; Sun, 20 Nov 2022 15:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668956469; 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=PeK2IYvYNONJIpdcxU39ls0lYUozayQ1ShUePQ96cJc=; b=MAoIxp/R/3up9GMEVVVmY24Oz+8vXAy9/hUNSzUZAAmbYEWd+GEAss+2h3UapnnTqZVa6l ZotcSC0j6OKcmG4YH3d/zC7s4w7LJsJBNTAjoWfyOKb4M25CTQZcFCtz6QxVO7FWbKMj0T EUsPUbAXdGEjkI63Gd4qfFN1c5DTeLo7YcArjkmVB8QXdu6dBlDkZ9O9ww1HJpsrgWEFSY dXfSLpLodtg2gLp4ZI5blChcAG1oIpEgWD1hAd5/heMx0ckmMufP0XOmmr/E1BlFxAi8En +r2eXudh012tX92Vir95AIeVkXFpwokJDCZbODM/2MVQ1nW1tbrb1c/fwpGDIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668956469; 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=PeK2IYvYNONJIpdcxU39ls0lYUozayQ1ShUePQ96cJc=; b=SCoaoLp1SjUcSKccgQo6WjTkB6gUCigfwu6MMfLtbQeXD+XnHIuTiU2J7LuysomTp+fkZd ALJokogKA4LT/2rQ0+pPXlkS5C6+E1lX5gMQtuazQZi+br/bYgsEs7F0fON9gAxFSMNHnd q/cDAO2w2IAHTov+tc7wtsMfW4+N/NC/3m4YyXzrqC/XAXeXsReREM19ejbZ8fTHBokB2m xSVqrQUqx98SYlS8yKqnaka4TaJVGXRH2hmNO/hdoQgKaxPx00Og4EswZ5t2zawOuCKf1P AtEg1+JV3KOLerTIkb7PqxmRMKu2qh7EqEMuP7IIJng1RuxZrIuH+KO7JuhnTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668956469; a=rsa-sha256; cv=none; b=f6baYROFjh5a132DT3tRqSESzLAv0Yo8bT5qGFCtO6zL/R+NS6Rj1uo60TrP3uGjgUoOaz o+KXrowBd7gBmYxaiVBn2PlSFrvQo9cFgngh1Zv6b8K7GjAvaeU0zD3RkKRdIWkAeP9VR9 ENP8+GIidUYKu5Vpz6RznCzgK2fxGwYs+cSxKBvlDfboyPgtwDLvYksBM3HdHK3RteApv0 GYZiK3JLdGBmpbNdEJq/jWdO2DYKmQmr/tk14xMGETTIWxxT6Xy0oJxh4Hc4Hf4PMqpbyj oMRMnDZheMa2TGjSmK7ZQWfsd9m3iT1YqAGf7QEXgECqeY++3OmHchn/6HbpSg== 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 4NFYcj3jLvzTDf; Sun, 20 Nov 2022 15:01:09 +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 2AKF19aL035081; Sun, 20 Nov 2022 15:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKF19To035080; Sun, 20 Nov 2022 15:01:09 GMT (envelope-from git) Date: Sun, 20 Nov 2022 15:01:09 GMT Message-Id: <202211201501.2AKF19To035080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2ee1a18d51ed - main - vmm: Fix build w/o KDTRACE_HOOKS. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ee1a18d51ed68ee34df7dcfd05f6cfc16110202 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee1a18d51ed68ee34df7dcfd05f6cfc16110202 commit 2ee1a18d51ed68ee34df7dcfd05f6cfc16110202 Author: Dmitry Chagin AuthorDate: 2022-11-20 15:00:55 +0000 Commit: Dmitry Chagin CommitDate: 2022-11-20 15:00:55 +0000 vmm: Fix build w/o KDTRACE_HOOKS. Reviewed by: imp Differential revision: https://reviews.freebsd.org/D37446 --- sys/amd64/vmm/intel/vmx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index b7b933eb9b18..4b65e254cc91 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -2350,7 +2350,9 @@ vmx_exit_process(struct vmx *vmx, struct vmx_vcpu *vcpu, struct vm_exit *vmexit) uint32_t eax, ecx, edx, idtvec_info, idtvec_err, intr_info, inst_info; uint32_t intr_type, intr_vec, reason; uint64_t exitintinfo, qual, gpa; +#ifdef KDTRACE_HOOKS int vcpuid; +#endif bool retu; CTASSERT((PINBASED_CTLS_ONE_SETTING & PINBASED_VIRTUAL_NMI) != 0); @@ -2358,7 +2360,9 @@ vmx_exit_process(struct vmx *vmx, struct vmx_vcpu *vcpu, struct vm_exit *vmexit) handled = UNHANDLED; vmxctx = &vcpu->ctx; +#ifdef KDTRACE_HOOKS vcpuid = vcpu->vcpuid; +#endif qual = vmexit->u.vmx.exit_qualification; reason = vmexit->u.vmx.exit_reason;