Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a843fac2536d6d81335d7011dd7ec4e438161dd7

Authored by Takuya Yoshikawa
Committed by Gleb Natapov
1 parent 0a706beefb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

KVM: set_memory_region: Remove unnecessary variable memslot 

One such variable, slot, is enough for holding a pointer temporarily.
We also remove another local variable named slot, which is limited in
a block, since it is confusing to have the same name in this function.

Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Gleb Natapov <gleb@redhat.com>

Showing 1 changed file with 5 additions and 6 deletions Side-by-side Diff

... ... @@ -728,7 +728,7 @@
728 728 int r;
729 729 gfn_t base_gfn;
730 730 unsigned long npages;
731   - struct kvm_memory_slot *memslot, *slot;
  731 + struct kvm_memory_slot *slot;
732 732 struct kvm_memory_slot old, new;
733 733 struct kvm_memslots *slots = NULL, *old_memslots;
734 734  
... ... @@ -754,7 +754,7 @@
754 754 if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr)
755 755 goto out;
756 756  
757   - memslot = id_to_memslot(kvm->memslots, mem->slot);
  757 + slot = id_to_memslot(kvm->memslots, mem->slot);
758 758 base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
759 759 npages = mem->memory_size >> PAGE_SHIFT;
760 760  
... ... @@ -765,7 +765,7 @@
765 765 if (!npages)
766 766 mem->flags &= ~KVM_MEM_LOG_DIRTY_PAGES;
767 767  
768   - new = old = *memslot;
  768 + new = old = *slot;
769 769  
770 770 new.id = mem->slot;
771 771 new.base_gfn = base_gfn;
... ... @@ -786,7 +786,8 @@
786 786 /* Check for overlaps */
787 787 r = -EEXIST;
788 788 kvm_for_each_memslot(slot, kvm->memslots) {
789   - if (slot->id >= KVM_USER_MEM_SLOTS || slot == memslot)
  789 + if ((slot->id >= KVM_USER_MEM_SLOTS) ||
  790 + (slot->id == mem->slot))
790 791 continue;
791 792 if (!((base_gfn + npages <= slot->base_gfn) ||
792 793 (base_gfn >= slot->base_gfn + slot->npages)))
... ... @@ -822,8 +823,6 @@
822 823 }
823 824  
824 825 if (!npages || base_gfn != old.base_gfn) {
825   - struct kvm_memory_slot *slot;
826   -
827 826 r = -ENOMEM;
828 827 slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
829 828 GFP_KERNEL);