From patchwork Wed Jul 14 19:36:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: kvm: Don't walk memory_size == 0 slots in kvm_client_migration_log From: Alex Williamson X-Patchwork-Id: 58924 Message-Id: <20100714193606.7124.80638.stgit@localhost6.localdomain6> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: mtosatti@redhat.com, avi@redhat.com Date: Wed, 14 Jul 2010 13:36:49 -0600 If we've unregistered a memory area, we should avoid calling qemu_get_ram_ptr() on the left over phys_offset cruft in the slot array. Now that we support removing ramblocks, the phys_offset ram_addr_t can go away and cause a lookup fault and abort. Signed-off-by: Alex Williamson --- kvm-all.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index fec6d05..2922292 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -282,6 +282,9 @@ static int kvm_set_migration_log(int enable) for (i = 0; i < ARRAY_SIZE(s->slots); i++) { mem = &s->slots[i]; + if (!mem->memory_size) { + continue; + } if (!!(mem->flags & KVM_MEM_LOG_DIRTY_PAGES) == enable) { continue; }