Commit 460023a5 authored Dec 26, 2018 by Linus Torvalds

Merge tag 'for-linus-4.21-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen updates from Juergen Gross:
 "Xen features and fixes:

   - a series to enable KVM guests to be booted by qemu via the Xen PVH
     boot entry for speeding up KVM guest tests

   - a series for a common driver to be used by Xen PV frontends (right
     now drm and sound)

   - two other fixes in Xen related code"

* tag 'for-linus-4.21-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  ALSA: xen-front: Use Xen common shared buffer implementation
  drm/xen-front: Use Xen common shared buffer implementation
  xen: Introduce shared buffer helpers for page directory...
  xen/pciback: Check dev_data before using it
  kprobes/x86/xen: blacklist non-attachable xen interrupt functions
  KVM: x86: Allow Qemu/KVM to use PVH entry point
  xen/pvh: Add memory map pointer to hvm_start_info struct
  xen/pvh: Move Xen code for getting mem map via hcall out of common file
  xen/pvh: Move Xen specific PVH VM initialization out of common file
  xen/pvh: Create a new file for Xen specific PVH code
  xen/pvh: Move PVH entry code out of Xen specific tree
  xen/pvh: Split CONFIG_XEN_PVH into CONFIG_PVH and CONFIG_XEN_PVH

parents a5f2bd47 58f9d806

MAINTAINERS

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16590,6 +16590,7 @@ L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
	S: Supported		S: Supported
	F: arch/x86/xen/		F: arch/x86/xen/
			F: arch/x86/platform/pvh/
	F: drivers//xen-front.c		F: drivers//xen-front.c
	F: drivers/xen/		F: drivers/xen/
	F: arch/x86/include/asm/xen/		F: arch/x86/include/asm/xen/

arch/x86/Kbuild

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,8 @@ obj-$(CONFIG_KVM) += kvm/
	# Xen paravirtualization support		# Xen paravirtualization support
	obj-$(CONFIG_XEN) += xen/		obj-$(CONFIG_XEN) += xen/

			obj-$(CONFIG_PVH) += platform/pvh/

	# Hyper-V paravirtualization support		# Hyper-V paravirtualization support
	obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/		obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/

arch/x86/Kconfig

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -796,6 +796,12 @@ config KVM_GUEST
	underlying device model, the host provides the guest with		underlying device model, the host provides the guest with
	timing infrastructure such as time of day, and system time		timing infrastructure such as time of day, and system time

			config PVH
			bool "Support for running PVH guests"
			---help---
			This option enables the PVH entry point for guest virtual machines
			as specified in the x86/HVM direct boot ABI.

	config KVM_DEBUG_FS		config KVM_DEBUG_FS
	bool "Enable debug information for KVM Guests in debugfs"		bool "Enable debug information for KVM Guests in debugfs"
	depends on KVM_GUEST && DEBUG_FS		depends on KVM_GUEST && DEBUG_FS

arch/x86/kernel/head_64.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -386,7 +386,7 @@ NEXT_PAGE(early_dynamic_pgts)

	.data		.data

	#if defined(CONFIG_XEN_PV) \|\| defined(CONFIG_XEN_PVH)		#if defined(CONFIG_XEN_PV) \|\| defined(CONFIG_PVH)
	NEXT_PGD_PAGE(init_top_pgt)		NEXT_PGD_PAGE(init_top_pgt)
	.quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC		.quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC
	.org init_top_pgt + L4_PAGE_OFFSET*8, 0		.org init_top_pgt + L4_PAGE_OFFSET*8, 0

arch/x86/platform/pvh/Makefile

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			# SPDX-License-Identifier: GPL-2.0
			OBJECT_FILES_NON_STANDARD_head.o := y

			obj-$(CONFIG_PVH) += enlighten.o
			obj-$(CONFIG_PVH) += head.o