KVM: introduce a table to map slot id to index in memslots array

[firefly-linux-kernel-4.4.55.git] / include / linux / kvm_host.h

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 9efdf5c703a5fb0a2b36c6e5a96bf2fa19d05ead..8c5c30361b0d7e9bdb432405c1a124b99080dc08 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -239,6 +239,8 @@ struct kvm_irq_routing_table {};
 struct kvm_memslots {
        u64 generation;
        struct kvm_memory_slot memslots[KVM_MEM_SLOTS_NUM];
+       /* The mapping table from slot id to the index in memslots[]. */
+       int id_to_index[KVM_MEM_SLOTS_NUM];
 };
 
 struct kvm {
@@ -341,14 +343,13 @@ static inline struct kvm_memslots *kvm_memslots(struct kvm *kvm)
 static inline struct kvm_memory_slot *
 id_to_memslot(struct kvm_memslots *slots, int id)
 {
-       int i;
+       int index = slots->id_to_index[id];
+       struct kvm_memory_slot *slot;
 
-       for (i = 0; i < KVM_MEM_SLOTS_NUM; i++)
-               if (slots->memslots[i].id == id)
-                       return &slots->memslots[i];
+       slot = &slots->memslots[index];
 
-       WARN_ON(1);
-       return NULL;
+       WARN_ON(slot->id != id);
+       return slot;
 }
 
 #define HPA_MSB ((sizeof(hpa_t) * 8) - 1)