diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:26:48 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:26:48 +0000 |
| commit | 60dd133a7b77b6adc2d18ff1a85db5a67434a071 (patch) | |
| tree | eb547e3490340335770449ad81d13b9c9f0e5031 /include/uapi/linux/kvm.h | |
| parent | 989c6b34f6a9480e397b170cc62237e89bf4fdb9 (diff) | |
| parent | fa20f5aea56f271f83e91b9cde00f043a5a14990 (diff) | |
Merge tag 'vgic-migrate-for-marc' of git://git.linaro.org/people/christoffer.dall/linux-kvm-arm into kvm-arm64/next
VGIC and timer migration pull
Diffstat (limited to 'include/uapi/linux/kvm.h')
| -rw-r--r-- | include/uapi/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 902f12461873..b647c2917391 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -853,6 +853,7 @@ struct kvm_device_attr { #define KVM_DEV_VFIO_GROUP 1 #define KVM_DEV_VFIO_GROUP_ADD 1 #define KVM_DEV_VFIO_GROUP_DEL 2 +#define KVM_DEV_TYPE_ARM_VGIC_V2 5 /* * ioctls for VM fds |