[PATCH 1/2] Move x86 KVM ioctls under #ifdef X86

[Michael Ellerman]

---
 ioctls/kvm.c |   48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/ioctls/kvm.c b/ioctls/kvm.c
index 4620ca8..ffddee4 100644
--- a/ioctls/kvm.c
+++ b/ioctls/kvm.c
@@ -12,7 +12,6 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_SET_MEMORY_REGION),
        IOCTL(KVM_CREATE_VCPU),
        IOCTL(KVM_GET_DIRTY_LOG),
-       IOCTL(KVM_SET_MEMORY_ALIAS),
        IOCTL(KVM_SET_NR_MMU_PAGES),
        IOCTL(KVM_GET_NR_MMU_PAGES),
        IOCTL(KVM_SET_USER_MEMORY_REGION),
@@ -26,13 +25,10 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_GET_IRQCHIP),
        IOCTL(KVM_SET_IRQCHIP),
        IOCTL(KVM_CREATE_PIT),
-       IOCTL(KVM_GET_PIT),
-       IOCTL(KVM_SET_PIT),
        IOCTL(KVM_IRQ_LINE_STATUS),
        IOCTL(KVM_REGISTER_COALESCED_MMIO),
        IOCTL(KVM_UNREGISTER_COALESCED_MMIO),
        IOCTL(KVM_ASSIGN_PCI_DEVICE),
-       IOCTL(KVM_SET_GSI_ROUTING),
        IOCTL(KVM_ASSIGN_IRQ),
        IOCTL(KVM_ASSIGN_DEV_IRQ),
        IOCTL(KVM_REINJECT_CONTROL),
@@ -44,16 +40,38 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_CREATE_PIT2),
        IOCTL(KVM_SET_BOOT_CPU_ID),
        IOCTL(KVM_IOEVENTFD),
-       IOCTL(KVM_XEN_HVM_CONFIG),
        IOCTL(KVM_SET_CLOCK),
        IOCTL(KVM_GET_CLOCK),
-       IOCTL(KVM_GET_PIT2),
-       IOCTL(KVM_SET_PIT2),
        IOCTL(KVM_PPC_GET_PVINFO),
        IOCTL(KVM_SET_TSC_KHZ),
        IOCTL(KVM_GET_TSC_KHZ),
        IOCTL(KVM_ASSIGN_SET_INTX_MASK),
        IOCTL(KVM_SIGNAL_MSI),
+#ifdef X86
+       IOCTL(KVM_SET_MEMORY_ALIAS),
+       IOCTL(KVM_GET_PIT),
+       IOCTL(KVM_SET_PIT),
+       IOCTL(KVM_GET_PIT2),
+       IOCTL(KVM_SET_PIT2),
+       IOCTL(KVM_SET_GSI_ROUTING),
+       IOCTL(KVM_XEN_HVM_CONFIG),
+       IOCTL(KVM_GET_MSRS),
+       IOCTL(KVM_SET_MSRS),
+       IOCTL(KVM_SET_CPUID),
+       IOCTL(KVM_GET_LAPIC),
+       IOCTL(KVM_SET_LAPIC),
+       IOCTL(KVM_SET_CPUID2),
+       IOCTL(KVM_GET_CPUID2),
+       IOCTL(KVM_X86_SET_MCE),
+       IOCTL(KVM_GET_VCPU_EVENTS),
+       IOCTL(KVM_SET_VCPU_EVENTS),
+       IOCTL(KVM_GET_DEBUGREGS),
+       IOCTL(KVM_SET_DEBUGREGS),
+       IOCTL(KVM_GET_XSAVE),
+       IOCTL(KVM_SET_XSAVE),
+       IOCTL(KVM_GET_XCRS),
+       IOCTL(KVM_SET_XCRS),
+#endif
 #if defined(__powerpc__)
        IOCTL(KVM_PPC_GET_SMMU_INFO),
        IOCTL(KVM_PPC_ALLOCATE_HTAB),
@@ -73,16 +91,9 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_TRANSLATE),
        IOCTL(KVM_INTERRUPT),
        IOCTL(KVM_DEBUG_GUEST),
-       IOCTL(KVM_GET_MSRS),
-       IOCTL(KVM_SET_MSRS),
-       IOCTL(KVM_SET_CPUID),
        IOCTL(KVM_SET_SIGNAL_MASK),
        IOCTL(KVM_GET_FPU),
        IOCTL(KVM_SET_FPU),
-       IOCTL(KVM_GET_LAPIC),
-       IOCTL(KVM_SET_LAPIC),
-       IOCTL(KVM_SET_CPUID2),
-       IOCTL(KVM_GET_CPUID2),
        IOCTL(KVM_TPR_ACCESS_REPORTING),
        IOCTL(KVM_SET_VAPIC_ADDR),
 #if defined(__s390__)
@@ -99,18 +110,9 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_SET_GUEST_DEBUG),
        IOCTL(KVM_X86_SETUP_MCE),
        IOCTL(KVM_X86_GET_MCE_CAP_SUPPORTED),
-       IOCTL(KVM_X86_SET_MCE),
        IOCTL(KVM_IA64_VCPU_GET_STACK),
        IOCTL(KVM_IA64_VCPU_SET_STACK),
-       IOCTL(KVM_GET_VCPU_EVENTS),
-       IOCTL(KVM_SET_VCPU_EVENTS),
-       IOCTL(KVM_GET_DEBUGREGS),
-       IOCTL(KVM_SET_DEBUGREGS),
        IOCTL(KVM_ENABLE_CAP),
-       IOCTL(KVM_GET_XSAVE),
-       IOCTL(KVM_SET_XSAVE),
-       IOCTL(KVM_GET_XCRS),
-       IOCTL(KVM_SET_XCRS),
        IOCTL(KVM_DIRTY_TLB),
        IOCTL(KVM_GET_ONE_REG),
        IOCTL(KVM_SET_ONE_REG),
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe trinity" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html