xen/control: Introduce xen_has_pv_shutdown_handler

While x86 only register PV shutdown handler for PV guests. ARM guests
are always using HVM and requires the PV shutdown handler.

diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 2d92b691e3c4da86855aa02405e9084c0084ca19..eae0ad41d189fd2d1bae0b711bb8f686230a15b4 100644 (file)
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -397,7 +397,7 @@ xctrl_attach(device_t dev)
        xctrl->xctrl_watch.callback_data = (uintptr_t)xctrl;
        xs_register_watch(&xctrl->xctrl_watch);
 
-       if (xen_pv_domain())
+       if (xen_has_pv_shutdown_handler())
                EVENTHANDLER_REGISTER(shutdown_final, xen_pv_shutdown_final, NULL,
                                      SHUTDOWN_PRI_LAST);
 

diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h
index 8f42e862c07978f9cf2216d77643801a5d55a60b..27074f5c1486de66018f469dcec22d41e0b38b55 100644 (file)
--- a/sys/x86/include/xen/xen-os.h
+++ b/sys/x86/include/xen/xen-os.h
@@ -81,6 +81,13 @@ cpu_to_vcpu_id(u_int cpuid)
 
 #define atomic_readandclear_xen_ulong(p) atomic_readandclear_long(p)
 
+static inline bool
+xen_has_pv_shutdown_handler(void)
+{
+
+       return (xen_pv_domain());
+}
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* _MACHINE_X86_XEN_XEN_OS_H_ */