aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJens Freimann <jfrei@linux.vnet.ibm.com>2013-10-07 10:13:45 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-01-30 04:25:20 -0500
commitc05c4186bbe4e99d64e8a36f7ca7f480da5d109f (patch)
tree746d5b7f59b3c74668ab2b0abcfb48b64b4512e9 /include
parent81aa8efe0190cf5bf7eaafb57341cd7d0aea96cd (diff)
KVM: s390: add floating irq controller
This patch adds a floating irq controller as a kvm_device. It will be necessary for migration of floating interrupts as well as for hardening the reset code by allowing user space to explicitly remove all pending floating interrupts. Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kvm_host.h1
-rw-r--r--include/uapi/linux/kvm.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index b8e9a43e501a..c0102ef2de48 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1064,6 +1064,7 @@ extern struct kvm_device_ops kvm_mpic_ops;
1064extern struct kvm_device_ops kvm_xics_ops; 1064extern struct kvm_device_ops kvm_xics_ops;
1065extern struct kvm_device_ops kvm_vfio_ops; 1065extern struct kvm_device_ops kvm_vfio_ops;
1066extern struct kvm_device_ops kvm_arm_vgic_v2_ops; 1066extern struct kvm_device_ops kvm_arm_vgic_v2_ops;
1067extern struct kvm_device_ops kvm_flic_ops;
1067 1068
1068#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT 1069#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
1069 1070
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 86faf47ae494..19f717b15297 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -918,6 +918,7 @@ struct kvm_device_attr {
918#define KVM_DEV_VFIO_GROUP_ADD 1 918#define KVM_DEV_VFIO_GROUP_ADD 1
919#define KVM_DEV_VFIO_GROUP_DEL 2 919#define KVM_DEV_VFIO_GROUP_DEL 2
920#define KVM_DEV_TYPE_ARM_VGIC_V2 5 920#define KVM_DEV_TYPE_ARM_VGIC_V2 5
921#define KVM_DEV_TYPE_FLIC 6
921 922
922/* 923/*
923 * ioctls for VM fds 924 * ioctls for VM fds