I got annoyed enough by various misspellings, and tried to clean up this
a bit. And got this in the result, for now:
https://gitlab.com/mjt0k/qemu/-/commit/eb5a376c7282e63d9e11eb952046b01f1a5ae7d4
Below is a diffstat plus a few actual changes as a sample.
It fixes misspellings in comments and in some strings (mostly in
error messages). There are a few misspelt variable names which are
worth fixing too - this patch does not change variable names.
Now, given the size of the patch, I wonder how to address it in
a best way. Hence the RFC. It took quite a lot of work to went
there, there's no automatic tools involved - all changes are
done after manual inspection of the context (with some help
from codespell). So I'd love to avoid grouping it by maintainer, -
maximum I can do is to group by source directory.
Or maybe there's some other way to attack this?
Thanks,
/mjt
---
accel/tcg/tb-maint.c | 2 +-
audio/mixeng.h | 2 +-
backends/tpm/tpm_ioctl.h | 2 +-
block.c | 2 +-
block/block-copy.c | 4 +--
block/export/vduse-blk.c | 2 +-
block/export/vhost-user-blk-server.c | 2 +-
block/export/vhost-user-blk-server.h | 2 +-
block/file-posix.c | 8 +++---
block/graph-lock.c | 2 +-
block/io.c | 2 +-
block/linux-aio.c | 2 +-
block/mirror.c | 2 +-
block/qcow2-refcount.c | 2 +-
block/vhdx.c | 2 +-
block/vhdx.h | 4 +--
bsd-user/errno_defs.h | 2 +-
bsd-user/freebsd/target_os_siginfo.h | 2 +-
bsd-user/freebsd/target_os_stack.h | 4 +--
bsd-user/freebsd/target_os_user.h | 2 +-
bsd-user/qemu.h | 2 +-
bsd-user/signal-common.h | 4 +--
bsd-user/signal.c | 6 ++---
chardev/char-socket.c | 6 ++---
chardev/char.c | 2 +-
contrib/plugins/cache.c | 2 +-
contrib/plugins/lockstep.c | 2 +-
crypto/afalg.c | 2 +-
crypto/block-luks.c | 6 ++---
crypto/der.c | 2 +-
crypto/der.h | 6 ++---
docs/about/deprecated.rst | 2 +-
docs/devel/qapi-code-gen.rst | 2 +-
docs/devel/qom.rst | 2 +-
docs/system/arm/palm.rst | 2 +-
docs/system/arm/xscale.rst | 2 +-
docs/system/devices/can.rst | 6 ++---
docs/system/devices/nvme.rst | 2 +-
host/include/aarch64/host/cpuinfo.h | 2 +-
host/include/generic/host/cpuinfo.h | 2 +-
host/include/i386/host/cpuinfo.h | 2 +-
host/include/ppc/host/cpuinfo.h | 2 +-
hw/9pfs/9p-local.c | 8 +++---
hw/9pfs/9p-proxy.c | 2 +-
hw/9pfs/9p-synth.c | 2 +-
hw/9pfs/9p-util.h | 2 +-
hw/9pfs/9p.c | 4 +--
hw/9pfs/9p.h | 2 +-
hw/acpi/aml-build.c | 6 ++---
hw/acpi/hmat.c | 2 +-
hw/acpi/nvdimm.c | 2 +-
hw/arm/aspeed.c | 2 +-
hw/arm/mps2-tz.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/audio/fmopl.c | 8 +++---
hw/audio/fmopl.h | 2 +-
hw/audio/gusemu_hal.c | 4 +--
hw/audio/intel-hda-defs.h | 4 +--
hw/block/hd-geometry.c | 4 +--
hw/block/pflash_cfi01.c | 2 +-
hw/char/cadence_uart.c | 2 +-
hw/char/imx_serial.c | 2 +-
hw/char/serial.c | 2 +-
hw/core/generic-loader.c | 4 +--
hw/core/loader.c | 4 +--
hw/core/machine.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/cpu/a15mpcore.c | 2 +-
hw/cxl/cxl-events.c | 2 +-
hw/cxl/cxl-host.c | 2 +-
hw/cxl/cxl-mailbox-utils.c | 4 +--
hw/display/bochs-display.c | 2 +-
hw/display/qxl.c | 2 +-
hw/display/ssd0303.c | 2 +-
hw/display/ssd0323.c | 2 +-
hw/display/xlnx_dp.c | 2 +-
hw/dma/omap_dma.c | 4 +--
hw/i2c/pm_smbus.c | 2 +-
hw/i2c/pmbus_device.c | 2 +-
hw/i2c/smbus_slave.c | 2 +-
hw/i386/acpi-build.c | 4 +--
hw/i386/amd_iommu.c | 4 +--
hw/i386/intel_iommu.c | 4 +--
hw/i386/kvm/xen_xenstore.c | 2 +-
hw/i386/kvm/xenstore_impl.c | 2 +-
hw/i386/pc.c | 4 +--
hw/ide/ahci_internal.h | 4 +--
hw/ide/cmd646.c | 2 +-
hw/ide/core.c | 2 +-
hw/input/hid.c | 2 +-
hw/input/tsc2005.c | 16 ++++++------
hw/intc/arm_gic.c | 4 +--
hw/intc/arm_gicv3_redist.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/intc/loongarch_extioi.c | 2 +-
hw/intc/loongson_liointc.c | 2 +-
hw/intc/omap_intc.c | 2 +-
hw/intc/pnv_xive.c | 2 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/intc/spapr_xive.c | 2 +-
hw/intc/spapr_xive_kvm.c | 6 ++---
hw/intc/xive.c | 2 +-
hw/intc/xive2.c | 6 ++---
hw/ipmi/ipmi_bmc_extern.c | 2 +-
hw/m68k/next-cube.c | 2 +-
hw/m68k/next-kbd.c | 2 +-
hw/m68k/virt.c | 2 +-
hw/mem/cxl_type3.c | 6 ++---
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/mips/malta.c | 2 +-
hw/misc/allwinner-r40-dramc.c | 2 +-
hw/misc/exynos4210_rng.c | 2 +-
hw/misc/imx7_ccm.c | 2 +-
hw/misc/mac_via.c | 2 +-
hw/misc/stm32f2xx_syscfg.c | 4 +--
hw/misc/trace-events | 2 +-
hw/misc/zynq_slcr.c | 2 +-
hw/net/cadence_gem.c | 10 +++----
hw/net/dp8393x.c | 2 +-
hw/net/e1000_regs.h | 2 +-
hw/net/e1000x_regs.h | 2 +-
hw/net/fsl_etsec/rings.c | 2 +-
hw/net/igb_regs.h | 4 +--
hw/net/mcf_fec.c | 2 +-
hw/net/rocker/rocker_fp.c | 2 +-
hw/net/rtl8139.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/net/sungem.c | 2 +-
hw/net/sunhme.c | 2 +-
hw/net/virtio-net.c | 6 ++---
hw/net/vmxnet3.c | 2 +-
hw/net/vmxnet3.h | 2 +-
hw/nvme/ctrl.c | 6 ++---
hw/nvram/eeprom_at24c.c | 2 +-
hw/nvram/fw_cfg.c | 2 +-
hw/pci-bridge/cxl_downstream.c | 2 +-
hw/pci-bridge/pci_expander_bridge.c | 2 +-
hw/pci-host/bonito.c | 2 +-
hw/pci-host/designware.c | 4 +--
hw/pci-host/dino.c | 2 +-
hw/pci-host/gpex-acpi.c | 4 +--
hw/pci-host/gt64120.c | 4 +--
hw/pci-host/pnv_phb.c | 2 +-
hw/pci-host/pnv_phb3.c | 2 +-
hw/pci-host/pnv_phb3_msi.c | 2 +-
hw/pci-host/pnv_phb4.c | 6 ++---
hw/pci-host/sabre.c | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/pci/shpc.c | 2 +-
hw/ppc/ppc.c | 2 +-
hw/ppc/prep_systemio.c | 2 +-
hw/ppc/spapr.c | 8 +++---
hw/ppc/spapr_hcall.c | 2 +-
hw/ppc/spapr_nvdimm.c | 4 +--
hw/ppc/spapr_pci_vfio.c | 6 ++---
hw/remote/machine.c | 2 +-
hw/riscv/microchip_pfsoc.c | 2 +-
hw/riscv/virt.c | 4 +--
hw/rtc/exynos4210_rtc.c | 2 +-
hw/rx/rx62n.c | 2 +-
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/mfi.h | 2 +-
hw/sd/sd.c | 2 +-
hw/sd/sdhci.c | 2 +-
hw/sensor/isl_pmbus_vr.c | 2 +-
hw/sensor/max34451.c | 2 +-
hw/sh4/sh7750_regs.h | 26 +++++++++----------
hw/smbios/smbios.c | 2 +-
hw/sparc/sun4m_iommu.c | 8 +++---
hw/ssi/xilinx_spips.c | 6 ++---
hw/ssi/xlnx-versal-ospi.c | 2 +-
hw/timer/etraxfs_timer.c | 2 +-
hw/timer/i8254.c | 2 +-
hw/timer/renesas_tmr.c | 2 +-
hw/tpm/tpm_tis.h | 2 +-
hw/tpm/tpm_tis_common.c | 2 +-
hw/tpm/tpm_tis_i2c.c | 4 +--
hw/tpm/tpm_tis_isa.c | 2 +-
hw/tpm/tpm_tis_sysbus.c | 2 +-
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/hcd-ehci.c | 6 ++---
hw/usb/hcd-ohci.c | 2 +-
hw/usb/quirks.h | 2 +-
hw/usb/redirect.c | 2 +-
hw/usb/trace-events | 2 +-
hw/usb/xen-usb.c | 2 +-
hw/virtio/virtio-crypto.c | 4 +--
hw/virtio/virtio-mem.c | 2 +-
hw/virtio/virtio.c | 2 +-
hw/xen/xen_pvdev.c | 2 +-
include/block/block_int-common.h | 2 +-
include/chardev/char-fe.h | 4 +--
include/crypto/akcipher.h | 2 +-
include/crypto/ivgen.h | 4 +--
include/elf.h | 4 +--
include/exec/memory.h | 2 +-
include/hw/acpi/aml-build.h | 2 +-
include/hw/acpi/pc-hotplug.h | 2 +-
include/hw/acpi/vmgenid.h | 2 +-
include/hw/arm/fsl-imx7.h | 2 +-
include/hw/boards.h | 6 ++---
include/hw/char/avr_usart.h | 2 +-
include/hw/clock.h | 2 +-
include/hw/core/tcg-cpu-ops.h | 2 +-
include/hw/cxl/cxl_device.h | 2 +-
include/hw/hyperv/vmbus.h | 2 +-
include/hw/i2c/npcm7xx_smbus.h | 2 +-
include/hw/i386/topology.h | 2 +-
include/hw/intc/armv7m_nvic.h | 2 +-
include/hw/misc/auxbus.h | 2 +-
include/hw/misc/macio/pmu.h | 2 +-
include/hw/net/mii.h | 2 +-
include/hw/pci-host/dino.h | 2 +-
include/hw/pci/pcie_aer.h | 2 +-
include/hw/ppc/openpic.h | 2 +-
include/hw/ppc/spapr.h | 2 +-
include/hw/qdev-core.h | 2 +-
include/hw/riscv/riscv_hart.h | 2 +-
include/hw/s390x/s390-pci-bus.h | 2 +-
include/hw/s390x/sclp.h | 2 +-
include/hw/ssi/xilinx_spips.h | 2 +-
include/hw/virtio/virtio-net.h | 2 +-
.../hw/xen/interface/arch-x86/xen-x86_64.h | 2 +-
include/hw/xen/interface/arch-x86/xen.h | 2 +-
include/hw/xen/interface/event_channel.h | 2 +-
include/hw/xen/interface/grant_table.h | 2 +-
include/hw/xen/interface/hvm/hvm_op.h | 2 +-
include/hw/xen/interface/io/blkif.h | 6 ++---
include/hw/xen/interface/io/fbif.h | 2 +-
include/hw/xen/interface/io/kbdif.h | 2 +-
include/hw/xen/interface/memory.h | 2 +-
include/hw/xen/interface/physdev.h | 4 +--
include/hw/xen/interface/sched.h | 2 +-
include/hw/xen/interface/xen.h | 4 +--
include/io/channel-socket.h | 4 +--
include/io/task.h | 2 +-
include/qemu/iova-tree.h | 4 +--
include/qemu/timer.h | 2 +-
include/qemu/yank.h | 2 +-
include/standard-headers/drm/drm_fourcc.h | 8 +++---
include/standard-headers/linux/ethtool.h | 2 +-
.../standard-headers/linux/virtio_console.h | 2 +-
include/standard-headers/linux/virtio_i2c.h | 2 +-
include/standard-headers/linux/virtio_net.h | 4 +--
include/sysemu/cryptodev-vhost.h | 2 +-
include/sysemu/cryptodev.h | 6 ++---
include/sysemu/iothread.h | 2 +-
include/sysemu/stats.h | 2 +-
include/sysemu/tpm_backend.h | 2 +-
include/tcg/helper-info.h | 2 +-
include/tcg/tcg.h | 4 +--
include/ui/kbd-state.h | 2 +-
include/ui/spice-display.h | 2 +-
include/user/safe-syscall.h | 2 +-
linux-user/elfload.c | 2 +-
linux-user/flatload.c | 2 +-
linux-user/syscall.c | 6 ++---
migration/migration-stats.c | 2 +-
migration/migration.h | 4 +--
migration/multifd-zlib.c | 2 +-
migration/multifd-zstd.c | 2 +-
migration/multifd.c | 2 +-
migration/savevm.c | 2 +-
migration/trace-events | 2 +-
nbd/client-connection.c | 2 +-
net/checksum.c | 4 +--
net/filter.c | 4 +--
net/vhost-vdpa.c | 8 +++---
qga/channel-posix.c | 2 +-
qga/commands-posix-ssh.c | 2 +-
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 4 +--
qga/main.c | 2 +-
qga/vss-win32/install.cpp | 4 +--
scripts/checkpatch.pl | 4 +--
scripts/ci/gitlab-pipeline-status | 2 +-
.../codeconverter/codeconverter/qom_macros.py | 2 +-
scripts/oss-fuzz/minimize_qtest_trace.py | 8 +++---
scripts/performance/topN_callgrind.py | 2 +-
scripts/performance/topN_perf.py | 2 +-
scripts/qapi/gen.py | 2 +-
scripts/qapi/pylintrc | 2 +-
scripts/replay-dump.py | 2 +-
scripts/simplebench/bench_block_job.py | 2 +-
semihosting/config.c | 2 +-
semihosting/syscalls.c | 4 +--
softmmu/icount.c | 2 +-
softmmu/ioport.c | 2 +-
stubs/colo.c | 2 +-
target/alpha/cpu.h | 4 +--
target/alpha/translate.c | 2 +-
target/arm/cpu.c | 2 +-
target/arm/cpu.h | 2 +-
target/arm/cpu64.c | 2 +-
target/arm/helper.c | 4 +--
target/arm/tcg/m_helper.c | 2 +-
target/arm/tcg/translate-a64.c | 4 +--
target/arm/tcg/translate-mve.c | 4 +--
target/arm/tcg/translate-sve.c | 2 +-
target/arm/tcg/translate-vfp.c | 2 +-
target/arm/tcg/vec_helper.c | 2 +-
target/cris/helper.c | 8 +++---
target/cris/op_helper.c | 2 +-
target/cris/translate.c | 16 ++++++------
target/hexagon/README | 2 +-
target/hexagon/fma_emu.c | 2 +-
target/hexagon/idef-parser/README.rst | 2 +-
target/hexagon/idef-parser/idef-parser.h | 2 +-
target/hexagon/idef-parser/parser-helpers.c | 6 ++---
target/hexagon/imported/alu.idef | 8 +++---
target/hexagon/imported/macros.def | 2 +-
target/hexagon/imported/mmvec/ext.idef | 10 +++----
target/hppa/cpu.h | 4 +--
target/hppa/int_helper.c | 2 +-
target/hppa/translate.c | 2 +-
target/i386/cpu.c | 4 +--
target/i386/cpu.h | 4 +--
target/i386/hax/hax-interface.h | 4 +--
target/i386/hax/hax-windows.c | 2 +-
target/i386/kvm/kvm.c | 4 +--
target/i386/kvm/xen-emu.c | 2 +-
target/i386/machine.c | 4 +--
target/i386/tcg/translate.c | 8 +++---
target/loongarch/cpu-csr.h | 2 +-
target/m68k/helper.c | 4 +--
target/microblaze/cpu.h | 2 +-
target/mips/cpu-defs.c.inc | 2 +-
target/mips/tcg/msa_helper.c | 12 ++++-----
target/mips/tcg/mxu_translate.c | 6 ++---
target/openrisc/cpu.h | 2 +-
target/openrisc/translate.c | 4 +--
target/ppc/cpu-models.h | 4 +--
target/ppc/cpu.h | 2 +-
target/ppc/cpu_init.c | 4 +--
target/ppc/excp_helper.c | 14 +++++-----
target/ppc/power8-pmu-regs.c.inc | 4 +--
target/ppc/translate/vmx-impl.c.inc | 6 ++---
target/riscv/cpu.h | 2 +-
target/riscv/cpu_bits.h | 4 +--
target/riscv/csr.c | 4 +--
target/riscv/debug.c | 10 +++----
target/riscv/insn_trans/trans_rvf.c.inc | 4 +--
target/riscv/insn_trans/trans_rvv.c.inc | 4 +--
target/riscv/insn_trans/trans_rvzfh.c.inc | 4 +--
target/riscv/monitor.c | 2 +-
target/rx/translate.c | 4 +--
target/s390x/cpu_features.c | 2 +-
target/s390x/cpu_models.c | 2 +-
target/s390x/tcg/fpu_helper.c | 2 +-
target/s390x/tcg/insn-data.h.inc | 2 +-
target/s390x/tcg/translate.c | 2 +-
target/sparc/asi.h | 14 +++++-----
target/tricore/csfr.h.inc | 2 +-
target/tricore/helper.c | 2 +-
target/tricore/translate.c | 8 +++---
tcg/aarch64/tcg-target.c.inc | 2 +-
tcg/arm/tcg-target.c.inc | 4 +--
tcg/riscv/tcg-target.c.inc | 4 +--
tests/avocado/acpi-bits.py | 4 +--
.../avocado/acpi-bits/bits-tests/testacpi.py2 | 4 +--
tests/decode/err_pattern_group_ident2.decode | 2 +-
tests/docker/common.rc | 2 +-
tests/migration/guestperf-batch.py | 2 +-
tests/migration/guestperf.py | 2 +-
tests/plugin/mem.c | 2 +-
tests/qapi-schema/bad-if-not.json | 2 +-
tests/qemu-iotests/029 | 2 +-
tests/qemu-iotests/040 | 8 +++---
tests/qemu-iotests/046 | 2 +-
tests/qemu-iotests/059 | 2 +-
tests/qemu-iotests/061 | 2 +-
tests/qemu-iotests/071 | 2 +-
tests/qemu-iotests/197 | 2 +-
tests/qemu-iotests/215 | 2 +-
tests/qemu-iotests/298 | 2 +-
tests/qemu-iotests/pylintrc | 4 +--
tests/qtest/ahci-test.c | 2 +-
tests/qtest/bcm2835-dma-test.c | 2 +-
tests/qtest/bios-tables-test.c | 2 +-
tests/qtest/ds1338-test.c | 2 +-
tests/qtest/fuzz/generic_fuzz.c | 4 +--
tests/qtest/libqos/qgraph.c | 4 +--
tests/qtest/libqos/qgraph_internal.h | 2 +-
tests/qtest/libqos/virtio-gpio.c | 2 +-
tests/qtest/libqtest.c | 4 +--
tests/qtest/migration-test.c | 6 ++---
tests/qtest/npcm7xx_timer-test.c | 2 +-
tests/qtest/tpm-emu.c | 2 +-
tests/qtest/tpm-tests.c | 2 +-
tests/qtest/tpm-tests.h | 2 +-
tests/qtest/tpm-tis-i2c-test.c | 2 +-
tests/qtest/tpm-tis-util.c | 2 +-
tests/qtest/vhost-user-blk-test.c | 2 +-
tests/qtest/virtio-net-test.c | 2 +-
tests/qtest/vmgenid-test.c | 2 +-
tests/tcg/Makefile.target | 4 +--
tests/tcg/aarch64/gdbstub/test-sve.py | 2 +-
tests/tcg/aarch64/sme-outprod1.c | 2 +-
tests/tcg/aarch64/system/boot.S | 6 ++---
tests/tcg/aarch64/system/semiheap.c | 2 +-
tests/tcg/hexagon/fpstuff.c | 2 +-
tests/tcg/hexagon/test_clobber.S | 2 +-
tests/tcg/i386/system/boot.S | 2 +-
tests/tcg/i386/x86.csv | 2 +-
tests/tcg/multiarch/sha512.c | 2 +-
.../multiarch/system/Makefile.softmmu-target | 2 +-
tests/tcg/s390x/mvc.c | 2 +-
tests/tcg/tricore/c/crt0-tc2x.S | 4 +--
tests/tcg/x86_64/system/boot.S | 4 +--
tests/tsan/suppressions.tsan | 2 +-
tests/uefi-test-tools/Makefile | 2 +-
tests/unit/check-qjson.c | 2 +-
tests/unit/test-aio.c | 2 +-
tests/unit/test-bdrv-graph-mod.c | 12 ++++-----
tests/unit/test-crypto-secret.c | 2 +-
tests/unit/test-qobject-input-visitor.c | 2 +-
tests/unit/test-throttle.c | 4 +--
tests/unit/test-util-filemonitor.c | 2 +-
tests/unit/test-xs-node.c | 2 +-
tests/vm/Makefile.include | 2 +-
tests/vm/ubuntuvm.py | 2 +-
ui/cocoa.m | 2 +-
ui/keymaps.h | 2 +-
ui/sdl2-2d.c | 2 +-
ui/sdl2.c | 2 +-
ui/vnc-enc-tight.c | 2 +-
ui/vnc-enc-zrle.c.inc | 2 +-
ui/vnc-enc-zywrle.h | 4 +--
util/cpuinfo-aarch64.c | 4 +--
util/cpuinfo-i386.c | 4 +--
util/cpuinfo-ppc.c | 2 +-
util/main-loop.c | 2 +-
util/oslib-posix.c | 2 +-
util/qdist.c | 2 +-
util/qemu-progress.c | 2 +-
util/qemu-sockets.c | 2 +-
util/rcu.c | 2 +-
437 files changed, 663 insertions(+), 663 deletions(-)
diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
index 9566224d18..9ed86a6b0a 100644
--- a/accel/tcg/tb-maint.c
+++ b/accel/tcg/tb-maint.c
@@ -1,5 +1,5 @@
/*
- * Translation Block Maintaince
+ * Translation Block Maintenance
*
* Copyright (c) 2003 Fabrice Bellard
*
diff --git a/audio/mixeng.h b/audio/mixeng.h
index f9de7cffeb..a5f56d2c26 100644
--- a/audio/mixeng.h
+++ b/audio/mixeng.h
@@ -38,7 +38,7 @@ typedef struct st_sample st_sample;
typedef void (t_sample) (struct st_sample *dst, const void *src, int samples);
typedef void (f_sample) (void *dst, const struct st_sample *src, int samples);
-/* indices: [stereo][signed][swap endiannes][8, 16 or 32-bits] */
+/* indices: [stereo][signed][swap endianness][8, 16 or 32-bits] */
extern t_sample *mixeng_conv[2][2][2][3];
extern f_sample *mixeng_clip[2][2][2][3];
diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h
index b1d31768a6..1933ab6855 100644
--- a/backends/tpm/tpm_ioctl.h
+++ b/backends/tpm/tpm_ioctl.h
@@ -238,7 +238,7 @@ struct ptm_lockstorage {
} req; /* request */
struct {
ptm_res tpm_result;
- } resp; /* reponse */
+ } resp; /* response */
} u;
};
diff --git a/block.c b/block.c
index a307c151a8..90d2dde828 100644
--- a/block.c
+++ b/block.c
@@ -7582,7 +7582,7 @@ int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
/*
* Recursion phase: go through all nodes of the graph.
* Take care of checking that all nodes support changing AioContext
- * and drain them, builing a linear list of callbacks to run if everything
+ * and drain them, building a linear list of callbacks to run if everything
* is successful (the transaction itself).
*/
tran = tran_new();
diff --git a/block/block-copy.c b/block/block-copy.c
index e13d7bc6b6..db1efc3eb9 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -67,7 +67,7 @@ typedef struct BlockCopyCallState {
QLIST_ENTRY(BlockCopyCallState) list;
/*
- * Fields that report information about return values and erros.
+ * Fields that report information about return values and errors.
* Protected by lock in BlockCopyState.
*/
bool error_is_read;
@@ -462,7 +462,7 @@ static coroutine_fn int block_copy_task_run(AioTaskPool *pool,
* Do copy of cluster-aligned chunk. Requested region is allowed to exceed
* s->len only to cover last cluster when s->len is not aligned to clusters.
*
- * No sync here: nor bitmap neighter intersecting requests handling, only copy.
+ * No sync here: nor bitmap neither intersecting requests handling, only copy.
*
* @method is an in-out argument, so that copy_range can be either extended to
* a full-size buffer or disabled if the copy_range attempt fails. The output
diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c
index 83b05548e7..172f73cef4 100644
--- a/block/export/vduse-blk.c
+++ b/block/export/vduse-blk.c
@@ -138,7 +138,7 @@ static void vduse_blk_enable_queue(VduseDev *dev, VduseVirtq *vq)
aio_set_fd_handler(vblk_exp->export.ctx, vduse_queue_get_fd(vq),
on_vduse_vq_kick, NULL, NULL, NULL, vq);
- /* Make sure we don't miss any kick afer reconnecting */
+ /* Make sure we don't miss any kick after reconnecting */
eventfd_write(vduse_queue_get_fd(vq), 1);
}
...[cut]...