[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] x86/p2m: preparation work for xenmem_add_to_physmap_one()
commit f0a00ab1a62164908cf50dfbd42963e1797fe3ca Author: Federico Serafini <federico.serafini@xxxxxxxxxxx> AuthorDate: Tue Dec 5 09:54:07 2023 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Tue Dec 5 09:54:07 2023 +0100 x86/p2m: preparation work for xenmem_add_to_physmap_one() The objective is to use parameter name "gfn" for xenmem_add_to_physmap_one(). Since the name "gfn" is currently used as identifier for a local variable, bad things could happen if new uses of such variable are committed while a renaming patch is waiting for the approval. To avoid such danger, as first thing rename the local variable from "gfn" to "gmfn", in line with XENMAPSPACE_gmfn which is the only space it is used with. No functional change. Signed-off-by: Federico Serafini <federico.serafini@xxxxxxxxxxx> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx> --- xen/arch/x86/mm/p2m.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index fe9ccabb87..42508e1e7e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2417,7 +2417,7 @@ int xenmem_add_to_physmap_one( gfn_t gpfn) { struct page_info *page = NULL; - unsigned long gfn = 0 /* gcc ... */, old_gpfn; + unsigned long gmfn = 0 /* gcc ... */, old_gpfn; mfn_t prev_mfn; int rc = 0; mfn_t mfn = INVALID_MFN; @@ -2440,12 +2440,12 @@ int xenmem_add_to_physmap_one( case XENMAPSPACE_gmfn: { - gfn = idx; - mfn = get_gfn_unshare(d, gfn, &p2mt); + gmfn = idx; + mfn = get_gfn_unshare(d, gmfn, &p2mt); /* If the page is still shared, exit early */ if ( p2m_is_shared(p2mt) ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); return -ENOMEM; } page = get_page_from_mfn(mfn, d); @@ -2480,7 +2480,7 @@ int xenmem_add_to_physmap_one( /* XENMAPSPACE_gmfn: Check if the MFN is associated with another GFN. */ old_gpfn = get_gpfn_from_mfn(mfn_x(mfn)); ASSERT(!SHARED_M2P(old_gpfn)); - if ( space == XENMAPSPACE_gmfn && old_gpfn != gfn ) + if ( space == XENMAPSPACE_gmfn && old_gpfn != gmfn ) { rc = -EXDEV; goto put_all; @@ -2518,7 +2518,7 @@ int xenmem_add_to_physmap_one( */ if ( space == XENMAPSPACE_gmfn ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); if ( !rc && extra.ppage ) { *extra.ppage = page; -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |