History

tools headers: Sync KVM headers with the kernel sources

To pick up the changes in: 103ff3a50e3a50a9 ("KVM: s390: Add capability to support 2G hugepages") 229132c309d667bb ("LoongArch: KVM: Add DMSINTC device support") 2619da73bb2f10d8 ("KVM: x86: Use __DECLARE_FLEX_ARRAY() for UAPI structures with VLAs") 4aebd7d5c72f805e ("KVM: s390: Add KVM capability for ESA mode guests") 4f256d5770febb9d ("KVM: x86: nSVM: Save/restore gPAT with KVM_{GET,SET}_NESTED_STATE") 822790ab01495d67 ("KVM: x86: Define KVM_X86_QUIRK_NESTED_SVM_SHARED_PAT") 8800dbf6614aad10 ("KVM: arm64: Allow userspace to create protected VMs when pKVM is enabled") bf8f3cec939db68e ("KVM: s390: vsie: Refactor handle_stfle") c547c51ff4d44c78 ("KVM: arm64: gic-v5: Add ARM_VGIC_V5 device to KVM headers") d7507a94a0720223 ("KVM: SVM: Treat exit_code as an unsigned 64-bit value through all of KVM") This addresses these perf build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h Please see tools/include/uapi/README for further details.

Arnaldo Carvalho de Melo committed 4 months ago

Commit fac520e1 parent 42bfbb34 files · +40 −27Browse files

Showing the changes to tools/include/uapi/linux (1 of 4 files). Show all

Unified · Split

tools/include/uapi/linux/kvm.h+15−5
@@ -11,6 +11,7 @@ · 10 unmodified lines
11#include <linux/const.h>11#include <linux/const.h>
12#include <linux/types.h>12#include <linux/types.h>
13#include <linux/compiler.h>13#include <linux/compiler.h>
14#include <linux/stddef.h>
14#include <linux/ioctl.h>15#include <linux/ioctl.h>
15#include <asm/kvm.h>16#include <asm/kvm.h>
16 17
@@ -542,7 +543,7 @@ struct kvm_coalesced_mmio { · 525 unmodified lines
542 543
543struct kvm_coalesced_mmio_ring {544struct kvm_coalesced_mmio_ring {
544 __u32 first, last;545 __u32 first, last;
545 struct kvm_coalesced_mmio coalesced_mmio[];546 __DECLARE_FLEX_ARRAY(struct kvm_coalesced_mmio, coalesced_mmio);
546};547};
547 548
548#define KVM_COALESCED_MMIO_MAX \549#define KVM_COALESCED_MMIO_MAX \
@@ -592,7 +593,7 @@ struct kvm_clear_dirty_log { · 43 unmodified lines
592/* for KVM_SET_SIGNAL_MASK */593/* for KVM_SET_SIGNAL_MASK */
593struct kvm_signal_mask {594struct kvm_signal_mask {
594 __u32 len;595 __u32 len;
595 __u8 sigset[];596 __DECLARE_FLEX_ARRAY(__u8, sigset);
596};597};
597 598
598/* for KVM_TPR_ACCESS_REPORTING */599/* for KVM_TPR_ACCESS_REPORTING */
@@ -703,6 +704,11 @@ struct kvm_enable_cap { · 104 unmodified lines
703#define KVM_VM_TYPE_ARM_IPA_SIZE_MASK 0xffULL704#define KVM_VM_TYPE_ARM_IPA_SIZE_MASK 0xffULL
704#define KVM_VM_TYPE_ARM_IPA_SIZE(x) \705#define KVM_VM_TYPE_ARM_IPA_SIZE(x) \
705 ((x) & KVM_VM_TYPE_ARM_IPA_SIZE_MASK)706 ((x) & KVM_VM_TYPE_ARM_IPA_SIZE_MASK)
707
708#define KVM_VM_TYPE_ARM_PROTECTED (1UL << 31)
709#define KVM_VM_TYPE_ARM_MASK (KVM_VM_TYPE_ARM_IPA_SIZE_MASK | \
710 KVM_VM_TYPE_ARM_PROTECTED)
711
706/*712/*
707 * ioctls for /dev/kvm fds:713 * ioctls for /dev/kvm fds:
708 */714 */
@@ -989,6 +995,8 @@ struct kvm_enable_cap { · 280 unmodified lines
989#define KVM_CAP_ARM_SEA_TO_USER 245995#define KVM_CAP_ARM_SEA_TO_USER 245
990#define KVM_CAP_S390_USER_OPEREXEC 246996#define KVM_CAP_S390_USER_OPEREXEC 246
991#define KVM_CAP_S390_KEYOP 247997#define KVM_CAP_S390_KEYOP 247
998#define KVM_CAP_S390_VSIE_ESAMODE 248
999#define KVM_CAP_S390_HPAGE_2G 249
992 1000
993struct kvm_irq_routing_irqchip {1001struct kvm_irq_routing_irqchip {
994 __u32 irqchip;1002 __u32 irqchip;
@@ -1051,7 +1059,7 @@ struct kvm_irq_routing_entry { · 56 unmodified lines
1051struct kvm_irq_routing {1059struct kvm_irq_routing {
1052 __u32 nr;1060 __u32 nr;
1053 __u32 flags;1061 __u32 flags;
1054 struct kvm_irq_routing_entry entries[];1062 __DECLARE_FLEX_ARRAY(struct kvm_irq_routing_entry, entries);
1055};1063};
1056 1064
1057#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)1065#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
@@ -1142,7 +1150,7 @@ struct kvm_dirty_tlb { · 84 unmodified lines
1142 1150
1143struct kvm_reg_list {1151struct kvm_reg_list {
1144 __u64 n; /* number of regs */1152 __u64 n; /* number of regs */
1145 __u64 reg[];1153 __DECLARE_FLEX_ARRAY(__u64, reg);
1146};1154};
1147 1155
1148struct kvm_one_reg {1156struct kvm_one_reg {
@@ -1224,6 +1232,8 @@ enum kvm_device_type { · 75 unmodified lines
1224#define KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_EIOINTC1232#define KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_EIOINTC
1225 KVM_DEV_TYPE_LOONGARCH_PCHPIC,1233 KVM_DEV_TYPE_LOONGARCH_PCHPIC,
1226#define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC1234#define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC
1235 KVM_DEV_TYPE_LOONGARCH_DMSINTC,
1236#define KVM_DEV_TYPE_LOONGARCH_DMSINTC KVM_DEV_TYPE_LOONGARCH_DMSINTC
1227 KVM_DEV_TYPE_ARM_VGIC_V5,1237 KVM_DEV_TYPE_ARM_VGIC_V5,
1228#define KVM_DEV_TYPE_ARM_VGIC_V5 KVM_DEV_TYPE_ARM_VGIC_V51238#define KVM_DEV_TYPE_ARM_VGIC_V5 KVM_DEV_TYPE_ARM_VGIC_V5
1229 1239
@@ -1610,7 +1620,7 @@ struct kvm_stats_desc { · 380 unmodified lines
1610#ifdef __KERNEL__1620#ifdef __KERNEL__
1611 char name[KVM_STATS_NAME_SIZE];1621 char name[KVM_STATS_NAME_SIZE];
1612#else1622#else
1613 char name[];1623 __DECLARE_FLEX_ARRAY(char, name);
1614#endif1624#endif
1615};1625};
1616 1626

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t