Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252b95c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.11-rc0-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 from Boris Ostrovsky adding support for booting Linux as
     Xen PVH guest

   - a series from Juergen Gross streamlining the xenbus driver

   - a series from Paul Durrant adding support for the new device model
     hypercall

   - several small corrections"

* tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/privcmd: add IOCTL_PRIVCMD_RESTRICT
  xen/privcmd: Add IOCTL_PRIVCMD_DM_OP
  xen/privcmd: return -ENOTTY for unimplemented IOCTLs
  xen: optimize xenbus driver for multiple concurrent xenstore accesses
  xen: modify xenstore watch event interface
  xen: clean up xenbus internal headers
  xenbus: Neaten xenbus_va_dev_error
  xen/pvh: Use Xen's emergency_restart op for PVH guests
  xen/pvh: Enable CPU hotplug
  xen/pvh: PVH guests always have PV devices
  xen/pvh: Initialize grant table for PVH guests
  xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI
  xen/pvh: Bootstrap PVH guest
  xen/pvh: Import PVH-related Xen public interfaces
  xen/x86: Remove PVH support
  x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C
  xen/manage: correct return value check on xenbus_scanf()
  x86/xen: Fix APIC id mismatch warning on Intel
  xen/netback: set default upper limit of tx/rx queues to 8
  xen/netfront: set default upper limit of tx/rx queues to 8
parents b8989bcc 4610d240

arch/arm/xen/enlighten.c

+1 −0
Original line number Diff line number Diff line
@@ -457,4 +457,5 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op); 
EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);

EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);

EXPORT_SYMBOL_GPL(HYPERVISOR_dm_op);

EXPORT_SYMBOL_GPL(privcmd_call);

arch/arm/xen/hypercall.S

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ HYPERCALL1(tmem_op); 
HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

HYPERCALL3(dm_op);



ENTRY(privcmd_call)

	stmdb sp!, {r4}

arch/arm64/xen/hypercall.S

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ HYPERCALL1(tmem_op); 
HYPERCALL1(platform_op_raw);

HYPERCALL2(multicall);

HYPERCALL2(vm_assist);

HYPERCALL3(dm_op);



ENTRY(privcmd_call)

	mov x16, x0

arch/x86/include/asm/xen/hypercall.h

+7 −0
Original line number Diff line number Diff line
@@ -472,6 +472,13 @@ HYPERVISOR_xenpmu_op(unsigned int op, void *arg) 
	return _hypercall2(int, xenpmu_op, op, arg);

}



static inline int

HYPERVISOR_dm_op(

	domid_t dom, unsigned int nr_bufs, void *bufs)

{

	return _hypercall3(int, dm_op, dom, nr_bufs, bufs);

}



static inline void

MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)

{

arch/x86/xen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -53,5 +53,5 @@ config XEN_DEBUG_FS 


config XEN_PVH

	bool "Support for running as a PVH guest"

	depends on X86_64 && XEN && XEN_PVHVM

	depends on XEN && XEN_PVHVM && ACPI

	def_bool n