x86/monitor.c: use plain bool

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Razvan Cojocaru <rcojocaru@bitdefender.com>

diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
index 764195a7d1c1f34ce491e84c2192b9fb3805e2b8..706454f23c5e166fbdf3f7cdc737dd6bbca6cdaa 100644 (file)
--- a/xen/arch/x86/monitor.c
+++ b/xen/arch/x86/monitor.c
@@ -104,17 +104,17 @@ static int monitor_disable_msr(struct domain *d, u32 msr)
     return 0;
 }
 
-bool_t monitored_msr(const struct domain *d, u32 msr)
+bool monitored_msr(const struct domain *d, u32 msr)
 {
     const unsigned long *bitmap;
 
     if ( !d->arch.monitor.msr_bitmap )
-        return 0;
+        return false;
 
     bitmap = monitor_bitmap_for_msr(d, &msr);
 
     if ( !bitmap )
-        return 0;
+        return false;
 
     return test_bit(msr, bitmap);
 }
@@ -123,14 +123,14 @@ int arch_monitor_domctl_event(struct domain *d,
                               struct xen_domctl_monitor_op *mop)
 {
     struct arch_domain *ad = &d->arch;
-    bool_t requested_status = (XEN_DOMCTL_MONITOR_OP_ENABLE == mop->op);
+    bool requested_status = (XEN_DOMCTL_MONITOR_OP_ENABLE == mop->op);
 
     switch ( mop->event )
     {
     case XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG:
     {
         unsigned int ctrlreg_bitmask;
-        bool_t old_status;
+        bool old_status;
 
         if ( unlikely(mop->u.mov_to_cr.index >=
                       ARRAY_SIZE(ad->monitor.write_ctrlreg_mask)) )
@@ -183,7 +183,7 @@ int arch_monitor_domctl_event(struct domain *d,
 
     case XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR:
     {
-        bool_t old_status;
+        bool old_status;
         int rc;
         u32 msr = mop->u.mov_to_msr.msr;
 
@@ -209,7 +209,7 @@ int arch_monitor_domctl_event(struct domain *d,
 
     case XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP:
     {
-        bool_t old_status = ad->monitor.singlestep_enabled;
+        bool old_status = ad->monitor.singlestep_enabled;
 
         if ( unlikely(old_status == requested_status) )
             return -EEXIST;
@@ -243,7 +243,7 @@ int arch_monitor_domctl_event(struct domain *d,
 
     case XEN_DOMCTL_MONITOR_EVENT_SOFTWARE_BREAKPOINT:
     {
-        bool_t old_status = ad->monitor.software_breakpoint_enabled;
+        bool old_status = ad->monitor.software_breakpoint_enabled;
 
         if ( unlikely(old_status == requested_status) )
             return -EEXIST;
@@ -256,7 +256,7 @@ int arch_monitor_domctl_event(struct domain *d,
 
     case XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION:
     {
-        bool_t old_status = ad->monitor.debug_exception_enabled;
+        bool old_status = ad->monitor.debug_exception_enabled;
 
         if ( unlikely(old_status == requested_status) )
             return -EEXIST;
@@ -272,7 +272,7 @@ int arch_monitor_domctl_event(struct domain *d,
 
     case XEN_DOMCTL_MONITOR_EVENT_CPUID:
     {
-        bool_t old_status = ad->monitor.cpuid_enabled;
+        bool old_status = ad->monitor.cpuid_enabled;
 
         if ( unlikely(old_status == requested_status) )
             return -EEXIST;

diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h
index 81a133b679fb260d0714dbbf459abf96fc513f03..c5c323b6aa518409611c2f7a09efcd573cd8db25 100644 (file)
--- a/xen/include/asm-x86/monitor.h
+++ b/xen/include/asm-x86/monitor.h
@@ -96,6 +96,6 @@ int arch_monitor_init_domain(struct domain *d);
 
 void arch_monitor_cleanup_domain(struct domain *d);
 
-bool_t monitored_msr(const struct domain *d, u32 msr);
+bool monitored_msr(const struct domain *d, u32 msr);
 
 #endif /* __ASM_X86_MONITOR_H__ */