Commit 52e8ad9066b57510e600acc4bbc4455a81732c6c
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"Two changes:
- A Kconfig dependency fix/cleanup
- Introduce the 'make kvmconfig' KVM configuration helper utility
that turns the current .config into a KVM-bootable config. Useful
for debugging specific native kernel configs that have no KVM
config options enabled on VM setups."
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform: Make X86_GOLDFISH depend on X86_EXTENDED_PLATFORM
x86/platform: Add kvmconfig to the phony targets
x86, platform, kvm, kconfig: Turn existing .config's into KVM-capable configs
Showing 3 changed files Side-by-side Diff
arch/x86/Kconfig
| ... | ... | @@ -336,6 +336,7 @@ |
| 336 | 336 | |
| 337 | 337 | If you enable this option then you'll be able to select support |
| 338 | 338 | for the following (non-PC) 32 bit x86 platforms: |
| 339 | + Goldfish (Android emulator) | |
| 339 | 340 | AMD Elan |
| 340 | 341 | NUMAQ (IBM/Sequent) |
| 341 | 342 | RDC R-321x SoC |
| ... | ... | @@ -410,6 +411,7 @@ |
| 410 | 411 | config X86_GOLDFISH |
| 411 | 412 | bool "Goldfish (Virtual Platform)" |
| 412 | 413 | depends on X86_32 |
| 414 | + depends on X86_EXTENDED_PLATFORM | |
| 413 | 415 | ---help--- |
| 414 | 416 | Enable support for the Goldfish virtual platform used primarily |
| 415 | 417 | for Android development. Unless you are building for the Android |
arch/x86/Makefile
| ... | ... | @@ -220,6 +220,12 @@ |
| 220 | 220 | $(Q)$(MAKE) $(clean)=$(boot) |
| 221 | 221 | $(Q)$(MAKE) $(clean)=arch/x86/tools |
| 222 | 222 | |
| 223 | +PHONY += kvmconfig | |
| 224 | +kvmconfig: | |
| 225 | + $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) | |
| 226 | + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config | |
| 227 | + $(Q)yes "" | $(MAKE) oldconfig | |
| 228 | + | |
| 223 | 229 | define archhelp |
| 224 | 230 | echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' |
| 225 | 231 | echo ' install - Install kernel using' |
| ... | ... | @@ -233,5 +239,6 @@ |
| 233 | 239 | echo ' bzdisk/fdimage*/isoimage also accept:' |
| 234 | 240 | echo ' FDARGS="..." arguments for the booted kernel' |
| 235 | 241 | echo ' FDINITRD=file initrd for the booted kernel' |
| 242 | + echo ' kvmconfig - Enable additional options for guest kernel support' | |
| 236 | 243 | endef |
arch/x86/configs/kvm_guest.config
| 1 | +CONFIG_NET=y | |
| 2 | +CONFIG_NET_CORE=y | |
| 3 | +CONFIG_NETDEVICES=y | |
| 4 | +CONFIG_BLOCK=y | |
| 5 | +CONFIG_BLK_DEV=y | |
| 6 | +CONFIG_NETWORK_FILESYSTEMS=y | |
| 7 | +CONFIG_INET=y | |
| 8 | +CONFIG_TTY=y | |
| 9 | +CONFIG_SERIAL_8250=y | |
| 10 | +CONFIG_SERIAL_8250_CONSOLE=y | |
| 11 | +CONFIG_IP_PNP=y | |
| 12 | +CONFIG_IP_PNP_DHCP=y | |
| 13 | +CONFIG_BINFMT_ELF=y | |
| 14 | +CONFIG_PCI=y | |
| 15 | +CONFIG_PCI_MSI=y | |
| 16 | +CONFIG_DEBUG_KERNEL=y | |
| 17 | +CONFIG_VIRTUALIZATION=y | |
| 18 | +CONFIG_HYPERVISOR_GUEST=y | |
| 19 | +CONFIG_PARAVIRT=y | |
| 20 | +CONFIG_KVM_GUEST=y | |
| 21 | +CONFIG_VIRTIO=y | |
| 22 | +CONFIG_VIRTIO_PCI=y | |
| 23 | +CONFIG_VIRTIO_BLK=y | |
| 24 | +CONFIG_VIRTIO_CONSOLE=y | |
| 25 | +CONFIG_VIRTIO_NET=y | |
| 26 | +CONFIG_9P_FS=y | |
| 27 | +CONFIG_NET_9P=y | |
| 28 | +CONFIG_NET_9P_VIRTIO=y |