Commit 76eb98d5 authored by Jens Freimann's avatar Jens Freimann Committed by Cornelia Huck
Browse files

linux-headers: update 



Sync linux-headers with kvm/next (87c00572ba05aa8c9db118da75c608f47eb10b9e)

Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent d426d9fb

linux-headers/asm-s390/kvm.h

+28 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/types.h>



#define __KVM_S390

#define __KVM_HAVE_GUEST_DEBUG



/* Device control API: s390-specific devices */

#define KVM_DEV_FLIC_GET_ALL_IRQS	1
@@ -54,6 +55,13 @@ struct kvm_s390_io_adapter_req { 
	__u64 addr;

};



/* kvm attr_group  on vm fd */

#define KVM_S390_VM_MEM_CTRL		0



/* kvm attributes for mem_ctrl */

#define KVM_S390_VM_MEM_ENABLE_CMMA	0

#define KVM_S390_VM_MEM_CLR_CMMA	1



/* for KVM_GET_REGS and KVM_SET_REGS */

struct kvm_regs {

	/* general purpose regs for s390 */
@@ -72,11 +80,31 @@ struct kvm_fpu { 
	__u64 fprs[16];

};



#define KVM_GUESTDBG_USE_HW_BP		0x00010000



#define KVM_HW_BP			1

#define KVM_HW_WP_WRITE			2

#define KVM_SINGLESTEP			4



struct kvm_debug_exit_arch {

	__u64 addr;

	__u8 type;

	__u8 pad[7]; /* Should be set to 0 */

};



struct kvm_hw_breakpoint {

	__u64 addr;

	__u64 phys_addr;

	__u64 len;

	__u8 type;

	__u8 pad[7]; /* Should be set to 0 */

};



/* for KVM_SET_GUEST_DEBUG */

struct kvm_guest_debug_arch {

	__u32 nr_hw_bp;

	__u32 pad; /* Should be set to 0 */

	struct kvm_hw_breakpoint *hw_bp;

};



#define KVM_SYNC_PREFIX (1UL << 0)

linux-headers/linux/kvm.h

+6 −1
Original line number Diff line number Diff line
@@ -416,6 +416,8 @@ struct kvm_s390_psw { 
#define KVM_S390_INT_PFAULT_INIT	0xfffe0004u

#define KVM_S390_INT_PFAULT_DONE	0xfffe0005u

#define KVM_S390_MCHK			0xfffe1000u

#define KVM_S390_INT_CLOCK_COMP		0xffff1004u

#define KVM_S390_INT_CPU_TIMER		0xffff1005u

#define KVM_S390_INT_VIRTIO		0xffff2603u

#define KVM_S390_INT_SERVICE		0xffff2401u

#define KVM_S390_INT_EMERGENCY		0xffff1201u
@@ -515,6 +517,7 @@ enum { 
	kvm_ioeventfd_flag_nr_pio,

	kvm_ioeventfd_flag_nr_deassign,

	kvm_ioeventfd_flag_nr_virtio_ccw_notify,

	kvm_ioeventfd_flag_nr_fast_mmio,

	kvm_ioeventfd_flag_nr_max,

};
@@ -529,7 +532,7 @@ enum { 
struct kvm_ioeventfd {

	__u64 datamatch;

	__u64 addr;        /* legal pio/mmio address */

	__u32 len;         /* 1, 2, 4, or 8 bytes    */

	__u32 len;         /* 1, 2, 4, or 8 bytes; or 0 to ignore length */

	__s32 fd;

	__u32 flags;

	__u8  pad[36];
@@ -743,6 +746,8 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_IOAPIC_POLARITY_IGNORED 97

#define KVM_CAP_ENABLE_CAP_VM 98

#define KVM_CAP_S390_IRQCHIP 99

#define KVM_CAP_IOEVENTFD_NO_LENGTH 100

#define KVM_CAP_VM_ATTRIBUTES 101



#ifdef KVM_CAP_IRQ_ROUTING