Commit d3dccee1 authored by Alexander Graf's avatar Alexander Graf
Browse files

Update Linux kernel headers 



Based on kvm.git a843fac (next) plus dfdebc24 (master).

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent b8dec144

linux-headers/asm-powerpc/kvm.h

+5 −1
Original line number Diff line number Diff line
@@ -114,7 +114,10 @@ struct kvm_regs { 
/* Embedded Floating Point (SPE) -- IVOR32-34 if KVM_SREGS_E_IVOR */

#define KVM_SREGS_E_SPE			(1 << 9)



/* External Proxy (EXP) -- EPR */

/*

 * DEPRECATED! USE ONE_REG FOR THIS ONE!

 * External Proxy (EXP) -- EPR

 */

#define KVM_SREGS_EXP			(1 << 10)



/* External PID (E.PD) -- EPSC/EPLC */
@@ -412,5 +415,6 @@ struct kvm_get_htab_header { 
#define KVM_REG_PPC_VPA_DTL	(KVM_REG_PPC | KVM_REG_SIZE_U128 | 0x84)



#define KVM_REG_PPC_EPCR	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x85)

#define KVM_REG_PPC_EPR		(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0x86)



#endif /* __LINUX_KVM_POWERPC_H */

linux-headers/linux/kvm.h

+27 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ struct kvm_pit_config { 
#define KVM_EXIT_PAPR_HCALL	  19

#define KVM_EXIT_S390_UCONTROL	  20

#define KVM_EXIT_WATCHDOG         21

#define KVM_EXIT_S390_TSCH        22

#define KVM_EXIT_EPR              23



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */
@@ -285,6 +287,19 @@ struct kvm_run { 
			__u64 ret;

			__u64 args[9];

		} papr_hcall;

		/* KVM_EXIT_S390_TSCH */

		struct {

			__u16 subchannel_id;

			__u16 subchannel_nr;

			__u32 io_int_parm;

			__u32 io_int_word;

			__u32 ipb;

			__u8 dequeued;

		} s390_tsch;

		/* KVM_EXIT_EPR */

		struct {

			__u32 epr;

		} epr;

		/* Fix the size of the union. */

		char padding[256];

	};
@@ -397,10 +412,20 @@ struct kvm_s390_psw { 
#define KVM_S390_PROGRAM_INT		0xfffe0001u

#define KVM_S390_SIGP_SET_PREFIX	0xfffe0002u

#define KVM_S390_RESTART		0xfffe0003u

#define KVM_S390_MCHK			0xfffe1000u

#define KVM_S390_INT_VIRTIO		0xffff2603u

#define KVM_S390_INT_SERVICE		0xffff2401u

#define KVM_S390_INT_EMERGENCY		0xffff1201u

#define KVM_S390_INT_EXTERNAL_CALL	0xffff1202u

/* Anything below 0xfffe0000u is taken by INT_IO */

#define KVM_S390_INT_IO(ai,cssid,ssid,schid)   \

	(((schid)) |			       \

	 ((ssid) << 16) |		       \

	 ((cssid) << 18) |		       \

	 ((ai) << 26))

#define KVM_S390_INT_IO_MIN		0x00000000u

#define KVM_S390_INT_IO_MAX		0xfffdffffu





struct kvm_s390_interrupt {

	__u32 type;
@@ -635,6 +660,8 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_IRQFD_RESAMPLE 82

#define KVM_CAP_PPC_BOOKE_WATCHDOG 83

#define KVM_CAP_PPC_HTAB_FD 84

#define KVM_CAP_S390_CSS_SUPPORT 85

#define KVM_CAP_PPC_EPR 86



#ifdef KVM_CAP_IRQ_ROUTING