From: Rusty Russell This is the Kconfig and Makefile to allow lguest to actually be compiled. Signed-off-by: Rusty Russell Cc: Andi Kleen Signed-off-by: Andrew Morton --- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/lguest/Kconfig | 20 ++++++++++++++++++++ drivers/lguest/Makefile | 7 +++++++ 4 files changed, 30 insertions(+) diff -puN drivers/Kconfig~lguest-the-makefile-and-kconfig drivers/Kconfig --- a/drivers/Kconfig~lguest-the-makefile-and-kconfig +++ a/drivers/Kconfig @@ -89,4 +89,6 @@ source "drivers/auxdisplay/Kconfig" source "drivers/kvm/Kconfig" source "drivers/uio/Kconfig" + +source "drivers/lguest/Kconfig" endmenu diff -puN drivers/Makefile~lguest-the-makefile-and-kconfig drivers/Makefile --- a/drivers/Makefile~lguest-the-makefile-and-kconfig +++ a/drivers/Makefile @@ -74,6 +74,7 @@ obj-$(CONFIG_ISDN) += isdn/ obj-$(CONFIG_EDAC) += edac/ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ +obj-$(CONFIG_LGUEST_GUEST) += lguest/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_NEW_LEDS) += leds/ diff -puN /dev/null drivers/lguest/Kconfig --- /dev/null +++ a/drivers/lguest/Kconfig @@ -0,0 +1,20 @@ +config LGUEST + tristate "Linux hypervisor example code" + depends on X86 && PARAVIRT && NET && EXPERIMENTAL && !X86_PAE + select LGUEST_GUEST + select HVC_DRIVER + ---help--- + This is a very simple module which allows you to run + multiple instances of the same Linux kernel, using the + "lguest" command found in the Documentation/lguest directory. + Note that "lguest" is pronounced to rhyme with "fell quest", + not "rustyvisor". See Documentation/lguest/lguest.txt. + + If unsure, say N. If curious, say M. If masochistic, say Y. + +config LGUEST_GUEST + bool + help + The guest needs code built-in, even if the host has lguest + support as a module. The drivers are tiny, so we build them + in too. diff -puN /dev/null drivers/lguest/Makefile --- /dev/null +++ a/drivers/lguest/Makefile @@ -0,0 +1,7 @@ +# Guest requires the paravirt_ops replacement and the bus driver. +obj-$(CONFIG_LGUEST_GUEST) += lguest.o lguest_asm.o lguest_bus.o + +# Host requires the other files, which can be a module. +obj-$(CONFIG_LGUEST) += lg.o +lg-objs := core.o hypercalls.o page_tables.o interrupts_and_traps.o \ + segments.o io.o lguest_user.o switcher.o _