[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2 17/19] xen: Update header guards - VM event, mem access, monitor



Updated headers related to VM event, mem access AND monitor.

Signed-off-by: Frediano Ziglio <frediano.ziglio@xxxxxxxxx>
---
 xen/arch/x86/include/asm/hvm/monitor.h  | 6 +++---
 xen/arch/x86/include/asm/hvm/vm_event.h | 6 +++---
 xen/arch/x86/include/asm/mem_access.h   | 6 +++---
 xen/arch/x86/include/asm/monitor.h      | 6 +++---
 xen/arch/x86/include/asm/vm_event.h     | 6 +++---
 xen/include/asm-generic/monitor.h       | 6 +++---
 xen/include/asm-generic/vm_event.h      | 6 +++---
 xen/include/public/vm_event.h           | 6 +++---
 xen/include/xen/mem_access.h            | 6 +++---
 xen/include/xen/monitor.h               | 6 +++---
 xen/include/xen/vm_event.h              | 6 +++---
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/xen/arch/x86/include/asm/hvm/monitor.h 
b/xen/arch/x86/include/asm/hvm/monitor.h
index 02021be47b..8ef90a1b03 100644
--- a/xen/arch/x86/include/asm/hvm/monitor.h
+++ b/xen/arch/x86/include/asm/hvm/monitor.h
@@ -5,8 +5,8 @@
  * Arch-specific hardware virtual machine monitor abstractions.
  */
 
-#ifndef __ASM_X86_HVM_MONITOR_H__
-#define __ASM_X86_HVM_MONITOR_H__
+#ifndef ASM__X86__HVM__MONITOR_H
+#define ASM__X86__HVM__MONITOR_H
 
 #include <public/vm_event.h>
 
@@ -46,7 +46,7 @@ int hvm_monitor_vmexit(unsigned long exit_reason,
 int hvm_monitor_io(unsigned int port, unsigned int bytes,
                    bool in, bool str);
 
-#endif /* __ASM_X86_HVM_MONITOR_H__ */
+#endif /* ASM__X86__HVM__MONITOR_H */
 
 /*
  * Local variables:
diff --git a/xen/arch/x86/include/asm/hvm/vm_event.h 
b/xen/arch/x86/include/asm/hvm/vm_event.h
index 506a85c774..c03df6f15e 100644
--- a/xen/arch/x86/include/asm/hvm/vm_event.h
+++ b/xen/arch/x86/include/asm/hvm/vm_event.h
@@ -5,12 +5,12 @@
  * Hardware virtual machine vm_event abstractions.
  */
 
-#ifndef __ASM_X86_HVM_VM_EVENT_H__
-#define __ASM_X86_HVM_VM_EVENT_H__
+#ifndef ASM__X86__HVM__VM_EVENT_H
+#define ASM__X86__HVM__VM_EVENT_H
 
 void hvm_vm_event_do_resume(struct vcpu *v);
 
-#endif /* __ASM_X86_HVM_VM_EVENT_H__ */
+#endif /* ASM__X86__HVM__VM_EVENT_H */
 
 /*
  * Local variables:
diff --git a/xen/arch/x86/include/asm/mem_access.h 
b/xen/arch/x86/include/asm/mem_access.h
index 1a52a10322..b774f2f8b6 100644
--- a/xen/arch/x86/include/asm/mem_access.h
+++ b/xen/arch/x86/include/asm/mem_access.h
@@ -11,8 +11,8 @@
  * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al.
  */
 
-#ifndef __ASM_X86_MEM_ACCESS_H__
-#define __ASM_X86_MEM_ACCESS_H__
+#ifndef ASM__X86__MEM_ACCESS_H
+#define ASM__X86__MEM_ACCESS_H
 
 /*
  * Setup vm_event request based on the access (gla is -1ull if not available).
@@ -44,7 +44,7 @@ int p2m_set_suppress_ve_multi(struct domain *d,
 int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve,
                         unsigned int altp2m_idx);
 
-#endif /*__ASM_X86_MEM_ACCESS_H__ */
+#endif /*ASM__X86__MEM_ACCESS_H */
 
 /*
  * Local variables:
diff --git a/xen/arch/x86/include/asm/monitor.h 
b/xen/arch/x86/include/asm/monitor.h
index 3c64d8258f..2d0dde5041 100644
--- a/xen/arch/x86/include/asm/monitor.h
+++ b/xen/arch/x86/include/asm/monitor.h
@@ -19,8 +19,8 @@
  * License along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ASM_X86_MONITOR_H__
-#define __ASM_X86_MONITOR_H__
+#ifndef ASM__X86__MONITOR_H
+#define ASM__X86__MONITOR_H
 
 #include <xen/sched.h>
 
@@ -126,4 +126,4 @@ static inline void arch_monitor_cleanup_domain(struct 
domain *d) {}
 bool monitored_msr(const struct domain *d, u32 msr);
 bool monitored_msr_onchangeonly(const struct domain *d, u32 msr);
 
-#endif /* __ASM_X86_MONITOR_H__ */
+#endif /* ASM__X86__MONITOR_H */
diff --git a/xen/arch/x86/include/asm/vm_event.h 
b/xen/arch/x86/include/asm/vm_event.h
index 46e77ed6d9..bac504ba70 100644
--- a/xen/arch/x86/include/asm/vm_event.h
+++ b/xen/arch/x86/include/asm/vm_event.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2015 Tamas K Lengyel (tamas@xxxxxxxxxxxxx)
  */
 
-#ifndef __ASM_X86_VM_EVENT_H__
-#define __ASM_X86_VM_EVENT_H__
+#ifndef ASM__X86__VM_EVENT_H
+#define ASM__X86__VM_EVENT_H
 
 #include <xen/sched.h>
 #include <public/vm_event.h>
@@ -45,4 +45,4 @@ void vm_event_sync_event(struct vcpu *v, bool value);
 
 void vm_event_reset_vmtrace(struct vcpu *v);
 
-#endif /* __ASM_X86_VM_EVENT_H__ */
+#endif /* ASM__X86__VM_EVENT_H */
diff --git a/xen/include/asm-generic/monitor.h 
b/xen/include/asm-generic/monitor.h
index 1ade289099..e53f0823cb 100644
--- a/xen/include/asm-generic/monitor.h
+++ b/xen/include/asm-generic/monitor.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef __ASM_GENERIC_MONITOR_H__
-#define __ASM_GENERIC_MONITOR_H__
+#ifndef ASM_GENERIC__MONITOR_H
+#define ASM_GENERIC__MONITOR_H
 
 #include <xen/errno.h>
 #include <xen/lib.h>
@@ -52,7 +52,7 @@ void arch_monitor_cleanup_domain(struct domain *d)
     /* No arch-specific domain cleanup on GENERIC. */
 }
 
-#endif /* __ASM_GENERIC_MONITOR_H__ */
+#endif /* ASM_GENERIC__MONITOR_H */
 
 /*
  * Local variables:
diff --git a/xen/include/asm-generic/vm_event.h 
b/xen/include/asm-generic/vm_event.h
index 620c7b971c..ff538b6ba4 100644
--- a/xen/include/asm-generic/vm_event.h
+++ b/xen/include/asm-generic/vm_event.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2015 Tamas K Lengyel (tamas@xxxxxxxxxxxxx)
  */
 
-#ifndef __ASM_GENERIC_VM_EVENT_H__
-#define __ASM_GENERIC_VM_EVENT_H__
+#ifndef ASM_GENERIC__VM_EVENT_H
+#define ASM_GENERIC__VM_EVENT_H
 
 #include <xen/sched.h>
 #include <public/vm_event.h>
@@ -52,4 +52,4 @@ void vm_event_reset_vmtrace(struct vcpu *v)
     /* Nothing to do. */
 }
 
-#endif /* __ASM_GENERIC_VM_EVENT_H__ */
+#endif /* ASM_GENERIC__VM_EVENT_H */
diff --git a/xen/include/public/vm_event.h b/xen/include/public/vm_event.h
index 3a86f0e208..6b861b06f0 100644
--- a/xen/include/public/vm_event.h
+++ b/xen/include/public/vm_event.h
@@ -7,8 +7,8 @@
  * Copyright (c) 2009 by Citrix Systems, Inc. (Patrick Colp)
  */
 
-#ifndef _XEN_PUBLIC_VM_EVENT_H
-#define _XEN_PUBLIC_VM_EVENT_H
+#ifndef PUBLIC__VM_EVENT_H
+#define PUBLIC__VM_EVENT_H
 
 #include "xen.h"
 
@@ -440,7 +440,7 @@ typedef struct vm_event_st {
 DEFINE_RING_TYPES(vm_event, vm_event_request_t, vm_event_response_t);
 
 #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
-#endif /* _XEN_PUBLIC_VM_EVENT_H */
+#endif /* PUBLIC__VM_EVENT_H */
 
 /*
  * Local variables:
diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h
index 87d93b31f6..2d0e472934 100644
--- a/xen/include/xen/mem_access.h
+++ b/xen/include/xen/mem_access.h
@@ -19,8 +19,8 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _XEN_MEM_ACCESS_H
-#define _XEN_MEM_ACCESS_H
+#ifndef XEN__MEM_ACCESS_H
+#define XEN__MEM_ACCESS_H
 
 #include <xen/types.h>
 #include <xen/mm.h>
@@ -105,7 +105,7 @@ int mem_access_memop(unsigned long cmd,
 }
 #endif /* CONFIG_MEM_ACCESS */
 
-#endif /* _XEN_MEM_ACCESS_H */
+#endif /* XEN__MEM_ACCESS_H */
 
 /*
  * Local variables:
diff --git a/xen/include/xen/monitor.h b/xen/include/xen/monitor.h
index 713d54f7c1..be301826c0 100644
--- a/xen/include/xen/monitor.h
+++ b/xen/include/xen/monitor.h
@@ -19,8 +19,8 @@
  * License along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __XEN_MONITOR_H__
-#define __XEN_MONITOR_H__
+#ifndef XEN__MONITOR_H
+#define XEN__MONITOR_H
 
 #include <public/vm_event.h>
 
@@ -32,4 +32,4 @@ void monitor_guest_request(void);
 
 int monitor_traps(struct vcpu *v, bool sync, vm_event_request_t *req);
 
-#endif /* __XEN_MONITOR_H__ */
+#endif /* XEN__MONITOR_H */
diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h
index 9a86358b42..3f2cb6fba8 100644
--- a/xen/include/xen/vm_event.h
+++ b/xen/include/xen/vm_event.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef __VM_EVENT_H__
-#define __VM_EVENT_H__
+#ifndef XEN__VM_EVENT_H
+#define XEN__VM_EVENT_H
 
 #include <xen/sched.h>
 #include <public/vm_event.h>
@@ -98,7 +98,7 @@ void vm_event_set_registers(struct vcpu *v, 
vm_event_response_t *rsp);
 
 void vm_event_monitor_next_interrupt(struct vcpu *v);
 
-#endif /* __VM_EVENT_H__ */
+#endif /* XEN__VM_EVENT_H */
 
 /*
  * Local variables:
-- 
2.34.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.