From 2347db76b93ce5b9a7d55dd4f25a059696a06213 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 21 Jun 2010 10:56:36 +0300
Subject: [PATCH] --- yaml --- r: 202364 b: refs/heads/master c:
 e36d96f7cfaa71870c407131eb4fbd38ea285c01 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/kvm_host.h | 1 +
 trunk/virt/kvm/kvm_main.c      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f5ef27eabce..7ba0c490efc5 100644
--- 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
index e820eb579108..e796326f3646 100644
--- 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
index 5bd2f34ba576..74f731920945 100644
--- 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;