Commit 52e8ad90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1982269a cb7b8023

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ config X86_EXTENDED_PLATFORM 


	  If you enable this option then you'll be able to select support

	  for the following (non-PC) 32 bit x86 platforms:

		Goldfish (Android emulator)

		AMD Elan

		NUMAQ (IBM/Sequent)

		RDC R-321x SoC
@@ -410,6 +411,7 @@ config X86_UV 
config X86_GOLDFISH

       bool "Goldfish (Virtual Platform)"

       depends on X86_32

       depends on X86_EXTENDED_PLATFORM

       ---help---

	 Enable support for the Goldfish virtual platform used primarily

	 for Android development. Unless you are building for the Android

arch/x86/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -220,6 +220,12 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=arch/x86/tools



PHONY += kvmconfig

kvmconfig:

	$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config

	$(Q)yes "" | $(MAKE) oldconfig



define archhelp

  echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'

  echo  '  install      - Install kernel using'
@@ -233,4 +239,5 @@ define archhelp 
  echo  '                  bzdisk/fdimage*/isoimage also accept:'

  echo  '                  FDARGS="..."  arguments for the booted kernel'

  echo  '                  FDINITRD=file initrd for the booted kernel'

  echo  '  kvmconfig	- Enable additional options for guest kernel support'

endef

arch/x86/configs/kvm_guest.config

0 → 100644
+28 −0
Original line number Diff line number Diff line 
CONFIG_NET=y

CONFIG_NET_CORE=y

CONFIG_NETDEVICES=y

CONFIG_BLOCK=y

CONFIG_BLK_DEV=y

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_INET=y

CONFIG_TTY=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_BINFMT_ELF=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_DEBUG_KERNEL=y

CONFIG_VIRTUALIZATION=y

CONFIG_HYPERVISOR_GUEST=y

CONFIG_PARAVIRT=y

CONFIG_KVM_GUEST=y

CONFIG_VIRTIO=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BLK=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_VIRTIO_NET=y

CONFIG_9P_FS=y

CONFIG_NET_9P=y

CONFIG_NET_9P_VIRTIO=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE