---

yaml --- r: 202364 b: refs/heads/master c: e36d96f h: refs/heads/master v: v3
git-mirror · Aug 1, 2010 · 2347db7 · 2347db7
1 parent 3a66414
commit 2347db7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0719837c0832a7b305e42327caa7d330462360ea
+refs/heads/master: e36d96f7cfaa71870c407131eb4fbd38ea285c01
diff --git a/trunk/include/linux/kvm_host.h b/trunk/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/trunk/virt/kvm/kvm_main.c b/trunk/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;