From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 18 Jan 2018 11:47:52 +0000 (+0000)
Subject: x86/guest: clean up guest/xen.h
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~724
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68ccebedb987f06fc9a78b1e3f33918119bd0abb;p=xen.git

x86/guest: clean up guest/xen.h

Remove extraneous semicolon. Add blank lines. Remove unused static
inline functions.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h
index 11243fe60d..c0acf4c36e 100644
--- a/xen/include/asm-x86/guest/xen.h
+++ b/xen/include/asm-x86/guest/xen.h
@@ -49,7 +49,8 @@ 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 probe_hypervisor(void) {}
+
 static inline void hypervisor_setup(void)
 {
     ASSERT_UNREACHABLE();
@@ -63,20 +64,12 @@ static inline void hypervisor_fixup_e820(struct e820map *e820)
 {
     ASSERT_UNREACHABLE();
 }
+
 static inline const unsigned long *hypervisor_reserved_pages(unsigned int *size)
 {
     ASSERT_UNREACHABLE();
     return NULL;
-};
-static inline uint32_t hypervisor_cpuid_base(void)
-{
-    ASSERT_UNREACHABLE();
-    return 0;
-};
-static inline void hypervisor_resume(void)
-{
-    ASSERT_UNREACHABLE();
-};
+}
 
 #endif /* CONFIG_XEN_GUEST */
 #endif /* __X86_GUEST_XEN_H__ */