[PATCH 1/3] Remove KVM_XEN_* ioctl from ioctls lists for non-x86 architectures

Gleb Fotengauer-Malinovskiy glebfm at altlinux.org
Mon Apr 15 17:58:07 UTC 2024


* maint/ioctls_sym.sh (x86_list): Add KVM_XEN_[A-Z_]+.
* src/linux/aarch64/ioctls_arch0.h: Regenerate from linux v6.8 using
ioctls_gen.sh.
* src/linux/mips/ioctls_arch0.h: Likewise.
* src/linux/powerpc/ioctls_arch0.h: Likewise.
* src/linux/s390/ioctls_arch0.h: Likewise.
* src/linux/s390x/ioctls_arch0.h: Likewise.
---
 maint/ioctls_sym.sh              | 2 +-
 src/linux/aarch64/ioctls_arch0.h | 5 -----
 src/linux/mips/ioctls_arch0.h    | 5 -----
 src/linux/powerpc/ioctls_arch0.h | 5 -----
 src/linux/s390/ioctls_arch0.h    | 5 -----
 src/linux/s390x/ioctls_arch0.h   | 5 -----
 6 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index d3f8d1698..5bb12a7f8 100755
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -427,7 +427,7 @@ process_file()
 			arm_list='KVM_ARM_[A-Z_]+'
 			ppc_list='KVM_ALLOCATE_RMA|KVM_CREATE_SPAPR_TCE|KVM_CREATE_SPAPR_TCE_64|KVM_PPC_[A-Z1-9_]+'
 			s390_list='KVM_S390_[A-Z_]+'
-			x86_list='KVM_GET_CPUID2|KVM_GET_DEBUGREGS|KVM_GET_EMULATED_CPUID|KVM_GET_LAPIC|KVM_GET_MSRS|KVM_GET_MSR_FEATURE_INDEX_LIST|KVM_GET_MSR_INDEX_LIST|KVM_GET_NESTED_STATE|KVM_GET_PIT|KVM_GET_PIT2|KVM_GET_SREGS2|KVM_GET_SUPPORTED_CPUID|KVM_GET_SUPPORTED_HV_CPUID|KVM_GET_VCPU_EVENTS|KVM_GET_XCRS|KVM_GET_XSAVE|KVM_GET_XSAVE2|KVM_HYPERV_EVENTFD|KVM_SET_CPUID|KVM_SET_CPUID2|KVM_SET_DEBUGREGS|KVM_SET_LAPIC|KVM_SET_MEMORY_ALIAS|KVM_SET_MSRS|KVM_SET_NESTED_STATE|KVM_SET_PIT|KVM_SET_PIT2|KVM_SET_PMU_EVENT_FILTER|KVM_SET_SREGS2|KVM_SET_VCPU_EVENTS|KVM_SET_XCRS|KVM_SET_XSAVE|KVM_XEN_HVM_CONFIG|KVM_X86_[A-Z_]+'
+			x86_list='KVM_GET_CPUID2|KVM_GET_DEBUGREGS|KVM_GET_EMULATED_CPUID|KVM_GET_LAPIC|KVM_GET_MSRS|KVM_GET_MSR_FEATURE_INDEX_LIST|KVM_GET_MSR_INDEX_LIST|KVM_GET_NESTED_STATE|KVM_GET_PIT|KVM_GET_PIT2|KVM_GET_SREGS2|KVM_GET_SUPPORTED_CPUID|KVM_GET_SUPPORTED_HV_CPUID|KVM_GET_VCPU_EVENTS|KVM_GET_XCRS|KVM_GET_XSAVE|KVM_GET_XSAVE2|KVM_HYPERV_EVENTFD|KVM_SET_CPUID|KVM_SET_CPUID2|KVM_SET_DEBUGREGS|KVM_SET_LAPIC|KVM_SET_MEMORY_ALIAS|KVM_SET_MSRS|KVM_SET_NESTED_STATE|KVM_SET_PIT|KVM_SET_PIT2|KVM_SET_PMU_EVENT_FILTER|KVM_SET_SREGS2|KVM_SET_VCPU_EVENTS|KVM_SET_XCRS|KVM_SET_XSAVE|KVM_XEN_[A-Z_]+|KVM_X86_[A-Z_]+'
 			case "$uname_m" in
 				aarch64|arm*) list="$ppc_list|$s390_list|$x86_list" ;;
 				ppc*) list="$arm_list|$s390_list|$x86_list" ;;
diff --git a/src/linux/aarch64/ioctls_arch0.h b/src/linux/aarch64/ioctls_arch0.h
index 5c298b7f6..456aa880c 100644
--- a/src/linux/aarch64/ioctls_arch0.h
+++ b/src/linux/aarch64/ioctls_arch0.h
@@ -72,8 +72,3 @@
 { "linux/kvm.h", "KVM_TPR_ACCESS_REPORTING", _IOC_READ|_IOC_WRITE, 0xae92, 0x28 },
 { "linux/kvm.h", "KVM_TRANSLATE", _IOC_READ|_IOC_WRITE, 0xae85, 0x18 },
 { "linux/kvm.h", "KVM_UNREGISTER_COALESCED_MMIO", _IOC_WRITE, 0xae68, 0x10 },
-{ "linux/kvm.h", "KVM_XEN_HVM_EVTCHN_SEND", _IOC_WRITE, 0xaed0, 0x0c },
-{ "linux/kvm.h", "KVM_XEN_HVM_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaec8, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_HVM_SET_ATTR", _IOC_WRITE, 0xaec9, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaeca, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_SET_ATTR", _IOC_WRITE, 0xaecb, 0x48 },
diff --git a/src/linux/mips/ioctls_arch0.h b/src/linux/mips/ioctls_arch0.h
index 9700d4f85..b495a9fc1 100644
--- a/src/linux/mips/ioctls_arch0.h
+++ b/src/linux/mips/ioctls_arch0.h
@@ -147,8 +147,3 @@
 { "linux/kvm.h", "KVM_TPR_ACCESS_REPORTING", _IOC_READ|_IOC_WRITE, 0xae92, 0x28 },
 { "linux/kvm.h", "KVM_TRANSLATE", _IOC_READ|_IOC_WRITE, 0xae85, 0x18 },
 { "linux/kvm.h", "KVM_UNREGISTER_COALESCED_MMIO", _IOC_WRITE, 0xae68, 0x10 },
-{ "linux/kvm.h", "KVM_XEN_HVM_EVTCHN_SEND", _IOC_WRITE, 0xaed0, 0x0c },
-{ "linux/kvm.h", "KVM_XEN_HVM_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaec8, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_HVM_SET_ATTR", _IOC_WRITE, 0xaec9, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaeca, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_SET_ATTR", _IOC_WRITE, 0xaecb, 0x48 },
diff --git a/src/linux/powerpc/ioctls_arch0.h b/src/linux/powerpc/ioctls_arch0.h
index 0c8c8b36d..a18aaa2fe 100644
--- a/src/linux/powerpc/ioctls_arch0.h
+++ b/src/linux/powerpc/ioctls_arch0.h
@@ -173,8 +173,3 @@
 { "linux/kvm.h", "KVM_TPR_ACCESS_REPORTING", _IOC_READ|_IOC_WRITE, 0xae92, 0x28 },
 { "linux/kvm.h", "KVM_TRANSLATE", _IOC_READ|_IOC_WRITE, 0xae85, 0x18 },
 { "linux/kvm.h", "KVM_UNREGISTER_COALESCED_MMIO", _IOC_WRITE, 0xae68, 0x10 },
-{ "linux/kvm.h", "KVM_XEN_HVM_EVTCHN_SEND", _IOC_WRITE, 0xaed0, 0x0c },
-{ "linux/kvm.h", "KVM_XEN_HVM_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaec8, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_HVM_SET_ATTR", _IOC_WRITE, 0xaec9, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaeca, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_SET_ATTR", _IOC_WRITE, 0xaecb, 0x48 },
diff --git a/src/linux/s390/ioctls_arch0.h b/src/linux/s390/ioctls_arch0.h
index 7f615cc36..dfc228035 100644
--- a/src/linux/s390/ioctls_arch0.h
+++ b/src/linux/s390/ioctls_arch0.h
@@ -181,8 +181,3 @@
 { "linux/kvm.h", "KVM_TPR_ACCESS_REPORTING", _IOC_READ|_IOC_WRITE, 0xae92, 0x28 },
 { "linux/kvm.h", "KVM_TRANSLATE", _IOC_READ|_IOC_WRITE, 0xae85, 0x18 },
 { "linux/kvm.h", "KVM_UNREGISTER_COALESCED_MMIO", _IOC_WRITE, 0xae68, 0x10 },
-{ "linux/kvm.h", "KVM_XEN_HVM_EVTCHN_SEND", _IOC_WRITE, 0xaed0, 0x0c },
-{ "linux/kvm.h", "KVM_XEN_HVM_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaec8, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_HVM_SET_ATTR", _IOC_WRITE, 0xaec9, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaeca, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_SET_ATTR", _IOC_WRITE, 0xaecb, 0x48 },
diff --git a/src/linux/s390x/ioctls_arch0.h b/src/linux/s390x/ioctls_arch0.h
index 4522fb5cd..e4e6239c6 100644
--- a/src/linux/s390x/ioctls_arch0.h
+++ b/src/linux/s390x/ioctls_arch0.h
@@ -181,8 +181,3 @@
 { "linux/kvm.h", "KVM_TPR_ACCESS_REPORTING", _IOC_READ|_IOC_WRITE, 0xae92, 0x28 },
 { "linux/kvm.h", "KVM_TRANSLATE", _IOC_READ|_IOC_WRITE, 0xae85, 0x18 },
 { "linux/kvm.h", "KVM_UNREGISTER_COALESCED_MMIO", _IOC_WRITE, 0xae68, 0x10 },
-{ "linux/kvm.h", "KVM_XEN_HVM_EVTCHN_SEND", _IOC_WRITE, 0xaed0, 0x0c },
-{ "linux/kvm.h", "KVM_XEN_HVM_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaec8, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_HVM_SET_ATTR", _IOC_WRITE, 0xaec9, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_GET_ATTR", _IOC_READ|_IOC_WRITE, 0xaeca, 0x48 },
-{ "linux/kvm.h", "KVM_XEN_VCPU_SET_ATTR", _IOC_WRITE, 0xaecb, 0x48 },
-- 
glebfm



More information about the Strace-devel mailing list