Commit 69327047 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-uapi' 

More cleanups of KVM's main header:

* remove thoroughly obsolete APIs

* move architecture-dependent stuff to uapi/asm/kvm.h

* small cleanups to __KVM_HAVE_* symbols
parents 04737196 db7d6fbc

arch/arm64/include/uapi/asm/kvm.h

+9 −6
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ 
#include <asm/ptrace.h>

#include <asm/sve_context.h>



#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM

#define __KVM_HAVE_VCPU_EVENTS



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -76,10 +74,10 @@ struct kvm_regs { 


/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */

#define KVM_ARM_DEVICE_TYPE_SHIFT	0

#define KVM_ARM_DEVICE_TYPE_MASK	GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

#define KVM_ARM_DEVICE_TYPE_MASK	__GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

						  KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_ID_SHIFT		16

#define KVM_ARM_DEVICE_ID_MASK		GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

#define KVM_ARM_DEVICE_ID_MASK		__GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

						  KVM_ARM_DEVICE_ID_SHIFT)



/* Supported device IDs */
@@ -162,6 +160,11 @@ struct kvm_sync_regs { 
	__u64 device_irq_level;

};



/* Bits for run->s.regs.device_irq_level */

#define KVM_ARM_DEV_EL1_VTIMER		(1 << 0)

#define KVM_ARM_DEV_EL1_PTIMER		(1 << 1)

#define KVM_ARM_DEV_PMU			(1 << 2)



/*

 * PMU filter structure. Describe a range of events with a particular

 * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.

arch/arm64/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ menuconfig KVM 
	select HAVE_KVM_IRQ_ROUTING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	select HAVE_KVM_READONLY_MEM

	select HAVE_KVM_VCPU_RUN_PID_CHANGE

	select SCHED_INFO

	select GUEST_PERF_EVENTS if PERF_EVENTS

arch/loongarch/include/uapi/asm/kvm.h

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * Some parts derived from the x86 version of this file.

 */



#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET	1

#define KVM_DIRTY_LOG_PAGE_OFFSET	64

arch/loongarch/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config KVM 
	select KVM_GENERIC_HARDWARE_ENABLING

	select KVM_GENERIC_MMU_NOTIFIER

	select KVM_MMIO

	select HAVE_KVM_READONLY_MEM

	select KVM_XFER_TO_GUEST_WORK

	help

	  Support hosting virtualized guest machines using

arch/mips/include/uapi/asm/kvm.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
 * Some parts derived from the x86 version of this file.

 */



#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



/*