diff options
92 files changed, 126 insertions, 128 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 9c857eeb07..5357608b14 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -28,7 +28,6 @@ #include "exec/exec-all.h" #include "tcg/tcg.h" #include "qemu/atomic.h" -#include "qemu/compiler.h" #include "qemu/timer.h" #include "qemu/rcu.h" #include "exec/log.h" diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c index 632b0e3825..3fde01fdbd 100644 --- a/audio/sndioaudio.c +++ b/audio/sndioaudio.c @@ -14,9 +14,9 @@ * to recording, which is what guest systems expect. */ +#include "qemu/osdep.h" #include <poll.h> #include <sndio.h> -#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "audio.h" #include "trace.h" diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c index 037292d267..4e162d6789 100644 --- a/backends/hostmem-epc.c +++ b/backends/hostmem-epc.c @@ -9,9 +9,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include <sys/ioctl.h> #include "qemu/osdep.h" +#include <sys/ioctl.h> #include "qom/object_interfaces.h" #include "qapi/error.h" #include "sysemu/hostmem.h" diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 67e7b212e3..d18144b92e 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -35,7 +35,6 @@ #include "sysemu/runstate.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm_util.h" -#include "sysemu/runstate.h" #include "tpm_int.h" #include "tpm_ioctl.h" #include "migration/blocker.h" diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h index e506ef5160..b1d31768a6 100644 --- a/backends/tpm/tpm_ioctl.h +++ b/backends/tpm/tpm_ioctl.h @@ -12,8 +12,6 @@ # define __USE_LINUX_IOCTL_DEFS #endif -#include <stdint.h> -#include <sys/types.h> #ifndef _WIN32 #include <sys/uio.h> #include <sys/ioctl.h> diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c index 350d6fdaf0..f7ae44e3ce 100644 --- a/block/export/vduse-blk.c +++ b/block/export/vduse-blk.c @@ -10,9 +10,9 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <sys/eventfd.h> -#include "qemu/osdep.h" #include "qapi/error.h" #include "block/export.h" #include "qemu/error-report.h" diff --git a/block/qapi.c b/block/qapi.c index d52f1ab614..c84147849d 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -40,7 +40,6 @@ #include "qapi/qmp/qstring.h" #include "qemu/qemu-print.h" #include "sysemu/block-backend.h" -#include "qemu/cutils.h" BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs, diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c index 2b1dd745d1..9734407543 100644 --- a/bsd-user/arm/signal.c +++ b/bsd-user/arm/signal.c @@ -17,6 +17,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu.h" /* diff --git a/bsd-user/arm/target_arch_cpu.c b/bsd-user/arm/target_arch_cpu.c index 02bf9149d5..fe38ae2210 100644 --- a/bsd-user/arm/target_arch_cpu.c +++ b/bsd-user/arm/target_arch_cpu.c @@ -16,6 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ + +#include "qemu/osdep.h" #include "target_arch.h" void target_cpu_set_tls(CPUARMState *env, target_ulong newtls) diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h index 68b66e571d..a1061bffb8 100644 --- a/bsd-user/bsd-proc.h +++ b/bsd-user/bsd-proc.h @@ -20,11 +20,7 @@ #ifndef BSD_PROC_H_ #define BSD_PROC_H_ -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> /* exit(2) */ static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1) diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c index 309e27b9d6..1676ec10f8 100644 --- a/bsd-user/freebsd/os-sys.c +++ b/bsd-user/freebsd/os-sys.c @@ -17,6 +17,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu.h" #include "target_arch_sysarch.h" diff --git a/bsd-user/i386/signal.c b/bsd-user/i386/signal.c index 5dd975ce56..a3131047b8 100644 --- a/bsd-user/i386/signal.c +++ b/bsd-user/i386/signal.c @@ -17,6 +17,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu.h" /* diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cpu.c index d349e45299..2a3af2ddef 100644 --- a/bsd-user/i386/target_arch_cpu.c +++ b/bsd-user/i386/target_arch_cpu.c @@ -17,9 +17,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/types.h> - #include "qemu/osdep.h" + #include "cpu.h" #include "qemu.h" #include "qemu/timer.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index 6f09180d65..41290e16f9 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -18,12 +18,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/types.h> -#include <sys/time.h> +#include "qemu/osdep.h" #include <sys/resource.h> #include <sys/sysctl.h> -#include "qemu/osdep.h" #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index be6105385e..0ceecfb6df 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -17,7 +17,6 @@ #ifndef QEMU_H #define QEMU_H -#include "qemu/osdep.h" #include "cpu.h" #include "qemu/units.h" #include "exec/cpu_ldst.h" diff --git a/bsd-user/strace.c b/bsd-user/strace.c index a77d10dd6b..96499751eb 100644 --- a/bsd-user/strace.c +++ b/bsd-user/strace.c @@ -20,7 +20,6 @@ #include <sys/select.h> #include <sys/syscall.h> #include <sys/ioccom.h> -#include <ctype.h> #include "qemu.h" diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c index c3875bc4c6..46cb865180 100644 --- a/bsd-user/x86_64/signal.c +++ b/bsd-user/x86_64/signal.c @@ -16,6 +16,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu.h" /* diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arch_cpu.c index be7bd10720..1d32f18907 100644 --- a/bsd-user/x86_64/target_arch_cpu.c +++ b/bsd-user/x86_64/target_arch_cpu.c @@ -17,9 +17,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/types.h> - #include "qemu/osdep.h" + #include "cpu.h" #include "qemu.h" #include "qemu/timer.h" diff --git a/crypto/block-luks-priv.h b/crypto/block-luks-priv.h index dc2dd14e52..8fc967afcb 100644 --- a/crypto/block-luks-priv.h +++ b/crypto/block-luks-priv.h @@ -18,7 +18,6 @@ * */ -#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/bswap.h" diff --git a/fsdev/p9array.h b/fsdev/p9array.h index 90e83a7c7b..50a1b15fe9 100644 --- a/fsdev/p9array.h +++ b/fsdev/p9array.h @@ -27,8 +27,6 @@ #ifndef QEMU_P9ARRAY_H #define QEMU_P9ARRAY_H -#include "qemu/compiler.h" - /** * P9Array provides a mechanism to access arrays in common C-style (e.g. by * square bracket [] operator) in conjunction with reference variables that diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 072cf67956..9621ec1341 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -19,8 +19,6 @@ #include "qemu/osdep.h" #ifdef CONFIG_LINUX #include <linux/limits.h> -#else -#include <limits.h> #endif #include <glib/gprintf.h> #include "hw/virtio/virtio.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 724294b378..eac2125abd 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -34,7 +34,6 @@ #include "sysemu/xen.h" #include "qapi/error.h" #include "qemu/range.h" -#include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" #include "hw/hotplug.h" diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index c502c8c62a..4161f559a7 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -18,7 +18,6 @@ #include "net/net.h" #include "qemu/cutils.h" #include "qemu/datadir.h" -#include "net/net.h" static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) { diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ba47728288..75f28947de 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -33,7 +33,6 @@ #include "qemu/units.h" #include "qemu/option.h" #include "monitor/qdev.h" -#include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 57276e1506..69b1b99e93 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -22,7 +22,6 @@ #include "hw/misc/unimp.h" #include "hw/arm/xlnx-versal.h" #include "qemu/log.h" -#include "hw/sysbus.h" #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 36d68c70f6..3c066e3405 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -45,7 +45,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/bitops.h" -#include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index b5cd42cd8c..f73fc4c45c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,7 +39,6 @@ #include "exec/confidential-guest-support.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" -#include "qom/object_interfaces.h" GlobalProperty hw_compat_7_2[] = { { "virtio-mem", "x-early-migration", "false" }, diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index 8bdf4bac6e..847fa4c0cc 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -21,7 +21,6 @@ #include "exec/ramblock.h" #include "sysemu/hostmem.h" #include <sys/ioctl.h> -#include <fcntl.h> #include <linux/memfd.h> #include "qemu/memfd.h" #include "standard-headers/linux/udmabuf.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index de1cc7ab71..7ac68c943f 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "net/net.h" #include "qemu/log.h" -#include "net/net.h" #define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */ diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index 16d04cfdc6..94fe1b534b 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -5,8 +5,8 @@ * See the COPYING file in the top-level directory. */ -#include "qemu/ctype.h" #include "qemu/osdep.h" +#include "qemu/ctype.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/sockets.h" diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 4071a88cfc..c3d6046784 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include <math.h> -#include <string.h> #include "hw/i2c/pmbus_device.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 145389aa58..b67dcbbb37 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -76,7 +76,6 @@ #include "hw/acpi/hmat.h" #include "hw/acpi/viot.h" -#include "hw/acpi/cxl.h" #include CONFIG_DEVICES diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index fdd5ff87d9..7eae5989f7 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "qemu/log.h" #include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index c2b237736d..f551296a0e 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -22,7 +22,6 @@ /* Supported chipsets: */ #include "hw/pci-host/ls7a.h" #include "hw/loongarch/virt.h" -#include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 7208b90e12..6336dcb194 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -28,7 +28,6 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/cuda.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "sysemu/rtc.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 8575bc1264..58316d1871 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -33,7 +33,6 @@ #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/macio/pmu.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/runstate.h" #include "sysemu/rtc.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 7e00965323..5b19a01eaa 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -31,7 +31,6 @@ #include "net/net.h" #include "net/checksum.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/stream.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index c973cfb04e..0cc68178ad 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -38,8 +38,6 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/intc/ppc-uic.h" -#include "hw/qdev-properties.h" -#include "qapi/error.h" #include "trace.h" /*****************************************************************************/ diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 81d71adf34..2880c81cb1 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu/error-report.h" #include "qemu/datadir.h" #include "qemu/error-report.h" #include "net/net.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 4923435a8b..b5c400a94d 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -17,7 +17,6 @@ #include "hw/ppc/spapr_drc.h" #include "qom/object.h" #include "migration/vmstate.h" -#include "qapi/error.h" #include "qapi/qapi-events-qdev.h" #include "qapi/visitor.h" #include "qemu/error-report.h" diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c index 598e6adc5e..30ce22a5be 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.c +++ b/hw/rdma/vmw/pvrdma_dev_ring.c @@ -14,7 +14,6 @@ */ #include "qemu/osdep.h" -#include "qemu/cutils.h" #include "hw/pci/pci.h" #include "cpu.h" #include "qemu/cutils.h" diff --git a/hw/remote/machine.c b/hw/remote/machine.c index 519f855ec1..fdc6c441bb 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -22,7 +22,6 @@ #include "hw/remote/iohub.h" #include "hw/remote/iommu.h" #include "hw/qdev-core.h" -#include "hw/remote/iommu.h" #include "hw/remote/vfio-user-obj.h" #include "hw/pci/msi.h" diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c index eb9918fe72..18d96a1d04 100644 --- a/hw/remote/proxy-memory-listener.c +++ b/hw/remote/proxy-memory-listener.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" -#include "qemu/compiler.h" #include "qemu/int128.h" #include "qemu/range.h" #include "exec/memory.h" diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c index 333e5ac443..65b6f7cc86 100644 --- a/hw/remote/remote-obj.c +++ b/hw/remote/remote-obj.c @@ -12,7 +12,6 @@ #include "qemu/error-report.h" #include "qemu/notify.h" #include "qom/object_interfaces.h" -#include "hw/qdev-core.h" #include "io/channel.h" #include "hw/qdev-core.h" #include "hw/remote/machine.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index bc1192b7ae..ba612a151d 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -43,7 +43,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" -#include "hw/rtc/mc146818rtc_regs.h" //#define DEBUG_CMOS //#define DEBUG_COALESCED diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index bf8057880f..8f8d2302f8 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -15,7 +15,6 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" -#include "hw/virtio/virtio-serial.h" #define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw" OBJECT_DECLARE_SIMPLE_TYPE(VirtioSerialCcw, VIRTIO_SERIAL_CCW) diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c index 7310c769be..8f4a1c2cd4 100644 --- a/hw/sensor/adm1272.c +++ b/hw/sensor/adm1272.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include <string.h> #include "hw/i2c/pmbus_device.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c index b24b3148c2..1e5c5c711f 100644 --- a/hw/usb/dev-storage-bot.c +++ b/hw/usb/dev-storage-bot.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "hw/usb.h" #include "hw/usb/desc.h" diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c index 00f25bade2..84d19752b5 100644 --- a/hw/usb/dev-storage-classic.c +++ b/hw/usb/dev-storage-classic.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/usb.h" diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h index 3ab924d5e2..18cc14de22 100644 --- a/include/block/graph-lock.h +++ b/include/block/graph-lock.h @@ -20,7 +20,6 @@ #ifndef GRAPH_LOCK_H #define GRAPH_LOCK_H -#include "qemu/osdep.h" #include "qemu/clang-tsa.h" /** diff --git a/include/block/write-threshold.h b/include/block/write-threshold.h index f50f923e7e..63d1583887 100644 --- a/include/block/write-threshold.h +++ b/include/block/write-threshold.h @@ -13,8 +13,6 @@ #ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H -#include "qemu/typedefs.h" - /* * bdrv_write_threshold_set: * diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 7812e516a5..1952cb984d 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -30,7 +30,6 @@ #include "hw/timer/imx_gpt.h" #include "hw/timer/imx_epit.h" #include "hw/i2c/imx_i2c.h" -#include "hw/gpio/imx_gpio.h" #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 4e5e071864..355bd8ea83 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -32,7 +32,6 @@ #include "hw/timer/imx_gpt.h" #include "hw/timer/imx_epit.h" #include "hw/i2c/imx_i2c.h" -#include "hw/gpio/imx_gpio.h" #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h index 5dca21e95b..692d7a5507 100644 --- a/include/hw/cxl/cxl_component.h +++ b/include/hw/cxl/cxl_component.h @@ -15,9 +15,7 @@ #define CXL2_COMPONENT_CM_REGION_SIZE 0x1000 #define CXL2_COMPONENT_BLOCK_SIZE 0x10000 -#include "qemu/compiler.h" #include "qemu/range.h" -#include "qemu/typedefs.h" #include "hw/cxl/cxl_cdat.h" #include "hw/register.h" #include "qapi/error.h" diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h index a1b662ce40..c9bc9c7c50 100644 --- a/include/hw/cxl/cxl_host.h +++ b/include/hw/cxl/cxl_host.h @@ -7,7 +7,6 @@ * COPYING file in the top-level directory. */ -#include "qemu/osdep.h" #include "hw/cxl/cxl.h" #include "hw/boards.h" diff --git a/include/hw/cxl/cxl_pci.h b/include/hw/cxl/cxl_pci.h index 01e15ed5b4..407be95b9e 100644 --- a/include/hw/cxl/cxl_pci.h +++ b/include/hw/cxl/cxl_pci.h @@ -10,7 +10,6 @@ #ifndef CXL_PCI_H #define CXL_PCI_H -#include "qemu/compiler.h" #define CXL_VENDOR_ID 0x1e98 diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index 89ec4fafc9..4cb8985f31 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -10,7 +10,6 @@ #ifndef HW_PL050_H #define HW_PL050_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fd228731d2..fa398959af 100644 --- a/include/hw/misc/aspeed_lpc.h +++ b/include/hw/misc/aspeed_lpc.h @@ -12,8 +12,6 @@ #include "hw/sysbus.h" -#include <stdint.h> - #define TYPE_ASPEED_LPC "aspeed.lpc" #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC) diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h index ba4d8b03bd..87dc17dcef 100644 --- a/include/hw/pci/pcie_doe.h +++ b/include/hw/pci/pcie_doe.h @@ -11,7 +11,6 @@ #define PCIE_DOE_H #include "qemu/range.h" -#include "qemu/typedefs.h" #include "hw/register.h" /* diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h index 094c8bd563..4fdd2d7d97 100644 --- a/include/hw/tricore/triboard.h +++ b/include/hw/tricore/triboard.h @@ -18,7 +18,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/boards.h" #include "sysemu/sysemu.h" diff --git a/include/qemu/async-teardown.h b/include/qemu/async-teardown.h index 092e7a37e7..b281da005b 100644 --- a/include/qemu/async-teardown.h +++ b/include/qemu/async-teardown.h @@ -13,8 +13,6 @@ #ifndef QEMU_ASYNC_TEARDOWN_H #define QEMU_ASYNC_TEARDOWN_H -#include "config-host.h" - #ifdef CONFIG_LINUX void init_async_teardown(void); #endif diff --git a/include/qemu/dbus.h b/include/qemu/dbus.h index 08f00dfd53..81d3de8a5a 100644 --- a/include/qemu/dbus.h +++ b/include/qemu/dbus.h @@ -15,7 +15,6 @@ #include "qom/object.h" #include "chardev/char.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" /* glib/gio 2.68 */ #define DBUS_METHOD_INVOCATION_HANDLED TRUE diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 88d476161c..3ce62bf4a5 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -30,7 +30,6 @@ #ifndef HOST_UTILS_H #define HOST_UTILS_H -#include "qemu/compiler.h" #include "qemu/bswap.h" #include "qemu/int128.h" diff --git a/include/qemu/userfaultfd.h b/include/qemu/userfaultfd.h index d764496f0b..18a4314212 100644 --- a/include/qemu/userfaultfd.h +++ b/include/qemu/userfaultfd.h @@ -15,7 +15,6 @@ #ifdef CONFIG_LINUX -#include "qemu/osdep.h" #include "exec/hwaddr.h" #include <linux/userfaultfd.h> diff --git a/include/sysemu/accel-blocker.h b/include/sysemu/accel-blocker.h index 72020529ef..0733783bcc 100644 --- a/include/sysemu/accel-blocker.h +++ b/include/sysemu/accel-blocker.h @@ -14,7 +14,6 @@ #ifndef ACCEL_BLOCKER_H #define ACCEL_BLOCKER_H -#include "qemu/osdep.h" #include "sysemu/cpus.h" extern void accel_blocker_init(void); diff --git a/include/sysemu/event-loop-base.h b/include/sysemu/event-loop-base.h index 2748bf6ae1..a6c24f1351 100644 --- a/include/sysemu/event-loop-base.h +++ b/include/sysemu/event-loop-base.h @@ -14,7 +14,6 @@ #include "qom/object.h" #include "block/aio.h" -#include "qemu/typedefs.h" #define TYPE_EVENT_LOOP_BASE "event-loop-base" OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass, diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index b98e95dab0..53299b7a5e 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "qemu/rcu.h" #include "qemu/madvise.h" #include "exec/target_page.h" #include "migration.h" @@ -34,7 +33,6 @@ #include "hw/boards.h" #include "exec/ramblock.h" #include "socket.h" -#include "qemu-file.h" #include "yank_functions.h" #include "tls.h" #include "qemu/userfaultfd.h" diff --git a/net/vmnet_int.h b/net/vmnet_int.h index adf6e8c20d..d0b90594f2 100644 --- a/net/vmnet_int.h +++ b/net/vmnet_int.h @@ -10,7 +10,6 @@ #ifndef VMNET_INT_H #define VMNET_INT_H -#include "qemu/osdep.h" #include "vmnet_int.h" #include "clients.h" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ebd33a643c..079689d79a 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -51,7 +51,6 @@ #else #include <net/ethernet.h> #endif -#include <sys/types.h> #ifdef CONFIG_SOLARIS #include <sys/sockio.h> #endif diff --git a/qga/cutils.c b/qga/cutils.c index b8e142ef64..b21bcf3683 100644 --- a/qga/cutils.c +++ b/qga/cutils.c @@ -2,8 +2,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include "cutils.h" +#include "qemu/osdep.h" +#include "cutils.h" #include "qapi/error.h" /** diff --git a/qga/cutils.h b/qga/cutils.h index f0f30a7d28..c1f2f4b17a 100644 --- a/qga/cutils.h +++ b/qga/cutils.h @@ -1,8 +1,6 @@ #ifndef CUTILS_H_ #define CUTILS_H_ -#include "qemu/osdep.h" - int qga_open_cloexec(const char *name, int flags, mode_t mode); #endif /* CUTILS_H_ */ diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml index 42b0471634..0d094d70c3 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -10,6 +10,14 @@ check_mode: yes register: centos_stream_8 + - name: Enable EPEL repo on CentOS Stream 8 + dnf: + name: + - epel-release + state: present + when: + - centos_stream_8 + - name: Enable PowerTools repo on CentOS Stream 8 ini_file: path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo @@ -17,19 +25,31 @@ option: enabled value: "1" when: - - ansible_facts['distribution'] == 'CentOS' - - ansible_facts['distribution_major_version'] == '8' - centos_stream_8 - name: Install basic packages to build QEMU on CentOS Stream 8 dnf: name: + - bzip2 + - bzip2-devel + - capstone-devel + - dbus-daemon - device-mapper-multipath-devel + - diffutils + - gcc + - gcc-c++ + - genisoimage + - gettext + - git + - glib2-devel - glusterfs-api-devel - gnutls-devel + - libaio-devel - libcap-ng-devel - libcurl-devel + - libepoxy-devel - libfdt-devel + - libgcrypt-devel - libiscsi-devel - libpmem-devel - librados-devel @@ -37,15 +57,25 @@ - libseccomp-devel - libssh-devel - libxkbcommon-devel + - lzo-devel + - make + - mesa-libEGL-devel + - nettle-devel - ninja-build + - nmap-ncat - numactl-devel + - pixman-devel + - python38 - python3-sphinx + - rdma-core-devel - redhat-rpm-config - snappy-devel + - spice-glib-devel - spice-server-devel - systemd-devel + - systemtap-sdt-devel + - tar + - zlib-devel state: present when: - - ansible_facts['distribution'] == 'CentOS' - - ansible_facts['distribution_major_version'] == '8' - centos_stream_8 diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index 75882faa9c..65eacf3c56 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -16,6 +16,7 @@ # that patches adding downstream specific devices are not available. # ../configure \ +--python=/usr/bin/python3.8 \ --prefix="/usr" \ --libdir="/usr/lib64" \ --datadir="/usr/share" \ diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 58438008ee..78b1021cd4 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -46,6 +46,7 @@ - libbrlapi-dev - libbz2-dev - libcacard-dev + - libcapstone-dev - libcap-ng-dev - libcurl4-gnutls-dev - libdrm-dev @@ -130,6 +131,25 @@ - ansible_facts['distribution_version'] == '20.04' - ansible_facts['architecture'] == 'aarch64' + - name: Enable EPEL repo on EL8 + dnf: + name: + - epel-release + state: present + when: + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] + - ansible_facts['distribution_major_version'] == '8' + + - name: Enable PowerTools repo on CentOS 8 + ini_file: + path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo + section: powertools + option: enabled + value: "1" + when: + - ansible_facts['distribution_file_variety'] == 'CentOS' + - ansible_facts['distribution_major_version'] == '8' + - name: Install basic packages to build QEMU on EL8 dnf: # This list of packages start with tests/docker/dockerfiles/centos8.docker @@ -138,7 +158,9 @@ name: - bzip2 - bzip2-devel + - capstone-devel - dbus-daemon + - device-mapper-multipath-devel - diffutils - gcc - gcc-c++ @@ -146,25 +168,42 @@ - gettext - git - glib2-devel + - glusterfs-api-devel + - gnutls-devel - libaio-devel + - libcap-ng-devel + - libcurl-devel - libepoxy-devel + - libfdt-devel - libgcrypt-devel + - libiscsi-devel + - libpmem-devel + - librados-devel + - librbd-devel + - libseccomp-devel + - libssh-devel + - libxkbcommon-devel - lzo-devel - make - mesa-libEGL-devel - nettle-devel - ninja-build - nmap-ncat + - numactl-devel - pixman-devel - - python36 + - python38 + - python3-sphinx - rdma-core-devel + - redhat-rpm-config + - snappy-devel - spice-glib-devel + - systemd-devel - systemtap-sdt-devel - tar - zlib-devel state: present when: - - ansible_facts['distribution_file_variety'] == 'RedHat' + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - ansible_facts['distribution_version'] == '8' - name: Install packages only available on x86 and aarch64 @@ -172,8 +211,21 @@ # Spice server not available in ppc64le name: - spice-server + - spice-server-devel state: present when: - - ansible_facts['distribution_file_variety'] == 'RedHat' + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] - ansible_facts['distribution_version'] == '8' - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' + + - name: Check whether the Python runtime version is managed by alternatives + stat: + path: /etc/alternatives/python3 + register: python3 + + - name: Set default Python runtime to 3.8 on EL8 + command: alternatives --set python3 /usr/bin/python3.8 + when: + - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS'] + - ansible_facts['distribution_version'] == '8' + - python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.8' diff --git a/scripts/clean-includes b/scripts/clean-includes index d37bd4f692..58e1607a82 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -111,7 +111,12 @@ cat >"$COCCIFILE" <<EOT ) EOT +files= for f in "$@"; do + if [ -L "$f" ]; then + echo "SKIPPING $f (symbolic link)" + continue + fi case "$f" in *.c.inc) # These aren't standalone C source files @@ -144,6 +149,7 @@ for f in "$@"; do continue ;; esac + files="$files $f" if [ "$MODE" = "c" ]; then # First, use Coccinelle to add qemu/osdep.h before the first existing include @@ -174,25 +180,30 @@ for f in "$@"; do done -if [ "$DUPHEAD" = "yes" ]; then - egrep "^[[:space:]]*#[[:space:]]*include" "$@" | tr -d '[:blank:]' \ - | sort | uniq -c | awk '{if ($1 > 1) print $0}' - if [ $? -eq 0 ]; then +if [ "$DUPHEAD" = "yes" ] && [ -n "$files" ]; then + if egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \ + | sort | uniq -c | grep -v '^ *1 '; then echo "Found duplicate header file includes. Please check the above files manually." exit 1 fi fi if [ "$GIT" = "yes" ]; then - git add -- "$@" + git add -- $files git commit --signoff -F - <<EOF $GITSUBJ: Clean up includes -Clean up includes so that osdep.h is included first and headers -which it implies are not included manually. - This commit was created with scripts/clean-includes. +All .c should include qemu/osdep.h first. The script performs three +related cleanups: + +* Ensure .c files include qemu/osdep.h first. +* Including it in a .h is redundant, since the .c already includes + it. Drop such inclusions. +* Likewise, including headers qemu/osdep.h includes is redundant. + Drop these, too. + EOF fi diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c index 12668555f2..c56f0f58c8 100644 --- a/softmmu/dirtylimit.c +++ b/softmmu/dirtylimit.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qmp/qdict.h" diff --git a/softmmu/runstate.c b/softmmu/runstate.c index cab9f6fc07..f9ad88e6a7 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -41,7 +41,6 @@ #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-events-run-state.h" #include "qemu/error-report.h" -#include "qemu/log.h" #include "qemu/job.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/softmmu/vl.c b/softmmu/vl.c index 9177d95d4e..b2ee3fee3f 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -129,15 +129,12 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-visit-qom.h" #include "qapi/qapi-commands-ui.h" -#include "qapi/qmp/qdict.h" #include "block/qdict.h" #include "qapi/qmp/qerror.h" #include "sysemu/iothread.h" #include "qemu/guest-random.h" #include "qemu/keyval.h" -#include "config-host.h" - #define MAX_VIRTIO_CONSOLES 1 typedef struct BlockdevOptionsQueueEntry { diff --git a/target/hexagon/hex_arch_types.h b/target/hexagon/hex_arch_types.h index 885f68f760..52a7f2b2f3 100644 --- a/target/hexagon/hex_arch_types.h +++ b/target/hexagon/hex_arch_types.h @@ -18,7 +18,6 @@ #ifndef HEXAGON_HEX_ARCH_TYPES_H #define HEXAGON_HEX_ARCH_TYPES_H -#include "qemu/osdep.h" #include "mmvec/mmvec.h" #include "qemu/int128.h" diff --git a/target/hexagon/mmvec/macros.h b/target/hexagon/mmvec/macros.h index 8c864e8c68..1201d778d0 100644 --- a/target/hexagon/mmvec/macros.h +++ b/target/hexagon/mmvec/macros.h @@ -18,7 +18,6 @@ #ifndef HEXAGON_MMVEC_MACROS_H #define HEXAGON_MMVEC_MACROS_H -#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "arch.h" #include "mmvec/system_ext_mmvec.h" diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c index 38ced69803..72a6275665 100644 --- a/target/loongarch/translate.c +++ b/target/loongarch/translate.c @@ -12,7 +12,6 @@ #include "exec/helper-proto.h" #include "exec/helper-gen.h" -#include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h" #include "fpu/softfloat.h" diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 624e6b7786..aa12bb708a 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -32,7 +32,6 @@ #include "semihosting/semihost.h" #include "trace.h" -#include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h" #include "fpu_helper.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 4db8b47744..7aee65a089 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -938,8 +938,6 @@ static const char * const cr_regnames[NUM_CR_REGS] = { }; #endif -#include "exec/gen-icount.h" - /* generate intermediate code for basic block 'tb'. */ static void nios2_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) { diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h index 3004ce37b6..0c819ca983 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/pmu.h @@ -16,7 +16,6 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" #include "qemu/main-loop.h" diff --git a/tcg/tci.c b/tcg/tci.c index 022fe9d0f8..fc67e7e767 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -21,7 +21,6 @@ #include "exec/cpu_ldst.h" #include "tcg/tcg-op.h" #include "tcg/tcg-ldst.h" -#include "qemu/compiler.h" #include <ffi.h> diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 2126b46391..3c4f875420 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "qemu/units.h" #include "qemu/cutils.h" #include "qemu/units.h" diff --git a/tests/unit/test-seccomp.c b/tests/unit/test-seccomp.c index 3d7771e46c..f02c79cafd 100644 --- a/tests/unit/test-seccomp.c +++ b/tests/unit/test-seccomp.c @@ -25,7 +25,6 @@ #include "qapi/error.h" #include "qemu/module.h" -#include <unistd.h> #include <sys/syscall.h> static void test_seccomp_helper(const char *args, bool killed, diff --git a/ui/gtk.c b/ui/gtk.c index 4817623c8f..7f752d8b7d 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -53,7 +53,6 @@ #include <math.h> #include "trace.h" -#include "qemu/cutils.h" #include "ui/input.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" diff --git a/ui/udmabuf.c b/ui/udmabuf.c index cebceb2610..cbf4357bb1 100644 --- a/ui/udmabuf.c +++ b/ui/udmabuf.c @@ -8,7 +8,6 @@ #include "qapi/error.h" #include "ui/console.h" -#include <fcntl.h> #include <sys/ioctl.h> int udmabuf_fd(void) diff --git a/util/async-teardown.c b/util/async-teardown.c index 62bfce1b3c..62cdeb0f20 100644 --- a/util/async-teardown.c +++ b/util/async-teardown.c @@ -10,16 +10,12 @@ * option) any later version. See the COPYING file in the top-level directory. * */ -#include <stdlib.h> -#include <stdio.h> -#include <sys/types.h> + +#include "qemu/osdep.h" #include <dirent.h> #include <sys/prctl.h> -#include <signal.h> #include <sched.h> -#include <unistd.h> -#include "qemu/osdep.h" #include "qemu/async-teardown.h" #ifdef _SC_THREAD_STACK_MIN diff --git a/util/main-loop.c b/util/main-loop.c index 58f776a8c9..3c0f525192 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -33,7 +33,6 @@ #include "block/thread-pool.h" #include "qemu/error-report.h" #include "qemu/queue.h" -#include "qemu/compiler.h" #include "qom/object.h" #ifndef _WIN32 diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 59a891b6a8..77d882e681 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -40,7 +40,6 @@ #include "qemu/thread.h" #include <libgen.h> #include "qemu/cutils.h" -#include "qemu/compiler.h" #include "qemu/units.h" #include "qemu/thread-context.h" @@ -50,7 +49,6 @@ #ifdef __FreeBSD__ #include <sys/thr.h> -#include <sys/types.h> #include <sys/user.h> #include <libutil.h> #endif @@ -61,10 +59,6 @@ #include "qemu/mmap-alloc.h" -#ifdef CONFIG_DEBUG_STACK_USAGE -#include "qemu/error-report.h" -#endif - #define MAX_MEM_PREALLOC_THREAD_COUNT 16 struct MemsetThread; |