[Xen-devel] [PATCH 12/12] arm: use plain bool in various headers

[Wei Liu <wei.liu2@xxxxxxxxxx>]

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/include/asm-arm/altp2m.h       | 4 ++--
 xen/include/asm-arm/arm64/insn.h   | 2 +-
 xen/include/asm-arm/domain.h       | 2 +-
 xen/include/asm-arm/guest_access.h | 2 +-
 xen/include/asm-arm/p2m.h          | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xen/include/asm-arm/altp2m.h b/xen/include/asm-arm/altp2m.h
index a87747a291..df50cb2f09 100644
--- a/xen/include/asm-arm/altp2m.h
+++ b/xen/include/asm-arm/altp2m.h
@@ -22,10 +22,10 @@
 #include <xen/sched.h>
 
 /* Alternate p2m on/off per domain */
-static inline bool_t altp2m_active(const struct domain *d)
+static inline bool altp2m_active(const struct domain *d)
 {
     /* Not implemented on ARM. */
-    return 0;
+    return false;
 }
 
 /* Alternate p2m VCPU */
diff --git a/xen/include/asm-arm/arm64/insn.h b/xen/include/asm-arm/arm64/insn.h
index 2ec4ad7c7f..4e0d364d41 100644
--- a/xen/include/asm-arm/arm64/insn.h
+++ b/xen/include/asm-arm/arm64/insn.h
@@ -55,7 +55,7 @@ enum aarch64_insn_branch_type {
 };
 
 #define        __AARCH64_INSN_FUNCS(abbr, mask, val)   \
-static always_inline bool_t aarch64_insn_is_##abbr(u32 code) \
+static always_inline bool aarch64_insn_is_##abbr(u32 code) \
 { return (code & (mask)) == (val); } \
 static always_inline u32 aarch64_insn_get_##abbr##_value(void) \
 { return (val); }
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 8dfc1d1ec2..b174c65080 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -280,7 +280,7 @@ struct arch_vcpu
 
     struct vtimer phys_timer;
     struct vtimer virt_timer;
-    bool_t vtimer_initialized;
+    bool   vtimer_initialized;
 }  __cacheline_aligned;
 
 void vcpu_show_execution_state(struct vcpu *);
diff --git a/xen/include/asm-arm/guest_access.h 
b/xen/include/asm-arm/guest_access.h
index cc73ce820f..6796801cfe 100644
--- a/xen/include/asm-arm/guest_access.h
+++ b/xen/include/asm-arm/guest_access.h
@@ -12,7 +12,7 @@ unsigned long raw_copy_from_guest(void *to, const void *from, 
unsigned len);
 unsigned long raw_clear_guest(void *to, unsigned len);
 
 int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf,
-                               uint32_t size, bool_t is_write);
+                               uint32_t size, bool is_write);
 
 #define __raw_copy_to_guest raw_copy_to_guest
 #define __raw_copy_from_guest raw_copy_from_guest
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index aa0d60ae3a..bc5bbf0db7 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -82,10 +82,10 @@ struct p2m_domain {
      * If true, and an access fault comes in and there is no vm_event listener,
      * pause domain. Otherwise, remove access restrictions.
      */
-    bool_t access_required;
+    bool access_required;
 
     /* Defines if mem_access is in use for the domain. */
-    bool_t mem_access_enabled;
+    bool mem_access_enabled;
 
     /*
      * Default P2M access type for each page in the the domain: new pages,
@@ -338,9 +338,9 @@ static inline int get_page_and_type(struct page_info *page,
 /* get host p2m table */
 #define p2m_get_hostp2m(d) (&(d)->arch.p2m)
 
-static inline bool_t p2m_vm_event_sanity_check(struct domain *d)
+static inline bool p2m_vm_event_sanity_check(struct domain *d)
 {
-    return 1;
+    return true;
 }
 
 /*
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel