diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-24 11:49:13 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-24 11:49:13 +0100 |
| commit | ea2108c9308071ae41ae6f537724cb2734045943 (patch) | |
| tree | 132b9c4130174a41e06ac73722cc85a418d3959b /arch/s390/include/uapi/asm/kvm.h | |
| parent | 673f7b4257a1fe7b181e1a1182ecc2b6b2b795f1 (diff) | |
| parent | f3f710bc64e121c10c67ce58c893d3bc8c72abe4 (diff) | |
| download | talos-op-linux-ea2108c9308071ae41ae6f537724cb2734045943.tar.gz talos-op-linux-ea2108c9308071ae41ae6f537724cb2734045943.zip | |
Merge branch 'kvms390-irqfd' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next
Diffstat (limited to 'arch/s390/include/uapi/asm/kvm.h')
| -rw-r--r-- | arch/s390/include/uapi/asm/kvm.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h index 2f0ade24f96a..c003c6a73b1e 100644 --- a/arch/s390/include/uapi/asm/kvm.h +++ b/arch/s390/include/uapi/asm/kvm.h @@ -22,6 +22,8 @@ #define KVM_DEV_FLIC_CLEAR_IRQS 3 #define KVM_DEV_FLIC_APF_ENABLE 4 #define KVM_DEV_FLIC_APF_DISABLE_WAIT 5 +#define KVM_DEV_FLIC_ADAPTER_REGISTER 6 +#define KVM_DEV_FLIC_ADAPTER_MODIFY 7 /* * We can have up to 4*64k pending subchannels + 8 adapter interrupts, * as well as up to ASYNC_PF_PER_VCPU*KVM_MAX_VCPUS pfault done interrupts. @@ -32,6 +34,26 @@ #define KVM_S390_MAX_FLOAT_IRQS 266250 #define KVM_S390_FLIC_MAX_BUFFER 0x2000000 +struct kvm_s390_io_adapter { + __u32 id; + __u8 isc; + __u8 maskable; + __u8 swap; + __u8 pad; +}; + +#define KVM_S390_IO_ADAPTER_MASK 1 +#define KVM_S390_IO_ADAPTER_MAP 2 +#define KVM_S390_IO_ADAPTER_UNMAP 3 + +struct kvm_s390_io_adapter_req { + __u32 id; + __u8 type; + __u8 mask; + __u16 pad0; + __u64 addr; +}; + /* for KVM_GET_REGS and KVM_SET_REGS */ struct kvm_regs { /* general purpose regs for s390 */ |
