From patchwork Thu Jun 30 16:36:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takuya Yoshikawa X-Patchwork-Id: 933012 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5UGaF2G016113 for ; Thu, 30 Jun 2011 16:36:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753012Ab1F3QgN (ORCPT ); Thu, 30 Jun 2011 12:36:13 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:57879 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752933Ab1F3QgM (ORCPT ); Thu, 30 Jun 2011 12:36:12 -0400 Received: by pzk9 with SMTP id 9so1876849pzk.19 for ; Thu, 30 Jun 2011 09:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; bh=PaioV4/rAHrhOTccTX0a09s7PJh/eLul/bBMZelzHTk=; b=h2ykd+o+9+UGc3t+mfEIzmJWmB5ANgXFbAO/fbcOfjGVo8QjVA3bojK64AytQWeLUM Bm9f8zPAuXWhEsGWOh553Na48e9x1ZqimASAAgSOphAr1J+uyIlKmSyUrDVR2TGmaUZG MDjPQda7BNuYaWmScIWjjckIA6EwYm4fo5K8c= Received: by 10.68.48.199 with SMTP id o7mr2806562pbn.5.1309451772186; Thu, 30 Jun 2011 09:36:12 -0700 (PDT) Received: from amd (x096101.dynamic.ppp.asahi-net.or.jp [122.249.96.101]) by mx.google.com with ESMTPS id k4sm1545264pbl.91.2011.06.30.09.36.09 (version=SSLv3 cipher=OTHER); Thu, 30 Jun 2011 09:36:11 -0700 (PDT) Date: Fri, 1 Jul 2011 01:36:07 +0900 From: Takuya Yoshikawa To: avi@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp, mingo@elte.hu Subject: [PATCH 2/3] KVM: MMU: Rename the walk label in walk_addr_generic() Message-Id: <20110701013607.eea23028.takuya.yoshikawa@gmail.com> In-Reply-To: <20110701013320.977cdfea.takuya.yoshikawa@gmail.com> References: <20110701013320.977cdfea.takuya.yoshikawa@gmail.com> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.24.4; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Jun 2011 16:36:15 +0000 (UTC) From: Takuya Yoshikawa The current name does not explain the meaning well. So give it a better name "retry_walk" to show that we are trying the walk again. This was suggested by Ingo Molnar. Cc: Ingo Molnar Signed-off-by: Takuya Yoshikawa --- arch/x86/kvm/paging_tmpl.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index f0746d2..9c0afba 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -134,7 +134,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, trace_kvm_mmu_pagetable_walk(addr, write_fault, user_fault, fetch_fault); -walk: +retry_walk: eperm = false; walker->level = mmu->root_level; pte = mmu->get_cr3(vcpu); @@ -211,7 +211,7 @@ walk: if (unlikely(ret < 0)) goto error; else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_ACCESSED_MASK; @@ -277,7 +277,7 @@ walk: if (unlikely(ret < 0)) goto error; else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_DIRTY_MASK;