From patchwork Mon Jun 20 14:31:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takuya Yoshikawa X-Patchwork-Id: 897542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5KEW3nV014389 for ; Mon, 20 Jun 2011 14:32:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754581Ab1FTOcA (ORCPT ); Mon, 20 Jun 2011 10:32:00 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:34546 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493Ab1FTOcA (ORCPT ); Mon, 20 Jun 2011 10:32:00 -0400 Received: by pvg12 with SMTP id 12so761716pvg.19 for ; Mon, 20 Jun 2011 07:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:in-reply-to :references:x-mailer:mime-version:content-type :content-transfer-encoding; bh=97Ie112z5W0mMXf/DT0UMNKv2xy6AsdMfhCfOiX/d00=; b=ROclANKcBqR6ExHvRyIWmHzoSca8/k7NCTL96TdXxb9uD5uYf4LwPDMyeRrxAEJ5CI BBiSwdBirgfCNq8p6zhpEJYMCf1OBb7C6E9ACnDVBc/p0PeGRpAOJmwcdpH05DMAjD/h C9sxUn8GIaVFweuFZwGrakco95nftBGtHF5Mw= DomainKey-Signature: a=rsa-sha1; c=nofws; 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; b=QvgYejEGgESM5sWnfJ8W81nLrvNUPDt+/k3SQZSTLI6gM2WWMxUBa/l1zo6wcKT8h0 lzaC8u3skSZ9jgr2kXZ4GX0f4NrG9lcL6pQ2M0IsbQi4S/2OyS6cWZ9O+3tjbtrJBoMO N/jiG8+Yt3JHRE9k1Zv5LAuaKKX+B3pgo4AOA= Received: by 10.142.208.11 with SMTP id f11mr737526wfg.231.1308580319465; Mon, 20 Jun 2011 07:31:59 -0700 (PDT) Received: from amd (x096101.dynamic.ppp.asahi-net.or.jp [122.249.96.101]) by mx.google.com with ESMTPS id x1sm3148093pbb.34.2011.06.20.07.31.57 (version=SSLv3 cipher=OTHER); Mon, 20 Jun 2011 07:31:58 -0700 (PDT) Date: Mon, 20 Jun 2011 23:31:55 +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 v3 2/3] KVM: MMU: Rename the walk label in walk_addr_generic() Message-Id: <20110620233155.357a9ce9.takuya.yoshikawa@gmail.com> In-Reply-To: <20110620232947.83d016d3.takuya.yoshikawa@gmail.com> References: <20110620232947.83d016d3.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 (demeter2.kernel.org [140.211.167.43]); Mon, 20 Jun 2011 14:32:03 +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 --- v2-v3: only changelog update 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 137aa45..92fe275 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); @@ -222,7 +222,7 @@ walk: errcode |= PFERR_PRESENT_MASK; goto error; } else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_ACCESSED_MASK; @@ -287,7 +287,7 @@ walk: errcode |= PFERR_PRESENT_MASK; goto error; } else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_DIRTY_MASK;