Skip to content

Commit 9dbb029

Browse files
mmhalsean-jc
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 5804c19 commit 9dbb029

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

arch/x86/kvm/smm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ void enter_smm(struct kvm_vcpu *vcpu)
324324

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

329328
static_call(kvm_x86_set_cr4)(vcpu, 0);
330329

arch/x86/kvm/x86.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11521,7 +11521,6 @@ static int __set_sregs_common(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs,
1152111521

1152211522
*mmu_reset_needed |= kvm_read_cr0(vcpu) != sregs->cr0;
1152311523
static_call(kvm_x86_set_cr0)(vcpu, sregs->cr0);
11524-
vcpu->arch.cr0 = sregs->cr0;
1152511524

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

0 commit comments

Comments
 (0)