diff options
author | Isaku Yamahata <yamahata@valinux.co.jp> | 2008-10-16 22:18:11 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:10:06 -0400 |
commit | ba9cc328bfeec3ec5fad3356dd53bc0c1ff506b0 (patch) | |
tree | 710cf8b9fec87c849e7396ad1317729445eca54c /arch | |
parent | 91834e685d2059b69c4e8e3d707f35d94438de94 (diff) |
ia64/pv_ops: update Kconfig for paravirtualized guest and xen.
introduce CONFIG_PARAVIRT_GUEST, CONFIG_PARAVIRT for
paravirtualized guest.
introduce CONFIG_XEN, CONFIG_IA64_XEN_GUEST for xen.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 32 | ||||
-rw-r--r-- | arch/ia64/xen/Kconfig | 26 |
2 files changed, 58 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 3b7aa38254a8..9318dee22537 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -108,6 +108,33 @@ config AUDIT_ARCH | |||
108 | bool | 108 | bool |
109 | default y | 109 | default y |
110 | 110 | ||
111 | menuconfig PARAVIRT_GUEST | ||
112 | bool "Paravirtualized guest support" | ||
113 | help | ||
114 | Say Y here to get to see options related to running Linux under | ||
115 | various hypervisors. This option alone does not add any kernel code. | ||
116 | |||
117 | If you say N, all options in this submenu will be skipped and disabled. | ||
118 | |||
119 | if PARAVIRT_GUEST | ||
120 | |||
121 | config PARAVIRT | ||
122 | bool "Enable paravirtualization code" | ||
123 | depends on PARAVIRT_GUEST | ||
124 | default y | ||
125 | bool | ||
126 | default y | ||
127 | help | ||
128 | This changes the kernel so it can modify itself when it is run | ||
129 | under a hypervisor, potentially improving performance significantly | ||
130 | over full virtualization. However, when run without a hypervisor | ||
131 | the kernel is theoretically slower and slightly larger. | ||
132 | |||
133 | |||
134 | source "arch/ia64/xen/Kconfig" | ||
135 | |||
136 | endif | ||
137 | |||
111 | choice | 138 | choice |
112 | prompt "System type" | 139 | prompt "System type" |
113 | default IA64_GENERIC | 140 | default IA64_GENERIC |
@@ -129,6 +156,7 @@ config IA64_GENERIC | |||
129 | SGI-SN2 For SGI Altix systems | 156 | SGI-SN2 For SGI Altix systems |
130 | SGI-UV For SGI UV systems | 157 | SGI-UV For SGI UV systems |
131 | Ski-simulator For the HP simulator <http://www.hpl.hp.com/research/linux/ski/> | 158 | Ski-simulator For the HP simulator <http://www.hpl.hp.com/research/linux/ski/> |
159 | Xen-domU For xen domU system | ||
132 | 160 | ||
133 | If you don't know what to do, choose "generic". | 161 | If you don't know what to do, choose "generic". |
134 | 162 | ||
@@ -179,6 +207,10 @@ config IA64_HP_SIM | |||
179 | bool "Ski-simulator" | 207 | bool "Ski-simulator" |
180 | select SWIOTLB | 208 | select SWIOTLB |
181 | 209 | ||
210 | config IA64_XEN_GUEST | ||
211 | bool "Xen guest" | ||
212 | depends on XEN | ||
213 | |||
182 | endchoice | 214 | endchoice |
183 | 215 | ||
184 | choice | 216 | choice |
diff --git a/arch/ia64/xen/Kconfig b/arch/ia64/xen/Kconfig new file mode 100644 index 000000000000..f1683a20275b --- /dev/null +++ b/arch/ia64/xen/Kconfig | |||
@@ -0,0 +1,26 @@ | |||
1 | # | ||
2 | # This Kconfig describes xen/ia64 options | ||
3 | # | ||
4 | |||
5 | config XEN | ||
6 | bool "Xen hypervisor support" | ||
7 | default y | ||
8 | depends on PARAVIRT && MCKINLEY && IA64_PAGE_SIZE_16KB && EXPERIMENTAL | ||
9 | select XEN_XENCOMM | ||
10 | select NO_IDLE_HZ | ||
11 | |||
12 | # those are required to save/restore. | ||
13 | select ARCH_SUSPEND_POSSIBLE | ||
14 | select SUSPEND | ||
15 | select PM_SLEEP | ||
16 | help | ||
17 | Enable Xen hypervisor support. Resulting kernel runs | ||
18 | both as a guest OS on Xen and natively on hardware. | ||
19 | |||
20 | config XEN_XENCOMM | ||
21 | depends on XEN | ||
22 | bool | ||
23 | |||
24 | config NO_IDLE_HZ | ||
25 | depends on XEN | ||
26 | bool | ||