Fix ioctl code generation for 32-bit powerpc.

gen/ioctl/generate.sh

@@ -32,6 +32,9 @@ qemu-arm -L /usr/arm-linux-gnueabihf ./main.exe >> "$out"
 powerpc64le-linux-gnu-gcc -Iinclude -c list.c $cflags
 powerpc64le-linux-gnu-gcc main.c list.o -o main.exe $cflags
 qemu-ppc64le -L /usr/powerpc64le-linux-gnu ./main.exe >> "$out"
+powerpc-linux-gnu-gcc -Iinclude -c list.c $cflags
+powerpc-linux-gnu-gcc main.c list.o -o main.exe $cflags
+qemu-ppc -L /usr/powerpc-linux-gnu ./main.exe >> "$out"
 mips64el-linux-gnuabi64-gcc -Iinclude -c list.c $cflags
 mips64el-linux-gnuabi64-gcc main.c list.o -o main.exe $cflags
 qemu-mips64el -L /usr/mips64el-linux-gnuabi64 ./main.exe >> "$out"

gen/ioctl/generated.txt

@@ -299,110 +299,6 @@ MGSL_IOCGPARAMS
 ENI_SETMULT
 RIO_GET_EVENT_MASK
 LIRC_GET_MAX_TIMEOUT
-KVM_SET_BOOT_CPU_ID
-KVM_SET_MP_STATE
-KVM_GET_MP_STATE
-KVM_GET_API_VERSION
-KVM_S390_GET_SKEYS
-KVM_SET_ONE_REG
-KVM_IRQ_LINE_STATUS
-KVM_SET_USER_MEMORY_REGION
-KVM_S390_INTERRUPT
-KVM_TPR_ACCESS_REPORTING
-KVM_GET_FPU
-KVM_ASSIGN_SET_MSIX_ENTRY
-KVM_MEMORY_ENCRYPT_REG_REGION
-KVM_S390_UCAS_MAP
-KVM_ASSIGN_SET_INTX_MASK
-KVM_MEMORY_ENCRYPT_OP
-KVM_CREATE_PIT2
-KVM_S390_VCPU_FAULT
-KVM_REGISTER_COALESCED_MMIO
-KVM_SET_VAPIC_ADDR
-KVM_CREATE_DEVICE
-KVM_GET_IRQCHIP
-KVM_TRANSLATE
-KVM_S390_SET_INITIAL_PSW
-KVM_X86_SETUP_MCE
-KVM_DEASSIGN_PCI_DEVICE
-KVM_XEN_HVM_SET_ATTR
-KVM_GET_CLOCK
-KVM_SET_FPU
-KVM_KVMCLOCK_CTRL
-KVM_PPC_GET_PVINFO
-KVM_X86_GET_MCE_CAP_SUPPORTED
-KVM_S390_GET_IRQ_STATE
-KVM_GET_DEVICE_ATTR
-KVM_S390_INITIAL_RESET
-KVM_SET_REGS
-KVM_GET_TSC_KHZ
-KVM_CHECK_EXTENSION
-KVM_PPC_RESIZE_HPT_COMMIT
-KVM_GET_DIRTY_LOG
-KVM_S390_SET_IRQ_STATE
-KVM_S390_NORMAL_RESET
-KVM_SET_SIGNAL_MASK
-KVM_XEN_VCPU_SET_ATTR
-KVM_SET_GSI_ROUTING
-KVM_CREATE_VCPU
-KVM_S390_UCAS_UNMAP
-KVM_S390_STORE_STATUS
-KVM_UNREGISTER_COALESCED_MMIO
-KVM_ASSIGN_DEV_IRQ
-KVM_S390_PV_COMMAND
-KVM_S390_ENABLE_SIE
-KVM_CLEAR_DIRTY_LOG
-KVM_GET_ONE_REG
-KVM_ARM_SET_DEVICE_ADDR
-KVM_DIRTY_TLB
-KVM_NMI
-KVM_HYPERV_EVENTFD
-KVM_S390_MEM_OP
-KVM_PPC_SVM_OFF
-KVM_PPC_RESIZE_HPT_PREPARE
-KVM_INTERRUPT
-KVM_XEN_HVM_GET_ATTR
-KVM_GET_SREGS
-KVM_SET_IDENTITY_MAP_ADDR
-KVM_GET_REGS
-KVM_S390_GET_CMMA_BITS
-KVM_CREATE_IRQCHIP
-KVM_ASSIGN_PCI_DEVICE
-KVM_SET_NR_MMU_PAGES
-KVM_IOEVENTFD
-KVM_RUN
-KVM_S390_SET_SKEYS
-KVM_SET_DEVICE_ATTR
-KVM_DEASSIGN_DEV_IRQ
-KVM_SMI
-KVM_SET_TSS_ADDR
-KVM_GET_NR_MMU_PAGES
-KVM_XEN_VCPU_GET_ATTR
-KVM_REINJECT_CONTROL
-KVM_HAS_DEVICE_ATTR
-KVM_IRQFD
-KVM_S390_SET_CMMA_BITS
-KVM_SET_IRQCHIP
-KVM_SIGNAL_MSI
-KVM_GET_VCPU_MMAP_SIZE
-KVM_CREATE_VM
-KVM_S390_CLEAR_RESET
-KVM_RESET_DIRTY_RINGS
-KVM_ASSIGN_SET_MSIX_NR
-KVM_CREATE_PIT
-KVM_SET_GUEST_DEBUG
-KVM_GET_REG_LIST
-KVM_ARM_VCPU_FINALIZE
-KVM_SET_CLOCK
-KVM_PPC_ALLOCATE_HTAB
-KVM_PPC_GET_SMMU_INFO
-KVM_SET_TSC_KHZ
-KVM_S390_IRQ
-KVM_ENABLE_CAP
-KVM_IRQ_LINE
-KVM_SET_SREGS
-KVM_MEMORY_ENCRYPT_UNREG_REGION
-KVM_GET_STATS_FD
 USBDEVFS_CLAIMINTERFACE
 CHIOMOVE
 SONYPI_IOCGBATFLAGS

gen/ioctl/list.c

@@ -171,7 +171,7 @@ struct sockaddr {
 #include <linux/watchdog.h>
 #include <linux/wmi.h>
 
-#ifdef __powerpc64__
+#if defined(__powerpc64__) || defined(__powerpc__)
 typedef __kernel_loff_t loff_t;
 #endif
 
@@ -597,250 +597,6 @@ void list(void) {
     IOCTL_REQUEST(ENI_SETMULT);
     IOCTL_REQUEST(RIO_GET_EVENT_MASK);
     IOCTL_REQUEST(LIRC_GET_MAX_TIMEOUT);
-#if !defined(__arm__) && !defined(__loongarch__) && !defined(__powerpc64__) && !defined(__riscv) && !defined(__csky__)
-#if 0 // needs `struct kvm_cpuid2`
-    IOCTL_REQUEST(KVM_GET_SUPPORTED_CPUID);
-#endif
-    IOCTL_REQUEST(KVM_SET_BOOT_CPU_ID);
-    IOCTL_REQUEST(KVM_SET_MP_STATE);
-    IOCTL_REQUEST(KVM_GET_MP_STATE);
-    IOCTL_REQUEST(KVM_GET_API_VERSION);
-    IOCTL_REQUEST(KVM_S390_GET_SKEYS);
-#if 0 // needs `struct kvm_create_spapr_tce_64`
-    IOCTL_REQUEST(KVM_CREATE_SPAPR_TCE_64);
-#endif
-    IOCTL_REQUEST(KVM_SET_ONE_REG);
-#if 0 // needs `struct kvm_xcrs`
-    IOCTL_REQUEST(KVM_SET_XCRS);
-#endif
-    IOCTL_REQUEST(KVM_IRQ_LINE_STATUS);
-    IOCTL_REQUEST(KVM_SET_USER_MEMORY_REGION);
-    IOCTL_REQUEST(KVM_S390_INTERRUPT);
-    IOCTL_REQUEST(KVM_TPR_ACCESS_REPORTING);
-#if 0 // needs `struct kvm_xsave`
-    IOCTL_REQUEST(KVM_SET_XSAVE);
-#endif
-    IOCTL_REQUEST(KVM_GET_FPU);
-    IOCTL_REQUEST(KVM_ASSIGN_SET_MSIX_ENTRY);
-    IOCTL_REQUEST(KVM_MEMORY_ENCRYPT_REG_REGION);
-    IOCTL_REQUEST(KVM_S390_UCAS_MAP);
-    IOCTL_REQUEST(KVM_ASSIGN_SET_INTX_MASK);
-#if 0 // needs `struct kvm_xen_hvm_config`
-    IOCTL_REQUEST(KVM_XEN_HVM_CONFIG);
-#endif
-#if 0 // needs `struct kvm_x86_mce`
-    IOCTL_REQUEST(KVM_X86_SET_MCE);
-#endif
-#if 0 // needs `struct kvm_vcpu_init`
-    IOCTL_REQUEST(KVM_ARM_PREFERRED_TARGET);
-#endif
-    IOCTL_REQUEST(KVM_MEMORY_ENCRYPT_OP);
-    IOCTL_REQUEST(KVM_CREATE_PIT2);
-#if 0 // needs `struct kvm_rtas_token_args`
-    IOCTL_REQUEST(KVM_PPC_RTAS_DEFINE_TOKEN);
-#endif
-#if 0 // needs `struct kvm_get_htab_fd`
-    IOCTL_REQUEST(KVM_PPC_GET_HTAB_FD);
-#endif
-    IOCTL_REQUEST(KVM_S390_VCPU_FAULT);
-    IOCTL_REQUEST(KVM_REGISTER_COALESCED_MMIO);
-    IOCTL_REQUEST(KVM_SET_VAPIC_ADDR);
-    IOCTL_REQUEST(KVM_CREATE_DEVICE);
-    IOCTL_REQUEST(KVM_GET_IRQCHIP);
-#if 0 // needs `struct kvm_nested_state`
-    IOCTL_REQUEST(KVM_SET_NESTED_STATE);
-#endif
-    IOCTL_REQUEST(KVM_TRANSLATE);
-    IOCTL_REQUEST(KVM_S390_SET_INITIAL_PSW);
-    IOCTL_REQUEST(KVM_X86_SETUP_MCE);
-    IOCTL_REQUEST(KVM_DEASSIGN_PCI_DEVICE);
-#if 0 // needs `struct kvm_nested_state`
-    IOCTL_REQUEST(KVM_GET_NESTED_STATE);
-#endif
-    IOCTL_REQUEST(KVM_XEN_HVM_SET_ATTR);
-    IOCTL_REQUEST(KVM_GET_CLOCK);
-#if 0 // needs `struct kvm_cpuid`
-    IOCTL_REQUEST(KVM_SET_CPUID);
-#endif
-    IOCTL_REQUEST(KVM_SET_FPU);
-    IOCTL_REQUEST(KVM_KVMCLOCK_CTRL);
-#ifdef KVM_GET_SREGS2
-#if 0 // needs `struct kvm_xcrs`
-    IOCTL_REQUEST(KVM_GET_SREGS2);
-#endif
-#endif
-    IOCTL_REQUEST(KVM_PPC_GET_PVINFO);
-    IOCTL_REQUEST(KVM_X86_GET_MCE_CAP_SUPPORTED);
-    IOCTL_REQUEST(KVM_S390_GET_IRQ_STATE);
-#if 0 // needs `struct kvm_xcrs`
-    IOCTL_REQUEST(KVM_GET_XCRS);
-#endif
-    IOCTL_REQUEST(KVM_GET_DEVICE_ATTR);
-    IOCTL_REQUEST(KVM_S390_INITIAL_RESET);
-    IOCTL_REQUEST(KVM_SET_REGS);
-#if 0 // needs `struct kvm_msr_list`
-    IOCTL_REQUEST(KVM_GET_MSR_INDEX_LIST);
-#endif
-#if 0 // needs `struct kvm_msrs`
-    IOCTL_REQUEST(KVM_SET_MSRS);
-#endif
-    IOCTL_REQUEST(KVM_GET_TSC_KHZ);
-#if 0 // needs `struct kvm_ppc_mmuv3_cfg`
-    IOCTL_REQUEST(KVM_PPC_CONFIGURE_V3_MMU);
-#endif
-    IOCTL_REQUEST(KVM_CHECK_EXTENSION);
-    IOCTL_REQUEST(KVM_PPC_RESIZE_HPT_COMMIT);
-    IOCTL_REQUEST(KVM_GET_DIRTY_LOG);
-    IOCTL_REQUEST(KVM_S390_SET_IRQ_STATE);
-    IOCTL_REQUEST(KVM_S390_NORMAL_RESET);
-#if 0 // needs `struct kvm_lapic_state`
-    IOCTL_REQUEST(KVM_SET_LAPIC);
-#endif
-    IOCTL_REQUEST(KVM_SET_SIGNAL_MASK);
-#if 0 // needs `struct kvm_pit_state`
-    IOCTL_REQUEST(KVM_GET_PIT);
-#endif
-#if 0 // needs `struct kvm_arm_copy_mte_tags`
-    IOCTL_REQUEST(KVM_ARM_MTE_COPY_TAGS);
-#endif
-#if 0 // needs `struct kvm_ppc_cpu_char`
-    IOCTL_REQUEST(KVM_PPC_GET_CPU_CHAR);
-#endif
-#if 0 // needs `struct kvm_vcpu_events`
-    IOCTL_REQUEST(KVM_GET_VCPU_EVENTS);
-#endif
-    IOCTL_REQUEST(KVM_XEN_VCPU_SET_ATTR);
-    IOCTL_REQUEST(KVM_SET_GSI_ROUTING);
-    IOCTL_REQUEST(KVM_CREATE_VCPU);
-    IOCTL_REQUEST(KVM_S390_UCAS_UNMAP);
-    IOCTL_REQUEST(KVM_S390_STORE_STATUS);
-    IOCTL_REQUEST(KVM_UNREGISTER_COALESCED_MMIO);
-    IOCTL_REQUEST(KVM_ASSIGN_DEV_IRQ);
-    IOCTL_REQUEST(KVM_S390_PV_COMMAND);
-    IOCTL_REQUEST(KVM_S390_ENABLE_SIE);
-    IOCTL_REQUEST(KVM_CLEAR_DIRTY_LOG);
-    IOCTL_REQUEST(KVM_GET_ONE_REG);
-#if 0 // needs `struct kvm_ppc_rmmu_info`
-    IOCTL_REQUEST(KVM_PPC_GET_RMMU_INFO);
-#endif
-    IOCTL_REQUEST(KVM_ARM_SET_DEVICE_ADDR);
-    IOCTL_REQUEST(KVM_DIRTY_TLB);
-    IOCTL_REQUEST(KVM_NMI);
-    IOCTL_REQUEST(KVM_HYPERV_EVENTFD);
-    IOCTL_REQUEST(KVM_S390_MEM_OP);
-#if 0 // needs `struct kvm_pit_state2`
-    IOCTL_REQUEST(KVM_GET_PIT2);
-#endif
-    IOCTL_REQUEST(KVM_PPC_SVM_OFF);
-    IOCTL_REQUEST(KVM_PPC_RESIZE_HPT_PREPARE);
-#if 0 // needs `struct kvm_cpuid2`
-    IOCTL_REQUEST(KVM_GET_SUPPORTED_HV_CPUID);
-#endif
-    IOCTL_REQUEST(KVM_INTERRUPT);
-#if 0 // needs `struct kvm_create_spapr_tce`
-    IOCTL_REQUEST(KVM_CREATE_SPAPR_TCE);
-#endif
-    IOCTL_REQUEST(KVM_XEN_HVM_GET_ATTR);
-#if 0 // needs `struct kvm_xsave`
-    IOCTL_REQUEST(KVM_GET_XSAVE);
-#endif
-    IOCTL_REQUEST(KVM_GET_SREGS);
-    IOCTL_REQUEST(KVM_SET_IDENTITY_MAP_ADDR);
-#if 0 // needs `struct kvm_msr_list`
-    IOCTL_REQUEST(KVM_GET_MSR_FEATURE_INDEX_LIST);
-#endif
-#if 0 // needs `struct kvm_vcpu_init`
-    IOCTL_REQUEST(KVM_ARM_VCPU_INIT);
-#endif
-#if 0 // needs `struct kvm_cpuid2`
-    IOCTL_REQUEST(KVM_GET_CPUID2);
-#endif
-    IOCTL_REQUEST(KVM_GET_REGS);
-#if 0 // needs `struct kvm_msrs`
-    IOCTL_REQUEST(KVM_GET_MSRS);
-#endif
-    IOCTL_REQUEST(KVM_S390_GET_CMMA_BITS);
-    IOCTL_REQUEST(KVM_CREATE_IRQCHIP);
-    IOCTL_REQUEST(KVM_ASSIGN_PCI_DEVICE);
-    IOCTL_REQUEST(KVM_SET_NR_MMU_PAGES);
-    IOCTL_REQUEST(KVM_IOEVENTFD);
-#if 0 // needs `struct kvm_pit_state`
-    IOCTL_REQUEST(KVM_SET_PIT);
-#endif
-    IOCTL_REQUEST(KVM_RUN);
-    IOCTL_REQUEST(KVM_S390_SET_SKEYS);
-    IOCTL_REQUEST(KVM_SET_DEVICE_ATTR);
-    IOCTL_REQUEST(KVM_DEASSIGN_DEV_IRQ);
-    IOCTL_REQUEST(KVM_SMI);
-    IOCTL_REQUEST(KVM_SET_TSS_ADDR);
-    IOCTL_REQUEST(KVM_GET_NR_MMU_PAGES);
-    IOCTL_REQUEST(KVM_XEN_VCPU_GET_ATTR);
-#if 0 // needs `struct kvm_debugregs`
-    IOCTL_REQUEST(KVM_GET_DEBUGREGS);
-#endif
-    IOCTL_REQUEST(KVM_REINJECT_CONTROL);
-    IOCTL_REQUEST(KVM_HAS_DEVICE_ATTR);
-#if 0 // needs `struct kvm_memory_alias`
-    IOCTL_REQUEST(KVM_SET_MEMORY_ALIAS);
-#endif
-    IOCTL_REQUEST(KVM_IRQFD);
-#if 0 // needs `struct kvm_vcpu_events`
-    IOCTL_REQUEST(KVM_SET_VCPU_EVENTS);
-#endif
-#if 0 // needs `struct kvm_debugregs`
-    IOCTL_REQUEST(KVM_SET_DEBUGREGS);
-#endif
-    IOCTL_REQUEST(KVM_S390_SET_CMMA_BITS);
-#if 0 // needs `struct kvm_lapic_state`
-    IOCTL_REQUEST(KVM_GET_LAPIC);
-#endif
-    IOCTL_REQUEST(KVM_SET_IRQCHIP);
-#ifdef KVM_SET_SREGS2
-#if 0 // needs `struct kvm_xcrs`
-    IOCTL_REQUEST(KVM_SET_SREGS2);
-#endif
-#endif
-    IOCTL_REQUEST(KVM_SIGNAL_MSI);
-    IOCTL_REQUEST(KVM_GET_VCPU_MMAP_SIZE);
-    IOCTL_REQUEST(KVM_CREATE_VM);
-#if 0 // needs `struct kvm_allocate_rma`
-    IOCTL_REQUEST(KVM_ALLOCATE_RMA);
-#endif
-    IOCTL_REQUEST(KVM_S390_CLEAR_RESET);
-    IOCTL_REQUEST(KVM_RESET_DIRTY_RINGS);
-    IOCTL_REQUEST(KVM_ASSIGN_SET_MSIX_NR);
-    IOCTL_REQUEST(KVM_CREATE_PIT);
-    IOCTL_REQUEST(KVM_SET_GUEST_DEBUG);
-    IOCTL_REQUEST(KVM_GET_REG_LIST);
-    IOCTL_REQUEST(KVM_ARM_VCPU_FINALIZE);
-#if 0 // needs `struct kvm_cpuid2`
-    IOCTL_REQUEST(KVM_SET_CPUID2);
-#endif
-#if 0 // needs `struct kvm_pit_state2`
-    IOCTL_REQUEST(KVM_SET_PIT2);
-#endif
-    IOCTL_REQUEST(KVM_SET_CLOCK);
-    IOCTL_REQUEST(KVM_PPC_ALLOCATE_HTAB);
-    IOCTL_REQUEST(KVM_PPC_GET_SMMU_INFO);
-#if 0 // needs `struct kvm_msr_filter`
-    IOCTL_REQUEST(KVM_X86_SET_MSR_FILTER);
-#endif
-    IOCTL_REQUEST(KVM_SET_TSC_KHZ);
-    IOCTL_REQUEST(KVM_S390_IRQ);
-    IOCTL_REQUEST(KVM_ENABLE_CAP);
-    IOCTL_REQUEST(KVM_IRQ_LINE);
-    IOCTL_REQUEST(KVM_SET_SREGS);
-    IOCTL_REQUEST(KVM_MEMORY_ENCRYPT_UNREG_REGION);
-#if 0 // needs `struct kvm_cpuid2`
-    IOCTL_REQUEST(KVM_GET_EMULATED_CPUID);
-#endif
-#if 0 // needs `struct kvm_pmu_event_filter`
-    IOCTL_REQUEST(KVM_SET_PMU_EVENT_FILTER);
-#endif
-#ifdef KVM_GET_STATS_FD
-    IOCTL_REQUEST(KVM_GET_STATS_FD);
-#endif
-#endif
     IOCTL_REQUEST(USBDEVFS_CLAIMINTERFACE);
     IOCTL_REQUEST(CHIOMOVE);
     IOCTL_REQUEST(SONYPI_IOCGBATFLAGS);

gen/ioctl/main.c

@@ -31,10 +31,10 @@ int main(void) {
     printf("#ifdef __arm__\n");
 #elif defined(__aarch64__)
     printf("#ifdef __aarch64__\n");
-#elif defined(__powerpc__)
-    printf("#ifdef __powerpc__\n");
 #elif defined(__powerpc64__)
     printf("#ifdef __powerpc64__\n");
+#elif defined(__powerpc__) && !defined(__powerpc64__)
+    printf("#if defined(__powerpc__) && !defined(__powerpc64__)\n");
 #elif __mips == 32
     printf("#if __mips == 32\n");
 #elif __mips == 64