From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37418 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ7lI-0001QG-FZ for qemu-devel@nongnu.org; Wed, 14 Jul 2010 15:36:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ7lH-0002XO-4s for qemu-devel@nongnu.org; Wed, 14 Jul 2010 15:36:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23653) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ7lG-0002X0-Ug for qemu-devel@nongnu.org; Wed, 14 Jul 2010 15:36:55 -0400 From: Alex Williamson Date: Wed, 14 Jul 2010 13:36:49 -0600 Message-ID: <20100714193606.7124.80638.stgit@localhost6.localdomain6> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] kvm: Don't walk memory_size == 0 slots in kvm_client_migration_log List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: mtosatti@redhat.com, avi@redhat.com 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; }