[tip:tools/kvm] kvm tools: Fix 'make kvmconfig'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  ccdac9244872c7147023c968aaf67acd010cb5a8
Gitweb:     http://git.kernel.org/tip/ccdac9244872c7147023c968aaf67acd010cb5a8
Author:     Sasha Levin <levinsasha928@xxxxxxxxx>
AuthorDate: Fri, 16 Dec 2011 10:58:41 +0200
Committer:  Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sat, 17 Dec 2011 09:36:45 +0200

kvm tools: Fix 'make kvmconfig'

Set features which depend on the config we select to make 'make kvmconfig'
non-interactive.

Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
 arch/x86/Kconfig         |    1 +
 scripts/kconfig/Makefile |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8f74dc0..d553840 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -522,6 +522,7 @@ config KVMTOOL_TEST_ENABLE
 	select DEBUG_KERNEL
 	select KGDB
 	select KGDB_SERIAL_CONSOLE
+	select VIRTUALIZATION
 	select VIRTIO
 	select VIRTIO_RING
 	select VIRTIO_PCI
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 65580c2..58a4259 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -35,6 +35,7 @@ silentoldconfig: $(obj)/conf
 
 kvmconfig:
 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/config -e KVMTOOL_TEST_ENABLE
+	$(Q)yes "" | make oldconfig > /dev/null
 	@echo 'Kernel configuration modified to run as KVM guest.'
 
 # if no path is given, then use src directory to find file
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux