From b31180d630bcbbc05ab77a4184749675928fcb52 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 10 Dec 2012 10:32:51 -0700 Subject: [PATCH] --- yaml --- r: 356785 b: refs/heads/master c: 9c695d42dbd465bcaa865603b411a73c60e60978 h: refs/heads/master i: 356783: 3df1df6bb1e9ccb92adc7e5a064f96bb2948656d v: v3 --- [refs] | 2 +- trunk/virt/kvm/kvm_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c52e1fff75e..1d086abc1a6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0736cf0550b349a5d5a374d65ca0488cc2eee40 +refs/heads/master: 9c695d42dbd465bcaa865603b411a73c60e60978 diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index 3caf8162eb6b..e4d358195e54 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -784,13 +784,19 @@ int __kvm_set_memory_region(struct kvm *kvm, r = -ENOMEM; - /* Allocate if a slot is being created */ + /* + * Allocate if a slot is being created. If modifying a slot, + * the userspace_addr cannot change. + */ if (!old.npages) { new.user_alloc = user_alloc; new.userspace_addr = mem->userspace_addr; if (kvm_arch_create_memslot(&new, npages)) goto out_free; + } else if (npages && mem->userspace_addr != old.userspace_addr) { + r = -EINVAL; + goto out_free; } /* Allocate page dirty bitmap if needed */