From: Wei Liu <wl@xen.org>
To: Xen Development List <xen-devel@lists.xenproject.org>
Cc: "Wei Liu" <liuwe@microsoft.com>, "Wei Liu" <wl@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Michael Kelley" <mikelley@microsoft.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH for-next v2 6/9] x86: rename hypervisor_{alloc, free}_unused_page
Date: Mon, 30 Sep 2019 16:00:40 +0100 [thread overview]
Message-ID: <20190930150044.5734-7-liuwe@microsoft.com> (raw)
In-Reply-To: <20190930150044.5734-1-liuwe@microsoft.com>
They are used in Xen code only.
No functional change.
Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
xen/arch/x86/guest/xen/xen.c | 6 +++---
xen/arch/x86/pv/shim.c | 4 ++--
xen/include/asm-x86/guest/xen.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c
index 78fc603996..9895025d02 100644
--- a/xen/arch/x86/guest/xen/xen.c
+++ b/xen/arch/x86/guest/xen/xen.c
@@ -97,7 +97,7 @@ static void map_shared_info(void)
unsigned int i;
unsigned long rc;
- if ( hypervisor_alloc_unused_page(&mfn) )
+ if ( xen_alloc_unused_page(&mfn) )
panic("unable to reserve shared info memory page\n");
xatp.gpfn = mfn_x(mfn);
@@ -284,7 +284,7 @@ void hypervisor_ap_setup(void)
init_evtchn();
}
-int hypervisor_alloc_unused_page(mfn_t *mfn)
+int xen_alloc_unused_page(mfn_t *mfn)
{
unsigned long m;
int rc;
@@ -296,7 +296,7 @@ int hypervisor_alloc_unused_page(mfn_t *mfn)
return rc;
}
-int hypervisor_free_unused_page(mfn_t mfn)
+int xen_free_unused_page(mfn_t mfn)
{
return rangeset_remove_range(mem, mfn_x(mfn), mfn_x(mfn));
}
diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index 5441e89de2..41b4665649 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -739,7 +739,7 @@ static long pv_shim_grant_table_op(unsigned int cmd,
};
mfn_t mfn;
- rc = hypervisor_alloc_unused_page(&mfn);
+ rc = xen_alloc_unused_page(&mfn);
if ( rc )
{
gprintk(XENLOG_ERR,
@@ -751,7 +751,7 @@ static long pv_shim_grant_table_op(unsigned int cmd,
rc = xen_hypercall_memory_op(XENMEM_add_to_physmap, &xatp);
if ( rc )
{
- hypervisor_free_unused_page(mfn);
+ xen_free_unused_page(mfn);
break;
}
diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h
index 3145f75361..8221fc1325 100644
--- a/xen/include/asm-x86/guest/xen.h
+++ b/xen/include/asm-x86/guest/xen.h
@@ -33,8 +33,8 @@ extern bool pv_console;
extern uint32_t xen_cpuid_base;
void probe_hypervisor(void);
-int hypervisor_alloc_unused_page(mfn_t *mfn);
-int hypervisor_free_unused_page(mfn_t mfn);
+int xen_alloc_unused_page(mfn_t *mfn);
+int xen_free_unused_page(mfn_t mfn);
DECLARE_PER_CPU(unsigned int, vcpu_id);
DECLARE_PER_CPU(struct vcpu_info *, vcpu_info);
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-09-30 15:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-30 15:00 [Xen-devel] [PATCH for-next v2 0/9] Port Xen to Hyper-V Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 1/9] x86: introduce CONFIG_GUEST and move code Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 2/9] x86: include asm_defns.h directly in hypercall.h Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 3/9] x86: drop hypervisor_cpuid_base Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 4/9] x86: include xen/lib.h in guest/hypercall.h Wei Liu
2019-10-21 9:02 ` Roger Pau Monné
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 5/9] x86: introduce hypervisor framework Wei Liu
2019-09-30 15:00 ` Wei Liu [this message]
2019-10-21 9:11 ` [Xen-devel] [PATCH for-next v2 6/9] x86: rename hypervisor_{alloc, free}_unused_page Roger Pau Monné
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 7/9] x86: switch xen implementation to use hypervisor framework Wei Liu
2019-10-21 9:56 ` Roger Pau Monné
2019-10-21 14:35 ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 8/9] x86: be more verbose when running on a hypervisor Wei Liu
2019-10-21 10:00 ` Roger Pau Monné
2019-10-21 14:35 ` Wei Liu
2019-10-23 13:22 ` Jan Beulich
2019-11-05 11:17 ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 9/9] x86: introduce CONFIG_HYPERV and detection code Wei Liu
2019-09-30 15:04 ` Wei Liu
2019-10-21 10:22 ` Roger Pau Monné
2019-10-21 10:26 ` Roger Pau Monné
2019-10-21 15:02 ` Andrew Cooper
2019-10-21 15:26 ` Wei Liu
2019-10-21 14:56 ` Wei Liu
2019-10-21 15:11 ` Roger Pau Monné
2019-10-21 15:20 ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next RFC 0/8] Port Xen to Hyper-V Wei Liu
2019-10-21 8:58 ` [Xen-devel] [PATCH for-next v2 0/9] " Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190930150044.5734-7-liuwe@microsoft.com \
--to=wl@xen.org \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=liuwe@microsoft.com \
--cc=mikelley@microsoft.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.