UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: switch coalesced mmio changes to slots_lock 

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

[avi: fix build]

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2009-06-29 22:24:14 +03:00 committed by Avi Kivity
parent 69fa2d7865
commit d5c2dcc36a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virt/kvm/coalesced_mmio.c
View File

@ -115,16 +115,16 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
if (dev == NULL) if (dev == NULL)
return -EINVAL; return -EINVAL;
mutex_lock(&kvm->lock); down_write(&kvm->slots_lock);
if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) { if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) {
mutex_unlock(&kvm->lock); up_write(&kvm->slots_lock);
return -ENOBUFS; return -ENOBUFS;
} }
dev->zone[dev->nb_zones] = *zone; dev->zone[dev->nb_zones] = *zone;
dev->nb_zones++; dev->nb_zones++;
mutex_unlock(&kvm->lock); up_write(&kvm->slots_lock);
return 0; return 0;
} }
@ -138,7 +138,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
if (dev == NULL) if (dev == NULL)
return -EINVAL; return -EINVAL;
mutex_lock(&kvm->lock); down_write(&kvm->slots_lock);
i = dev->nb_zones; i = dev->nb_zones;
while(i) { while(i) {
@ -156,7 +156,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
i--; i--;
} }
mutex_unlock(&kvm->lock); up_write(&kvm->slots_lock);
return 0; return 0;
} }