Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 108b5669 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Avi Kivity
Browse files

KVM: switch pit creation to slots_lock 



switch pit creation to slots_lock. slots_lock is already taken for read
everywhere, so we only need to take it for write when creating pit.
This is in preparation to removing in_range and kvm->lock around it.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d5c2dcc3

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2188,7 +2188,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
				   sizeof(struct kvm_pit_config)))

			goto out;

	create_pit:

		mutex_lock(&kvm->lock);

		down_write(&kvm->slots_lock);

		r = -EEXIST;

		if (kvm->arch.vpit)

			goto create_pit_unlock;
@@ -2197,7 +2197,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		if (kvm->arch.vpit)

			r = 0;

	create_pit_unlock:

		mutex_unlock(&kvm->lock);

		up_write(&kvm->slots_lock);

		break;

	case KVM_IRQ_LINE_STATUS:

	case KVM_IRQ_LINE: {