iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: check kvm_pit outside kvm_vm_ioctl_reinject()

Browse Source 
check kvm_pit outside kvm_vm_ioctl_reinject() to keep codestyle consistent
with other kvm_pit func and prepare for futher cleanups.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Miaohe Lin
2019-12-07 17:25:22 +08:00
committed by Paolo Bonzini
parent dfd146fcae
commit cad23e72b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/x86.c
View File

@ -4703,9 +4703,6 @@ static int kvm_vm_ioctl_reinject(struct kvm *kvm,
{ {
struct kvm_pit *pit = kvm->arch.vpit; struct kvm_pit *pit = kvm->arch.vpit;
if (!pit)
return -ENXIO;
/* pit->pit_state.lock was overloaded to prevent userspace from getting /* pit->pit_state.lock was overloaded to prevent userspace from getting
* an inconsistent state after running multiple KVM_REINJECT_CONTROL * an inconsistent state after running multiple KVM_REINJECT_CONTROL
* ioctls in parallel. Use a separate lock if that ioctl isn't rare. * ioctls in parallel. Use a separate lock if that ioctl isn't rare.
@ -5072,6 +5069,9 @@ set_identity_unlock:
r = -EFAULT; r = -EFAULT;
if (copy_from_user(&control, argp, sizeof(control))) if (copy_from_user(&control, argp, sizeof(control)))
goto out; goto out;
r = -ENXIO;
if (!kvm->arch.vpit)
goto out;
r = kvm_vm_ioctl_reinject(kvm, &control); r = kvm_vm_ioctl_reinject(kvm, &control);
break; break;
} }