x86, platform, xen, kconfig: move kvmconfig functionality to a helper
Subsystems (2)
PATCH v2 1/3 x86, platform, xen, kconfig: move kvmconfig functionality to a helper
From: "Luis R. Rodriguez" <[email protected]>
This can then be used by other virtual configs.
--- arch/x86/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/Makefile +7 -3
@@ -250,11 +250,15 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=arch/x86/tools +define build-virtconfig +$(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 $(srctree)/arch/x86/configs/$(1) +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig +endef + 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 $(srctree)/arch/x86/configs/kvm_guest.config - $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + $(call build-virtconfig,kvm_guest.config) define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
Signature · 1 line
2.0.0.rc3.18.g00a5b79
PATCH v2 2/3 x86, platform, xen, kconfig: clarify kvmconfig is for kvm
From: "Luis R. Rodriguez" <[email protected]>
We'll be adding options for xen as well.
--- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Makefile +1 -1
@@ -273,5 +273,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' + echo ' kvmconfig - Enable additional options for kvm guest kernel support' endef
Signature · 1 line
2.0.0.rc3.18.g00a5b79
PATCH v2 2/3 x86, platform, xen, kconfig: clarify kvmconfig is for kvm
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
We'll be adding options for xen as well.
--- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Makefile +1 -1
@@ -273,5 +273,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' + echo ' kvmconfig - Enable additional options for kvm guest kernel support' endef
Signature · 1 line
2.0.0.rc3.18.g00a5b79
PATCH v2 3/3 x86, platform, xen, kconfig: add xen defconfig helper
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
--- arch/x86/Makefile | 5 +++++ arch/x86/configs/xen.config | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 arch/x86/configs/xen.config
arch/x86/Makefile +5 -0
@@ -260,6 +260,10 @@ PHONY += kvmconfig kvmconfig: $(call build-virtconfig,kvm_guest.config) +PHONY += xenconfig +xenconfig: + $(call build-virtconfig,xen.config) + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using'
@@ -274,4 +278,5 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' + echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' endef
arch/x86/configs/xen.config new file +36 -0
@@ -0,0 +1,36 @@ +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_TCG_XEN=m +CONFIG_XEN_WDT=m +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y
Signature · 1 line
2.0.0.rc3.18.g00a5b79
PATCH v2 3/3 x86, platform, xen, kconfig: add xen defconfig helper
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
--- arch/x86/Makefile | 5 +++++ arch/x86/configs/xen.config | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 arch/x86/configs/xen.config
arch/x86/Makefile +5 -0
@@ -260,6 +260,10 @@ PHONY += kvmconfig kvmconfig: $(call build-virtconfig,kvm_guest.config) +PHONY += xenconfig +xenconfig: + $(call build-virtconfig,xen.config) + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using'
@@ -274,4 +278,5 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' + echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' endef
arch/x86/configs/xen.config new file +36 -0
@@ -0,0 +1,36 @@ +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_TCG_XEN=m +CONFIG_XEN_WDT=m +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y
Signature · 1 line
2.0.0.rc3.18.g00a5b79
Re: [PATCH v2 3/3] x86, platform, xen, kconfig: add xen defconfig helper
Quoted 11 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
Both patches look good to me. If you want to add
please go ahead.
Quoted 87 lines
Cc Borislav Petkov <[email protected]>Cc Pekka Enberg <[email protected]>Cc David Rientjes <[email protected]>Cc Michal Marek <[email protected]>Cc Randy Dunlap <[email protected]>Cc David Vrabel <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>--- arch/x86/Makefile | 5 +++++ arch/x86/configs/xen.config | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 arch/x86/configs/xen.configarch/x86/Makefile +5
-0@@ -260,6 +260,10 @@ PHONY += kvmconfig kvmconfig: $(call build-virtconfig,kvm_guest.config) +PHONY += xenconfig +xenconfig: + $(call build-virtconfig,xen.config) + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using'@@ -274,4 +278,5 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' + echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' endefarch/x86/configs/xen.config new file +36
-0@@ -0,0 +1,36 @@ +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_TCG_XEN=m +CONFIG_XEN_WDT=m +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=ySignature · 1 line
2.0.0.rc3.18.g00a5b79
Re: [PATCH v2 3/3] x86, platform, xen, kconfig: add xen defconfig helper
In reply to Luis R. RodriguezQuoted 11 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
Both patches look good to me. If you want to add
please go ahead.
Quoted 87 lines
Cc Borislav Petkov <[email protected]>Cc Pekka Enberg <[email protected]>Cc David Rientjes <[email protected]>Cc Michal Marek <[email protected]>Cc Randy Dunlap <[email protected]>Cc David Vrabel <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>--- arch/x86/Makefile | 5 +++++ arch/x86/configs/xen.config | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 arch/x86/configs/xen.configarch/x86/Makefile +5
-0@@ -260,6 +260,10 @@ PHONY += kvmconfig kvmconfig: $(call build-virtconfig,kvm_guest.config) +PHONY += xenconfig +xenconfig: + $(call build-virtconfig,xen.config) + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using'@@ -274,4 +278,5 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' + echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' endefarch/x86/configs/xen.config new file +36
-0@@ -0,0 +1,36 @@ +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_TCG_XEN=m +CONFIG_XEN_WDT=m +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=ySignature · 1 line
2.0.0.rc3.18.g00a5b79
Re: [PATCH v2 3/3] x86, platform, xen, kconfig: add xen defconfig helper
In reply to Luis R. RodriguezQuoted 12 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
Quoted 14 lines
Cc Borislav Petkov <[email protected]>Cc Pekka Enberg <[email protected]>Cc David Rientjes <[email protected]>Cc Michal Marek <[email protected]>Cc Randy Dunlap <[email protected]>Cc David Vrabel <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>
Re: [PATCH v2 3/3] x86, platform, xen, kconfig: add xen defconfig helper
In reply to Luis R. RodriguezQuoted 12 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This lets you build a kernel which can support xen dom0 or xen guests by just using:
make xenconfig
Technically xen supports a dom0 kernel and also a guest kernel configuration but upon review with the xen team since we don't have many dom0 options its best to just combine these two into one.
Quoted 14 lines
Cc Borislav Petkov <[email protected]>Cc Pekka Enberg <[email protected]>Cc David Rientjes <[email protected]>Cc Michal Marek <[email protected]>Cc Randy Dunlap <[email protected]>Cc David Vrabel <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>
Quoted 5 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This can then be used by other virtual configs.
Signed-off-by Luis R. Rodriguez <[email protected]>
Quoted 10 lines · David Rientjes
Quoted 5 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This can then be used by other virtual configs.
Signed-off-by Luis R. Rodriguez <[email protected]>Suggested-by David Rientjes <[email protected]>Acked-by David Rientjes <[email protected]>
Folks this series is not yet merged. They all apply cleanly as-is on linux-next next-20140715 so I don't think a resend is required.
Just a friendly reminder.
Luis