From: Avi Kivity <avi@redhat.com>
Date: Mon, 21 Jun 2010 07:56:36 +0000 (+0300)
Subject: KVM: Keep slot ID in memory slot structure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e36d96f7cfaa71870c407131eb4fbd38ea285c01;p=deliverable%2Flinux.git

KVM: Keep slot ID in memory slot structure

May be used for distinguishing between internal and user slots, or for sorting
slots in size order.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index e820eb579108..e796326f3646 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -124,6 +124,7 @@ struct kvm_memory_slot {
 	} *lpage_info[KVM_NR_PAGE_SIZES - 1];
 	unsigned long userspace_addr;
 	int user_alloc;
+	int id;
 };
 
 static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5bd2f34ba576..74f731920945 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -570,6 +570,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 
 	new = old = *memslot;
 
+	new.id = mem->slot;
 	new.base_gfn = base_gfn;
 	new.npages = npages;
 	new.flags = mem->flags;