From patchwork Wed Jul 14 19:36:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 58924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8B6B9B6EF2 for ; Thu, 15 Jul 2010 05:38:11 +1000 (EST) Received: from localhost ([127.0.0.1]:55861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ7mR-0001gx-Id for incoming@patchwork.ozlabs.org; Wed, 14 Jul 2010 15:38:07 -0400 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6EJaovS002292 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Jul 2010 15:36:51 -0400 Received: from localhost6.localdomain6 (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6EJanpR010402; Wed, 14 Jul 2010 15:36:50 -0400 From: Alex Williamson To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Wed, 14 Jul 2010 13:36:49 -0600 Message-ID: <20100714193606.7124.80638.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: mtosatti@redhat.com, avi@redhat.com Subject: [Qemu-devel] [PATCH] kvm: Don't walk memory_size == 0 slots in kvm_client_migration_log X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }