Skip to content

Commit 5ef6f2f

Browse files
rkrcmarpatchew-importer
authored andcommitted
linux-headers: update to v4.8-rc1
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> Message-Id: <20160809150333.9991-2-rkrcmar@redhat.com>
1 parent ab861f3 commit 5ef6f2f

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

linux-headers/linux/kvm.h

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,10 @@ struct kvm_ppc_smmu_info {
866866
#define KVM_CAP_ARM_PMU_V3 126
867867
#define KVM_CAP_VCPU_ATTRIBUTES 127
868868
#define KVM_CAP_MAX_VCPU_ID 128
869+
#define KVM_CAP_X2APIC_API 129
870+
#define KVM_CAP_S390_USER_INSTR0 130
871+
#define KVM_CAP_MSI_DEVID 131
872+
#define KVM_CAP_PPC_HTM 132
869873

870874
#ifdef KVM_CAP_IRQ_ROUTING
871875

@@ -878,7 +882,10 @@ struct kvm_irq_routing_msi {
878882
__u32 address_lo;
879883
__u32 address_hi;
880884
__u32 data;
881-
__u32 pad;
885+
union {
886+
__u32 pad;
887+
__u32 devid;
888+
};
882889
};
883890

884891
struct kvm_irq_routing_s390_adapter {
@@ -1024,12 +1031,14 @@ struct kvm_one_reg {
10241031
__u64 addr;
10251032
};
10261033

1034+
#define KVM_MSI_VALID_DEVID (1U << 0)
10271035
struct kvm_msi {
10281036
__u32 address_lo;
10291037
__u32 address_hi;
10301038
__u32 data;
10311039
__u32 flags;
1032-
__u8 pad[16];
1040+
__u32 devid;
1041+
__u8 pad[12];
10331042
};
10341043

10351044
struct kvm_arm_device_addr {
@@ -1074,6 +1083,8 @@ enum kvm_device_type {
10741083
#define KVM_DEV_TYPE_FLIC KVM_DEV_TYPE_FLIC
10751084
KVM_DEV_TYPE_ARM_VGIC_V3,
10761085
#define KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_V3
1086+
KVM_DEV_TYPE_ARM_VGIC_ITS,
1087+
#define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS
10771088
KVM_DEV_TYPE_MAX,
10781089
};
10791090

@@ -1313,4 +1324,7 @@ struct kvm_assigned_msix_entry {
13131324
__u16 padding[3];
13141325
};
13151326

1327+
#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
1328+
#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
1329+
13161330
#endif /* __LINUX_KVM_H */

0 commit comments

Comments
 (0)