[Xen-devel] [PATCH] x86/guest: rename probe_hypervisor to hypervisor_probe

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

This matches the nomenclature used by the rest of the guest-related
functions.

No functional change.

Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Cc: Jan Beulich <jbeulich@xxxxxxxx>
Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/arch/x86/guest/pvh-boot.c   | 2 +-
 xen/arch/x86/guest/xen.c        | 2 +-
 xen/arch/x86/setup.c            | 2 +-
 xen/include/asm-x86/guest/xen.h | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/guest/pvh-boot.c b/xen/arch/x86/guest/pvh-boot.c
index 0e9e5bfdf6..4ea4e8ad59 100644
--- a/xen/arch/x86/guest/pvh-boot.c
+++ b/xen/arch/x86/guest/pvh-boot.c
@@ -92,7 +92,7 @@ multiboot_info_t *__init pvh_init(void)
 {
     convert_pvh_info();
 
-    probe_hypervisor();
+    hypervisor_probe();
     ASSERT(xen_guest);
 
     get_memory_map();
diff --git a/xen/arch/x86/guest/xen.c b/xen/arch/x86/guest/xen.c
index cd4acbf70c..6355ff1c0b 100644
--- a/xen/arch/x86/guest/xen.c
+++ b/xen/arch/x86/guest/xen.c
@@ -68,7 +68,7 @@ static void __init find_xen_leaves(void)
     }
 }
 
-void __init probe_hypervisor(void)
+void __init hypervisor_probe(void)
 {
     if ( xen_guest )
         return;
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 2fbf7d574c..ec02bbcbd7 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -740,7 +740,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
      * allocing any xenheap structures wanted in lower memory. */
     kexec_early_calculations();
 
-    probe_hypervisor();
+    hypervisor_probe();
 
     parse_video_info();
 
diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h
index c0acf4c36e..a68ecc24e9 100644
--- a/xen/include/asm-x86/guest/xen.h
+++ b/xen/include/asm-x86/guest/xen.h
@@ -31,7 +31,7 @@
 extern bool xen_guest;
 extern bool pv_console;
 
-void probe_hypervisor(void);
+void hypervisor_probe(void);
 void hypervisor_setup(void);
 void hypervisor_ap_setup(void);
 int hypervisor_alloc_unused_page(mfn_t *mfn);
@@ -49,7 +49,7 @@ DECLARE_PER_CPU(struct vcpu_info *, vcpu_info);
 #define xen_guest 0
 #define pv_console 0
 
-static inline void probe_hypervisor(void) {}
+static inline void hypervisor_probe(void) {}
 
 static inline void hypervisor_setup(void)
 {
-- 
2.19.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel