From 65b399c4ab8f20ec1c674dde391720828ff872b7 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Tue, 14 May 2024 14:28:32 +0200 Subject: sys/linux: run make extract Make the following changes for extraction to succeed: - drop the KVM API constants for features removed in 6.9; - hardcode the three TUNNEL_*_OPT constants that cannot be extracted due to a header change; - hardcode the HCI_OP_* constants removed in 99fca36c8b412 ("Bluetooth: HCI: Remove HCI_AMP support"); - hardcode the L2CAP_* constants removed in e7b02296fb40 ("Bluetooth: Remove BT_HS"); - hardcode LANDLOCK_ACCESS_FS_IOCTL_DEV until it hits upstream. --- sys/linux/dev_kvm.txt.const | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'sys/linux/dev_kvm.txt.const') diff --git a/sys/linux/dev_kvm.txt.const b/sys/linux/dev_kvm.txt.const index 52e6283a0..94bb2bf90 100644 --- a/sys/linux/dev_kvm.txt.const +++ b/sys/linux/dev_kvm.txt.const @@ -55,15 +55,6 @@ KVM_CREATE_VCPU = 44609, mips64le:ppc64le:536915521 KVM_CREATE_VM = 44545, mips64le:ppc64le:536915457 KVM_DEASSIGN_DEV_IRQ = 1077980789 KVM_DEASSIGN_PCI_DEVICE = 1077980786 -KVM_DEV_ASSIGN_ENABLE_IOMMU = 1 -KVM_DEV_ASSIGN_MASK_INTX = 4 -KVM_DEV_ASSIGN_PCI_2_3 = 2 -KVM_DEV_IRQ_GUEST_INTX = 256 -KVM_DEV_IRQ_GUEST_MSI = 512 -KVM_DEV_IRQ_GUEST_MSIX = 1024 -KVM_DEV_IRQ_HOST_INTX = 1 -KVM_DEV_IRQ_HOST_MSI = 2 -KVM_DEV_IRQ_HOST_MSIX = 4 KVM_DEV_TYPE_FLIC = 6 KVM_DEV_TYPE_FSL_MPIC_20 = 1 KVM_DEV_TYPE_FSL_MPIC_42 = 2 @@ -113,7 +104,7 @@ KVM_GUESTDBG_USE_HW_BP = 131072, arm64:mips64le:???, s390x:65536 KVM_GUESTDBG_USE_SW_BP = 65536, mips64le:s390x:??? KVM_HAS_DEVICE_ATTR = 1075359459, mips64le:ppc64le:2149101283 KVM_HC_MAP_GPA_RANGE = 12 -KVM_HYPERV_EVENTFD = 1075359421, mips64le:ppc64le:2149101245 +KVM_HYPERV_EVENTFD = 1075359421, arm64:mips64le:ppc64le:s390x:??? KVM_INTERRUPT = 1074048646, mips64le:ppc64le:2147790470 KVM_IOEVENTFD = 1077980793, mips64le:ppc64le:2151722617 KVM_IOEVENTFD_FLAG_DATAMATCH = 1 @@ -148,15 +139,15 @@ KVM_MSR_EXIT_REASON_INVAL = 1 KVM_MSR_EXIT_REASON_UNKNOWN = 2 KVM_NMI = 44698, mips64le:ppc64le:536915610 KVM_PPC_ALLOCATE_HTAB = 3221532327 -KVM_PPC_GET_PVINFO = 1082175137, mips64le:ppc64le:2155916961 -KVM_PPC_GET_SMMU_INFO = 2186325670, mips64le:ppc64le:1112583846 +KVM_PPC_GET_PVINFO = 386:amd64:arm64:mips64le:s390x:???, ppc64le:2155916961 +KVM_PPC_GET_SMMU_INFO = 386:amd64:arm64:mips64le:s390x:???, ppc64le:1112583846 KVM_REGISTER_COALESCED_MMIO = 1074835047, mips64le:ppc64le:2148576871 KVM_REINJECT_CONTROL = 44657, mips64le:ppc64le:536915569 KVM_RUN = 44672, mips64le:ppc64le:536915584 KVM_RUN_SIZE = 2352, s390x:2368 -KVM_S390_INTERRUPT = 1074835092, mips64le:ppc64le:2148576916 -KVM_S390_UCAS_MAP = 1075359312, mips64le:ppc64le:2149101136 -KVM_S390_UCAS_UNMAP = 1075359313, mips64le:ppc64le:2149101137 +KVM_S390_INTERRUPT = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1074835092 +KVM_S390_UCAS_MAP = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1075359312 +KVM_S390_UCAS_UNMAP = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1075359313 KVM_S390_VCPU_FAULT = 1074310738, 386:1074048594, mips64le:ppc64le:2148052562 KVM_SETUP_CPL3 = 8 KVM_SETUP_PAE = 2 @@ -208,8 +199,8 @@ KVM_STATE_NESTED_SMM_VMXON = 2, arm64:mips64le:ppc64le:s390x:??? KVM_TPR_ACCESS_REPORTING = 3223891602 KVM_TRANSLATE = 3222843013 KVM_UNREGISTER_COALESCED_MMIO = 1074835048, mips64le:ppc64le:2148576872 -KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK = 2 -KVM_X2APIC_API_USE_32BIT_IDS = 1 +KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK = 2, arm64:mips64le:ppc64le:s390x:??? +KVM_X2APIC_API_USE_32BIT_IDS = 1, arm64:mips64le:ppc64le:s390x:??? KVM_X86_DISABLE_EXITS_CSTATE = 8 KVM_X86_DISABLE_EXITS_HLT = 2 KVM_X86_DISABLE_EXITS_MWAIT = 1 -- cgit mrf-deployment