From nobody Thu Jan 26 22:12:16 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 4P2w1F1D6rz3c8bt; Thu, 26 Jan 2023 22:12:17 +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 4P2w1D513dz3ws9; Thu, 26 Jan 2023 22:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771136; 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=2F4ixKiPjeX4a6GTEvadKX4jG6+gtv+odbqKDZPBQrA=; b=DTJKKDVVLHqVJHp0nT1wBxTGBpCc2FT19YI+7/5tMgvAw2XGMpG84jk/0rDRucy5SPP1jO 1MdVh5V6llKY+N+ZA+IwhHAYYgLlvPSuLZnVSFarbcCNgjW3W40WX7VdAHI5CDkX2+NFij u3J56inio0FqDtIl/CEzG5EtccRdlpC8U4/hS/Cfb1rRp/Af1CCJn5kcYb8gM8D4qi4qJn QHVRSI37sn96WHDb4vZV627fHieisAIiY3wvsm5QsAFybALo9LKG69NS4p3WU4RoPxx/PB YNFKFF6XjETC8TKQgEH0ncjrpKUOxeBP3Ml6QzBQDzWKeJoYGX6S5GsR9owkHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771136; 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=2F4ixKiPjeX4a6GTEvadKX4jG6+gtv+odbqKDZPBQrA=; b=Eh4Rhih0FWAilHJyzFrh1TkSkzVaHA0m+NniUYGsRHiVbzFL1CD1RfXajDvanD0kJHUv6g hn5X4lFrV3G5mMS+uFcPhM8No6X/UqGv+a5VXMtfU7ZVFFNYY01RRgrTLIUnnbgm5ZNz3/ wedGquslnGho2Uf9IaNmQzpUupnuFlEYt2Lu2DuPNnLUXGOGyLNN48iVio+UVdZvXVyyQq kPAl3XbRgQavsefboUz1r0zumMSENvy85ykqPK061bwQh9OdbO8Jn9yKTzHoTUCZKLxqx6 moudrohbnpJQgxAKfakrfThVEjV6Q6vGdi/oNPCs8J5LSYnRUHmmEyH2RkeFJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771136; a=rsa-sha256; cv=none; b=dBFWp0ZTGGO8PL25ajXYZrPWO/7c8Jqqkz6nPGUuJIVSCsckSmbK29hwg4NostfbUEYeCb TzjBlkLa7xtvqAAfGxlQgq4NtsV1+N94I8acjizxfndVqP38obIEx0w1BTkIi1xcDsXccU mcE2cXasTFHiHKSdZoK0dc6alTYh3RK5EX/y26CsCB0+afxlx1vzWaESG1M6TVSn+qqhz4 G8rA6v8k2P1mTQAiypURGsxjvykztHXfQUynJyknMpFSldMSxO0Q1oIm+cBRh1EIVL6WpC 6wx2B8R0Kh/GWlmSVXg9D6sjGepTcSxA26YHVQmuiIehhJrLKLVYLQnzLz9oew== 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 4P2w1D3fjDzly4; Thu, 26 Jan 2023 22:12:16 +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 30QMCGiA022464; Thu, 26 Jan 2023 22:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMCGYr022463; Thu, 26 Jan 2023 22:12:16 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:16 GMT Message-Id: <202301262212.30QMCGYr022463@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: 4aded963cdce - stable/13 - vmm: Trim some pointless #ifdef KTR. 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: 4aded963cdceef453656098719a13a2d4842787c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4aded963cdceef453656098719a13a2d4842787c commit 4aded963cdceef453656098719a13a2d4842787c Author: John Baldwin AuthorDate: 2022-11-18 18:06:20 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:06:39 +0000 vmm: Trim some pointless #ifdef KTR. Reported by: markj Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37272 (cherry picked from commit 49fd5115a9b244c599e068977324e8f6a9993066) --- sys/amd64/vmm/intel/vmx.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index baf62c1f8e8a..942caa6c58f8 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -1226,28 +1226,22 @@ vmx_handle_cpuid(struct vmx_vcpu *vcpu, struct vmxctx *vmxctx) static __inline void vmx_run_trace(struct vmx_vcpu *vcpu) { -#ifdef KTR VMX_CTR1(vcpu, "Resume execution at %#lx", vmcs_guest_rip()); -#endif } static __inline void vmx_exit_trace(struct vmx_vcpu *vcpu, uint64_t rip, uint32_t exit_reason, int handled) { -#ifdef KTR VMX_CTR3(vcpu, "%s %s vmexit at 0x%0lx", handled ? "handled" : "unhandled", exit_reason_to_str(exit_reason), rip); -#endif } static __inline void vmx_astpending_trace(struct vmx_vcpu *vcpu, uint64_t rip) { -#ifdef KTR VMX_CTR1(vcpu, "astpending vmexit at 0x%0lx", rip); -#endif } static VMM_STAT_INTEL(VCPU_INVVPID_SAVED, "Number of vpid invalidations saved");