2 files changed, 19 insertions, 0 deletions

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 1a3c76505649..e7d05900efac 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -51,3 +51,8 @@ config XEN_DEBUG_FS
           Enable statistics output and various tuning options in debugfs.
           Enabling this option may incur a significant performance overhead.
 
+config XEN_PVH
+        bool "Support for running as a PVH guest"
+        depends on X86_64 && XEN && BROKEN
+        select XEN_PVHVM
+        def_bool n
diff --git a/include/xen/xen.h b/include/xen/xen.h
index a74d4362c4f8..0c0e3ef4c45d 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -29,4 +29,18 @@ extern enum xen_domain_type xen_domain_type;
 #define xen_initial_domain()    (0)
 #endif  /* CONFIG_XEN_DOM0 */
 
+#ifdef CONFIG_XEN_PVH
+/* This functionality exists only for x86. The XEN_PVHVM support exists
+ * only in x86 world - hence on ARM it will be always disabled.
+ * N.B. ARM guests are neither PV nor HVM nor PVHVM.
+ * It's a bit like PVH but is different also (it's further towards the H
+ * end of the spectrum than even PVH).
+ */
+#include <xen/features.h>
+#define xen_pvh_domain() (xen_pv_domain() && \
+                          xen_feature(XENFEAT_auto_translated_physmap) && \
+                          xen_have_vector_callback)
+#else
+#define xen_pvh_domain()        (0)
+#endif
 #endif  /* _XEN_XEN_H */