From nobody Thu Jan 26 22:12:18 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 4P2w1H0lMmz3c8fT; Thu, 26 Jan 2023 22:12:19 +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 4P2w1G6V3Sz3wnV; Thu, 26 Jan 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771139; 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=KBXMXQP4SDRpT4KPxAa/QEQjp4QktF8K/ClSpDr/OW0=; b=NmldQhhNxwPOmxwcNQdABz16HbAitFux2JvKYoDFUhUxsm4fQKPKqr1UaWghmEXcUqTqO+ c1T8D8UVQkSC7VQZBoOHV4JXsVv5v2ajHtLTsp0JkMK16zGx+nqbyW7RS5t2kkjaXbBYbx g88bhoDfZbs+Pt+poZcf9Ylps1ziE4DNYFhjHKWrSb04v6UoWacqqCh2UUdEMIKP26mgGM OQyiRW33u3yQJty7mW9gHQujBEZdXipNoMQdcbLbTm2UPYRN0hGSiTG0hWhmWbaPuLUSQV oLzVDUCjbN7Z1W6ph6bxhRvDibV7Q/CPZ+4/yucuvcbi4uxjG+fqdWpSv6ARqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771139; 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=KBXMXQP4SDRpT4KPxAa/QEQjp4QktF8K/ClSpDr/OW0=; b=fC2/F7ISncolX3t82WKLz03P3utvDV6IrC3V6Uu80S4r5w0Nw4GH7ajBJ4zIMA7DwC5TW8 DUX4wV0FfjxFbCFDRLklkauTd6JR2aMzG2/wxPs8QsUSCIm1e48iw/15tO+fv6CD5j3rgt wtUIZzg1uEbvQlNLY2LOV/bt0FF8bu+iVlpgUdFsvPnZlHn2yqxfsVZUCf9MVg588rZfhB c9fTsJAxyPvV0mEJz/3g8xm+6q3x0mBDaD2JX4UK20zlIr9uA1cjYjyA0owF85/4ikja1N wo6wh4q95Obx7Ba2VZpTExViI1covsW1jpZy9dQ2VbU3MAQngJgQEoO0pKNoJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771139; a=rsa-sha256; cv=none; b=Lb0iOKqtQtS7c5CFiaFkJtjmIr00DTI8vhkbqoU0r0ik3sVYdVZwXtz0eXDBKChj8B3Zpo ri1P0rSxdUuPD0vzqgjIqpwfNZ8d2HEo3uTLEU7tugoaW228XoI6rtlBGLwzSYk3lO+uy3 Bwx5LKIs4shU786uNnbFEspgk0ffC6zKE2zeH6TWuK8VHTP4efC8AIgKIBXRuIOz3k8cdp l5hOO69OmEA6eYSvykLip0xZAxntupGx2+JP8IBsHniGDKxkB5I2myf3i+aQ1n7wtN1IhX i3imyYAh1IZEWUoxflrU1wtJcE6etv8u+m0UnenjeM7M0UQEV2LNsTjh381AaQ== 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 4P2w1G5JJXzlHj; Thu, 26 Jan 2023 22:12:18 +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 30QMCIEc022519; Thu, 26 Jan 2023 22:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMCIXP022518; Thu, 26 Jan 2023 22:12:18 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:18 GMT Message-Id: <202301262212.30QMCIXP022518@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: 4c13ad46a150 - stable/13 - vmm: Fix build w/o KDTRACE_HOOKS. 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: 4c13ad46a15094c12c3ddf37eb25502e7860a82a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4c13ad46a15094c12c3ddf37eb25502e7860a82a commit 4c13ad46a15094c12c3ddf37eb25502e7860a82a Author: Dmitry Chagin AuthorDate: 2022-11-20 15:00:55 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:07:06 +0000 vmm: Fix build w/o KDTRACE_HOOKS. Reviewed by: imp Differential revision: https://reviews.freebsd.org/D37446 (cherry picked from commit 2ee1a18d51ed68ee34df7dcfd05f6cfc16110202) --- 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;