From: Avi Kivity Add a config entry and a Makefile for KVM. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton --- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/kvm/Kconfig | 18 ++++++++++++++++++ drivers/kvm/Makefile | 6 ++++++ 4 files changed, 27 insertions(+) diff -puN drivers/Kconfig~kvm-plumbing drivers/Kconfig --- a/drivers/Kconfig~kvm-plumbing +++ a/drivers/Kconfig @@ -80,4 +80,6 @@ source "drivers/dma/Kconfig" source "drivers/auxdisplay/Kconfig" +source "drivers/kvm/Kconfig" + endmenu diff -puN drivers/Makefile~kvm-plumbing drivers/Makefile --- a/drivers/Makefile~kvm-plumbing +++ a/drivers/Makefile @@ -77,4 +77,5 @@ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ obj-$(CONFIG_GENERIC_TIME) += clocksource/ obj-$(CONFIG_DMA_ENGINE) += dma/ +obj-$(CONFIG_KVM) += kvm/ obj-y += auxdisplay/ diff -puN /dev/null drivers/kvm/Kconfig --- /dev/null +++ a/drivers/kvm/Kconfig @@ -0,0 +1,18 @@ +# +# KVM configuration +# +config KVM + tristate "Kernel-based Virtual Machine (KVM) support" + depends on X86 && EXPERIMENTAL + ---help--- + Support hosting fully virtualized guest machines using hardware + virtualization extensions. You will need a fairly recent Intel + processor equipped with VT extensions. + + This module provides access to the hardware capabilities through + a character device node named /dev/kvm. + + To compile this as a module, choose M here: the module + will be called kvm. + + If unsure, say N. diff -puN /dev/null drivers/kvm/Makefile --- /dev/null +++ a/drivers/kvm/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for Kernel-based Virtual Machine module +# + +kvm-objs := kvm_main.o mmu.o x86_emulate.o +obj-$(CONFIG_KVM) += kvm.o _