From: "Luis R. Rodriguez" <[email protected]>

This lets you use:

   make virtconfig

to merge you current kernel configuration with options to
enable both kvm and xen (dom0 and guest) requirements.

Cc: Borislav Petkov <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: Randy Dunlap <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: David Vrabel <[email protected]>
Cc: Ian Campbell <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: [email protected]
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
 arch/x86/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 9db34e2..f2df13e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -262,6 +262,11 @@ xenconfig:
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O 
$(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/xen.config
        $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 
+PHONY += virtconfig
+virtconfig:
+       $(Q)$(MAKE) kvmconfig
+       $(Q)$(MAKE) xenconfig
+
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'
   echo  '  install      - Install kernel using'
@@ -277,4 +282,5 @@ define archhelp
   echo  '                  FDINITRD=file initrd for the booted kernel'
   echo  '  kvmconfig   - Enable additional options for kvm guest kernel 
support'
   echo  '  xenconfig    - Enable additional options for xen dom0 and guest 
kernel support'
+  echo  '  virtconfig   - Enable additional options for kvm and xen kernel 
support'
 endef
-- 
2.0.0.rc3.18.g00a5b79

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to