Commit e489a4a6 authored Jul 02, 2021 by Sean Christopherson Committed by Paolo Bonzini Aug 02, 2021

KVM: x86: Hoist kvm_dirty_regs check out of sync_regs()



Move the kvm_dirty_regs vs. KVM_SYNC_X86_VALID_FIELDS check out of
sync_regs() and into its sole caller, kvm_arch_vcpu_ioctl_run().  This
allows a future patch to allow synchronizing select state for protected
VMs.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <889017a8d31cea46472e0c64b234ef5919278ed9.1625186503.git.isaku.yamahata@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 19025e7b

arch/x86/kvm/x86.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -9980,7 +9980,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
		goto out;
		}

		if (kvm_run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) {
		if ((kvm_run->kvm_valid_regs & ~KVM_SYNC_X86_VALID_FIELDS) \|\|
		(kvm_run->kvm_dirty_regs & ~KVM_SYNC_X86_VALID_FIELDS)) {
		r = -EINVAL;
		goto out;
		}
		@@ -10585,9 +10586,6 @@ static void store_regs(struct kvm_vcpu *vcpu)

		static int sync_regs(struct kvm_vcpu *vcpu)
		{
		if (vcpu->run->kvm_dirty_regs & ~KVM_SYNC_X86_VALID_FIELDS)
		return -EINVAL;

		if (vcpu->run->kvm_dirty_regs & KVM_SYNC_X86_REGS) {
		__set_regs(vcpu, &vcpu->run->s.regs.regs);
		vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_REGS;