From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 21 Sep 2018 15:54:52 +0000 (+0100)
Subject: x86: expose CONFIG_HVM
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3243
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bd9cc34e152addeacbbf44898125c7be00e7677;p=xen.git

x86: expose CONFIG_HVM

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

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ae1b707c19..548cbf990e 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -59,7 +59,17 @@ config PV_LINEAR_PT
          If unsure, say Y.
 
 config HVM
-	def_bool y
+	def_bool !PV_SHIM_EXCLUSIVE
+	prompt "HVM support"
+	---help---
+	  Interfaces to support HVM guests which require hardware
+	  support like Intel's VT-x or AMD's SVM. Note the hypervisor
+	  doesn't distinguish HVM or PVH guest types. PVH guest type
+	  is only a concept for end users.
+
+	  This option is needed if you want to run HVM or PVH guests.
+
+	  If unsure, say Y.
 
 config SHADOW_PAGING
         bool "Shadow Paging"