Commit 9dbb029b authored Aug 15, 2023 by Michal Luczaj Committed by Sean Christopherson Sep 27, 2023

KVM: x86: Remove redundant vcpu->arch.cr0 assignments



Drop the vcpu->arch.cr0 assignment after static_call(kvm_x86_set_cr0).
CR0 was already set by {vmx,svm}_set_cr0().

Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://lore.kernel.org/r/20230814222358.707877-2-mhal@rbox.co


Signed-off-by: Sean Christopherson <seanjc@google.com>

parent 5804c19b

arch/x86/kvm/smm.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -324,7 +324,6 @@ void enter_smm(struct kvm_vcpu *vcpu)

		cr0 = vcpu->arch.cr0 & ~(X86_CR0_PE \| X86_CR0_EM \| X86_CR0_TS \| X86_CR0_PG);
		static_call(kvm_x86_set_cr0)(vcpu, cr0);
		vcpu->arch.cr0 = cr0;

		static_call(kvm_x86_set_cr4)(vcpu, 0);

arch/x86/kvm/x86.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -11521,7 +11521,6 @@ static int __set_sregs_common(struct kvm_vcpu vcpu, struct kvm_sregs sregs,

		*mmu_reset_needed \|= kvm_read_cr0(vcpu) != sregs->cr0;
		static_call(kvm_x86_set_cr0)(vcpu, sregs->cr0);
		vcpu->arch.cr0 = sregs->cr0;

		*mmu_reset_needed \|= kvm_read_cr4(vcpu) != sregs->cr4;
		static_call(kvm_x86_set_cr4)(vcpu, sregs->cr4);