From 294c63be7da0f572167b3ec04f8ba63ec3dd1291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 27 Oct 2023 15:42:00 +0200 Subject: [PATCH 01/27] hw/watchdog/wdt_aspeed: Remove unused 'hw/misc/aspeed_scu.h' header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aspeed watchdog doesn't use anything from the System Control Unit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Signed-off-by: Michael Tokarev --- hw/watchdog/wdt_aspeed.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index d267aa185c..273a49d360 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -14,7 +14,6 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" -#include "hw/misc/aspeed_scu.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" From 80a59bc5e57fc1956e257040bd69a425ef2b62f4 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 13 Oct 2023 08:57:39 +0200 Subject: [PATCH 02/27] MAINTAINERS: Add tests/decode/ to the "Overall TCG CPUs" section The tests/decode/ folder belongs to scripts/decodetree.py, so it should be listed in the same section as the script. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ff1238bb98..695e0bd34f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -174,6 +174,7 @@ F: include/hw/core/tcg-cpu-ops.h F: host/include/*/host/cpuinfo.h F: util/cpuinfo-*.c F: include/tcg/ +F: tests/decode/ FPU emulation M: Aurelien Jarno From 1349af898ccb1df383328d0752c02a8ea95dd461 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 13 Nov 2023 17:25:29 +0100 Subject: [PATCH 03/27] tests/data/qobject/qdict.txt: Avoid non-inclusive words qdict.txt only consists of more or less random test data. We can simply drop the lines with the problematic words here. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev --- tests/data/qobject/qdict.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/data/qobject/qdict.txt b/tests/data/qobject/qdict.txt index 122fda4524..e2edc88161 100644 --- a/tests/data/qobject/qdict.txt +++ b/tests/data/qobject/qdict.txt @@ -1866,10 +1866,6 @@ blackfin: 4096 blackfin.c: 7552 blackfin.h: 1089 blackfin_sram.h: 1207 -blacklist.c: 8658 -blacklist.h: 108 -blackstamp.c: 9838 -BlackStamp_defconfig: 27434 blinken.h: 617 blizzard.c: 41338 blizzard.h: 249 From 7ca24cd1c93b41a34f30eae1367faae9483e078d Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 13 Nov 2023 17:29:28 +0100 Subject: [PATCH 04/27] qapi/pragma.json: Improve the comment about the lists of QAPI rule exceptions Let's use more inclusive language here. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- qapi/pragma.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi/pragma.json b/qapi/pragma.json index 7f810b0e97..0aa4eeddd3 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -3,8 +3,8 @@ { 'pragma': { 'doc-required': true } } -# Whitelists to permit QAPI rule violations; think twice before you -# add to them! +# Entries in these lists are allowed to violate the QAPI rules (for +# historical reasons); think twice before you add to them! { 'pragma': { # Command names containing '_' 'command-name-exceptions': [ From aaf851a20cf6f762583642361a61ff71fda44fc2 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 00:12:48 +0300 Subject: [PATCH 05/27] hw/audio/virtio-snd.c: spelling: initalize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: eb9ad377bb94 "virtio-sound: handle control messages and streams" Signed-off-by: Michael Tokarev Reviewed-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé --- hw/audio/virtio-snd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index a18a9949a7..2fe966e311 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -1126,7 +1126,7 @@ static void virtio_snd_realize(DeviceState *dev, Error **errp) status = virtio_snd_set_pcm_params(vsnd, i, &default_params); if (status != cpu_to_le32(VIRTIO_SND_S_OK)) { error_setg(errp, - "Can't initalize stream params, device responded with %s.", + "Can't initialize stream params, device responded with %s.", print_code(status)); return; } From 4061c3346e4895804fa1bbd9ee22587b347dd05c Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 00:13:16 +0300 Subject: [PATCH 06/27] qapi/migration.json: spelling: transfering Fixes: 074dbce5fcce "migration: New migrate and migrate-incoming argument 'channels'" Signed-off-by: Michael Tokarev --- qapi/migration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/migration.json b/qapi/migration.json index 975761eebd..eb2f883513 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1658,7 +1658,7 @@ # # Migration stream channel parameters. # -# @channel-type: Channel type for transfering packet information. +# @channel-type: Channel type for transferring packet information. # # @addr: Migration endpoint configuration on destination interface. # From 9bfba08a1f9e78d67e85fca301a2661685f8de69 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:06:14 +0300 Subject: [PATCH 07/27] bsd-user: spelling fixes: necesary, agrument, undocummented Fixes: a99d74034754 "bsd-user: Implement do_obreak function" Fixes: 8632729060bf "bsd-user: Implement freebsd_exec_common, used in implementing execve/fexecve." Fixes: bf14f13d8be8 "bsd-user: Implement stat related syscalls" Reviewed-by: Warner Losh Signed-off-by: Michael Tokarev --- bsd-user/bsd-mem.h | 2 +- bsd-user/freebsd/os-proc.c | 2 +- bsd-user/freebsd/os-stat.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h index c3e72e3b86..21d9bab889 100644 --- a/bsd-user/bsd-mem.h +++ b/bsd-user/bsd-mem.h @@ -235,7 +235,7 @@ static inline abi_long do_obreak(abi_ulong brk_val) return target_brk; } - /* Release heap if necesary */ + /* Release heap if necessary */ if (new_brk < old_brk) { target_munmap(new_brk, old_brk - new_brk); diff --git a/bsd-user/freebsd/os-proc.c b/bsd-user/freebsd/os-proc.c index 4e67ae4d56..e0203e259b 100644 --- a/bsd-user/freebsd/os-proc.c +++ b/bsd-user/freebsd/os-proc.c @@ -115,7 +115,7 @@ abi_long freebsd_exec_common(abi_ulong path_or_fd, abi_ulong guest_argp, } qarg0 = argp = g_new0(char *, argc + 9); - /* save the first agrument for the emulator */ + /* save the first argument for the emulator */ *argp++ = (char *)getprogname(); qargp = argp; *argp++ = (char *)getprogname(); diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h index b20e270774..3bdc66aa98 100644 --- a/bsd-user/freebsd/os-stat.h +++ b/bsd-user/freebsd/os-stat.h @@ -146,7 +146,7 @@ static inline abi_long do_freebsd_fstatat(abi_long arg1, abi_long arg2, return ret; } -/* undocummented nstat(char *path, struct nstat *ub) syscall */ +/* undocumented nstat(char *path, struct nstat *ub) syscall */ static abi_long do_freebsd11_nstat(abi_long arg1, abi_long arg2) { abi_long ret; @@ -162,7 +162,7 @@ static abi_long do_freebsd11_nstat(abi_long arg1, abi_long arg2) return ret; } -/* undocummented nfstat(int fd, struct nstat *sb) syscall */ +/* undocumented nfstat(int fd, struct nstat *sb) syscall */ static abi_long do_freebsd11_nfstat(abi_long arg1, abi_long arg2) { abi_long ret; @@ -175,7 +175,7 @@ static abi_long do_freebsd11_nfstat(abi_long arg1, abi_long arg2) return ret; } -/* undocummented nlstat(char *path, struct nstat *ub) syscall */ +/* undocumented nlstat(char *path, struct nstat *ub) syscall */ static abi_long do_freebsd11_nlstat(abi_long arg1, abi_long arg2) { abi_long ret; From 2cf91b9ae6df17ac99dd212016e2d204cc2f6a74 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:07:15 +0300 Subject: [PATCH 08/27] linux-user: spelling fixes: othe, necesary Fixes: e34136d93059 "linux-user/ppc: Add vdso" Fixes: 86f04735ac20 "linux-user: Fix brk() to release pages" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- linux-user/ppc/vdso.S | 2 +- linux-user/syscall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/ppc/vdso.S b/linux-user/ppc/vdso.S index 689010db13..2e79ea9808 100644 --- a/linux-user/ppc/vdso.S +++ b/linux-user/ppc/vdso.S @@ -227,7 +227,7 @@ endf __kernel_sigtramp_rt #ifndef _ARCH_PPC64 /* * The non-rt sigreturn has the same layout at a different offset. - * Move the CFA and leave all othe other descriptions the same. + * Move the CFA and leave all the other descriptions the same. */ .cfi_def_cfa 1, SIGNAL_FRAMESIZE + offsetof_sigframe_mcontext nop diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 65ac3ac796..16ca5ea7b6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -831,7 +831,7 @@ abi_long do_brk(abi_ulong brk_val) return target_brk; } - /* Release heap if necesary */ + /* Release heap if necessary */ if (new_brk < old_brk) { target_munmap(new_brk, old_brk - new_brk); From 487152fa1fdb2ad25a15986d13a5dd43ae9e219f Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:06:48 +0300 Subject: [PATCH 09/27] hw/cxl: spelling fixes: limitaions, potentialy, intialized Fixes: 388d6b574e28 "hw/cxl: Use switch statements for read and write of cachemem registers" Fixes: 3314efd276ad "hw/cxl/mbox: Add Physical Switch Identify command." Fixes: 004e3a93b814 "hw/cxl: Add tunneled command support to mailbox for switch cci." Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- hw/cxl/cxl-component-utils.c | 4 ++-- hw/cxl/cxl-mailbox-utils.c | 2 +- include/hw/cxl/cxl_device.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/cxl/cxl-component-utils.c b/hw/cxl/cxl-component-utils.c index d0245cc55d..29d477492b 100644 --- a/hw/cxl/cxl-component-utils.c +++ b/hw/cxl/cxl-component-utils.c @@ -81,7 +81,7 @@ static uint64_t cxl_cache_mem_read_reg(void *opaque, hwaddr offset, return 0; default: /* - * In line with specifiction limitaions on access sizes, this + * In line with specification limitaions on access sizes, this * routine is not called with other sizes. */ g_assert_not_reached(); @@ -152,7 +152,7 @@ static void cxl_cache_mem_write_reg(void *opaque, hwaddr offset, uint64_t value, return; default: /* - * In line with specifiction limitaions on access sizes, this + * In line with specification limitaions on access sizes, this * routine is not called with other sizes. */ g_assert_not_reached(); diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index b365575097..6eff56fb1b 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -431,7 +431,7 @@ static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd, out = (struct cxl_fmapi_ident_switch_dev_resp_pl *)payload_out; *out = (struct cxl_fmapi_ident_switch_dev_resp_pl) { .num_physical_ports = num_phys_ports + 1, /* 1 USP */ - .num_vcss = 1, /* Not yet support multiple VCS - potentialy tricky */ + .num_vcss = 1, /* Not yet support multiple VCS - potentially tricky */ .active_vcs_bitmask[0] = 0x1, .total_vppbs = num_phys_ports + 1, .bound_vppbs = num_phys_ports + 1, diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 61b7f897f7..befb5f884b 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -403,7 +403,7 @@ struct CXLType3Dev { CXLComponentState cxl_cstate; CXLDeviceState cxl_dstate; CXLCCI cci; /* Primary PCI mailbox CCI */ - /* Always intialized as no way to know if a VDM might show up */ + /* Always initialized as no way to know if a VDM might show up */ CXLCCI vdm_fm_owned_ld_mctp_cci; CXLCCI ld0_cci; From ac2786f0b0d05614ccebcc87d4c9b4917b669eba Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:08:08 +0300 Subject: [PATCH 10/27] gdbstub: spelling fix: respectivelly Fixes: 761e3c10881b "gdbstub: fixes cases where wrong threads were reported to GDB on SIGINT" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- gdbstub/gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index ebb912da1b..46d752bbc2 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -692,7 +692,7 @@ static int gdb_handle_vcont(const char *p) /* * target_count and last_target keep track of how many CPUs we are going to * step or resume, and a pointer to the state structure of one of them, - * respectivelly + * respectively */ int target_count = 0; CPUState *last_target = NULL; From 6477366f6c93f53dd1212444526b7667812e8825 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:08:26 +0300 Subject: [PATCH 11/27] docs/about/deprecated.rst: spelling fix: becase Fixes: 864128df465a "migration: Deprecate old compression method" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- docs/about/deprecated.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 78550c07bf..6c84db90b5 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -514,5 +514,5 @@ old compression method (since 8.2) Compression method fails too much. Too many races. We are going to remove it if nobody fixes it. For starters, migration-test -compression tests are disabled becase they fail randomly. If you need +compression tests are disabled because they fail randomly. If you need compression, use multifd compression methods. From 2a620ed52dd46ea7f4d70e1959584bec8f7082ba Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:08:48 +0300 Subject: [PATCH 12/27] docs/devel/migration.rst: spelling fixes: doen't, diferent, responsability, recomend Fixes: 593c28c02c81 "migration/doc: How to migrate when hosts have different features" Fixes: 1aefe2ca1423 "migration/doc: Add documentation for backwards compatiblity" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- docs/devel/migration.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 5adf4f12f7..ec55089b25 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -1061,7 +1061,7 @@ QEMU version, in this case pc-5.1. 4 - qemu-5.1 -M pc-5.2 -> migrates to -> qemu-5.1 -M pc-5.2 - This combination is not possible as the qemu-5.1 doen't understand + This combination is not possible as the qemu-5.1 doesn't understand pc-5.2 machine type. So nothing to worry here. Now it comes the interesting ones, when both QEMU processes are @@ -1214,8 +1214,8 @@ machine types to have the right value:: ... }; -A device with diferent features on both sides ---------------------------------------------- +A device with different features on both sides +---------------------------------------------- Let's assume that we are using the same QEMU binary on both sides, just to make the things easier. But we have a device that has @@ -1294,12 +1294,12 @@ Host B: $ qemu-system-x86_64 -cpu host,taa-no=off -And you would be able to migrate between them. It is responsability +And you would be able to migrate between them. It is responsibility of the management application or of the user to make sure that the configuration is correct. QEMU doesn't know how to look at this kind of features in general. -Notice that we don't recomend to use -cpu host for migration. It is +Notice that we don't recommend to use -cpu host for migration. It is used in this example because it makes the example simpler. Other devices have worse control about individual features. If they From eb12e929051be4b916d724c1d29f1ead0b270901 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:09:19 +0300 Subject: [PATCH 13/27] docs/system/arm/emulation.rst: spelling fix: Enhacements Fixes: c7c807f6dd6d "target/arm: Implement FEAT_Pauth2" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- docs/system/arm/emulation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 47fd648035..0b604f9005 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -70,7 +70,7 @@ the following architecture extensions: - FEAT_PAN2 (AT S1E1R and AT S1E1W instruction variants affected by PSTATE.PAN) - FEAT_PAN3 (Support for SCTLR_ELx.EPAN) - FEAT_PAuth (Pointer authentication) -- FEAT_PAuth2 (Enhacements to pointer authentication) +- FEAT_PAuth2 (Enhancements to pointer authentication) - FEAT_PMULL (PMULL, PMULL2 instructions) - FEAT_PMUv3p1 (PMU Extensions v3.1) - FEAT_PMUv3p4 (PMU Extensions v3.4) From 51464c5612a0a389b1a9abb99b3a6a84f6ddc42f Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:09:41 +0300 Subject: [PATCH 14/27] target/arm/tcg: spelling fixes: alse, addreses Fixes: 179e9a3baccc "target/arm: Define new TB flag for ATA0" Fixes: 5d7b37b5f675 "target/arm: Implement the CPY* instructions" Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- target/arm/tcg/helper-a64.c | 2 +- target/arm/tcg/hflags.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index ce4800b8d1..8ad84623d3 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -1414,7 +1414,7 @@ void HELPER(setge)(CPUARMState *env, uint32_t syndrome, uint32_t mtedesc) /* * Perform part of a memory copy from the guest memory at fromaddr * and extending for copysize bytes, to the guest memory at - * toaddr. Both addreses are dirty. + * toaddr. Both addresses are dirty. * * Returns the number of bytes actually set, which might be less than * copysize; the caller should loop until the whole copy has been done. diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 3d7fdce5c3..a6ebd7571a 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -327,7 +327,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, DP_TBFLAG_A64(flags, MTE0_ACTIVE, 1); } /* - * For unpriv tag-setting accesses we alse need ATA0. Again, in + * For unpriv tag-setting accesses we also need ATA0. Again, in * contexts where unpriv and normal insns are the same we * duplicate the ATA bit to save effort for translate-a64.c. */ From 385b3280ce755448e95d4376d514b3ae001931db Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:09:54 +0300 Subject: [PATCH 15/27] target/hppa: spelling fixes: Indicies, Truely Fixes: bb67ec32a0bb "target/hppa: Include PSW_P in tb flags and mmu index" Fixes: d7553f3591bb "target/hppa: Populate an interval tree with valid tlb entries" Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- target/hppa/cpu.h | 2 +- target/hppa/machine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index bcfed04f7c..8be45c69c9 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -56,7 +56,7 @@ 1 << MMU_PL2_IDX | 1 << MMU_PL2_P_IDX | \ 1 << MMU_USER_IDX | 1 << MMU_USER_P_IDX) -/* Indicies to flush for access_id changes. */ +/* Indices to flush for access_id changes. */ #define HPPA_MMU_FLUSH_P_MASK \ (1 << MMU_KERNEL_P_IDX | 1 << MMU_PL1_P_IDX | \ 1 << MMU_PL2_P_IDX | 1 << MMU_USER_P_IDX) diff --git a/target/hppa/machine.c b/target/hppa/machine.c index 2f8e8cc5a1..15cbc5e6d0 100644 --- a/target/hppa/machine.c +++ b/target/hppa/machine.c @@ -129,7 +129,7 @@ static int tlb_post_load(void *opaque, int version_id) /* * Re-create the interval tree from the valid entries. - * Truely invalid entries should have start == end == 0. + * Truly invalid entries should have start == end == 0. * Otherwise it should be the in-flight tlb_partial entry. */ for (uint32_t i = 0; i < ARRAY_SIZE(env->tlb); ++i) { From e3fc69343c4d204c3aec584f41a793f1ac709011 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:10:13 +0300 Subject: [PATCH 16/27] migration/rdma.c: spelling fix: asume Fixes: 67c31c9c1af1 "migration: Don't abuse qemu_file transferred for RDMA" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- migration/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 6a29e53daf..04debab5d9 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2204,7 +2204,7 @@ retry: stat64_add(&mig_stats.normal_pages, sge.length / qemu_target_page_size()); /* * We are adding to transferred the amount of data written, but no - * overhead at all. I will asume that RDMA is magicaly and don't + * overhead at all. I will assume that RDMA is magicaly and don't * need to transfer (at least) the addresses where it wants to * write the pages. Here it looks like it should be something * like: From 1a9c9a6f8a97914133901af9ee56f7520a447189 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:10:44 +0300 Subject: [PATCH 17/27] contrib/vhost-user-gpu/virgl.c: spelling fix: mesage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: e3c82fe04f31 "contrib/vhost-user-gpu: add support for sending dmabuf modifiers" Reviewed-by: Marc-André Lureau Signed-off-by: Michael Tokarev --- contrib/vhost-user-gpu/virgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index 1da6cc1588..d1ccdf7d06 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -401,7 +401,7 @@ virgl_cmd_set_scanout(VuGpu *g, if (g->use_modifiers) { /* - * The mesage uses all the fields set in dmabuf_scanout plus + * The message uses all the fields set in dmabuf_scanout plus * modifiers which is appended after VhostUserGpuDMABUFScanout. */ msg.request = VHOST_USER_GPU_DMABUF_SCANOUT2; From d1c2fbc9c173e315f10e718a7ad78cb3a71f3bab Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 18/27] hw/mem/memory-device.c: spelling fix: ontaining Fixes: 6c1b28e9e405 "memory-device: Support empty memory devices" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- hw/mem/memory-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index e0704b8dc3..a1b1af26bc 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -29,7 +29,7 @@ static bool memory_device_is_empty(const MemoryDeviceState *md) /* dropping const here is fine as we don't touch the memory region */ mr = mdc->get_memory_region((MemoryDeviceState *)md, &local_err); if (local_err) { - /* Not empty, we'll report errors later when ontaining the MR again. */ + /* Not empty, we'll report errors later when containing the MR again. */ error_free(local_err); return false; } From 315ebbd760d3d8f72d56e7c5d12d10ad358d07f7 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 19/27] hw/net/cadence_gem.c: spelling fixes: Octects Fixes: c755c943aa2e "hw/net/cadence_gem: use REG32 macro for register definitions" Reviewed-by: Thomas Huth Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/net/cadence_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 5b989f5b52..19adbc0e19 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -225,8 +225,8 @@ REG32(WOLAN, 0xb8) /* Wake on LAN reg */ REG32(IPGSTRETCH, 0xbc) /* IPG Stretch reg */ REG32(SVLAN, 0xc0) /* Stacked VLAN reg */ REG32(MODID, 0xfc) /* Module ID reg */ -REG32(OCTTXLO, 0x100) /* Octects transmitted Low reg */ -REG32(OCTTXHI, 0x104) /* Octects transmitted High reg */ +REG32(OCTTXLO, 0x100) /* Octets transmitted Low reg */ +REG32(OCTTXHI, 0x104) /* Octets transmitted High reg */ REG32(TXCNT, 0x108) /* Error-free Frames transmitted */ REG32(TXBCNT, 0x10c) /* Error-free Broadcast Frames */ REG32(TXMCNT, 0x110) /* Error-free Multicast Frame */ @@ -245,8 +245,8 @@ REG32(EXCESSCOLLCNT, 0x140) /* Excessive Collision Frames */ REG32(LATECOLLCNT, 0x144) /* Late Collision Frames */ REG32(DEFERTXCNT, 0x148) /* Deferred Transmission Frames */ REG32(CSENSECNT, 0x14c) /* Carrier Sense Error Counter */ -REG32(OCTRXLO, 0x150) /* Octects Received register Low */ -REG32(OCTRXHI, 0x154) /* Octects Received register High */ +REG32(OCTRXLO, 0x150) /* Octets Received register Low */ +REG32(OCTRXHI, 0x154) /* Octets Received register High */ REG32(RXCNT, 0x158) /* Error-free Frames Received */ REG32(RXBROADCNT, 0x15c) /* Error-free Broadcast Frames RX */ REG32(RXMULTICNT, 0x160) /* Error-free Multicast Frames RX */ From a4dbf3fecbe458bc42aa56fc16348df8ff0ee216 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 20/27] include/block/ufs.h: spelling fix: setted Fixes: bc4e68d362ec "hw/ufs: Initial commit for emulated Universal-Flash-Storage" Reviewed-by: Jeuk Kim Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- include/block/ufs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/block/ufs.h b/include/block/ufs.h index 0b6ec0814d..d61598b8f3 100644 --- a/include/block/ufs.h +++ b/include/block/ufs.h @@ -657,7 +657,7 @@ typedef struct QEMU_PACKED UtpTaskReqDesc { #define UFS_UPIU_MAX_WB_LUN_ID 8 /* - * WriteBooster buffer lifetime has a limit setted by vendor. + * WriteBooster buffer lifetime has a limit set by vendor. * If it is over the limit, WriteBooster feature will be disabled. */ #define UFS_WB_EXCEED_LIFETIME 0x0B From c437eb1d5aeb1c4581788bf368209101f614368a Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 21/27] include/hw/hyperv/dynmem-proto.h: spelling fix: nunber, atleast Fixes: 4f80cd2f033e "Add Hyper-V Dynamic Memory Protocol definitions" Acked-by: Maciej S. Szmigiero Signed-off-by: Michael Tokarev --- include/hw/hyperv/dynmem-proto.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/hyperv/dynmem-proto.h b/include/hw/hyperv/dynmem-proto.h index d0f9090ac4..a657786a94 100644 --- a/include/hw/hyperv/dynmem-proto.h +++ b/include/hw/hyperv/dynmem-proto.h @@ -232,7 +232,7 @@ struct dm_capabilities_resp_msg { * num_committed: Committed memory in pages. * page_file_size: The accumulated size of all page files * in the system in pages. - * zero_free: The nunber of zero and free pages. + * zero_free: The number of zero and free pages. * page_file_writes: The writes to the page file in pages. * io_diff: An indicator of file cache efficiency or page file activity, * calculated as File Cache Page Fault Count - Page Read Count. @@ -275,7 +275,7 @@ struct dm_balloon { * * reservedz: Reserved; must be set to zero. * more_pages: If FALSE, this is the last message of the transaction. - * if TRUE there will atleast one more message from the guest. + * if TRUE there will be at least one more message from the guest. * * range_count: The number of ranges in the range array. * @@ -296,7 +296,7 @@ struct dm_balloon_response { * to the guest to give guest more memory. * * more_pages: If FALSE, this is the last message of the transaction. - * if TRUE there will atleast one more message from the guest. + * if TRUE there will be at least one more message from the guest. * * reservedz: Reserved; must be set to zero. * From 801faee4dd15ee395fe1c2fb35241c3c7a0b9af5 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 22/27] include/hw/virtio/vhost.h: spelling fix: sate Fixes: 4a00d5d7f4b6 "vhost: Add high-level state save/load functions" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- include/hw/virtio/vhost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 05d7204a08..02477788df 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -456,7 +456,7 @@ int vhost_save_backend_state(struct vhost_dev *dev, QEMUFile *f, Error **errp); * Must only be called while the device and all its vrings are stopped * (`VHOST_TRANSFER_STATE_PHASE_STOPPED`). * - * @dev: The vhost device to which to send the sate + * @dev: The vhost device to which to send the state * @f: Migration stream from which to load the state * @errp: Potential error message * From 3a4e56015b897a5502ab6a691cd4e20700e779c1 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 23/27] target/riscv/cpu.h: spelling fix: separatly Fixes: 40336d5b1d4c "target/riscv: Add HS-mode virtual interrupt and IRQ filtering support." Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- target/riscv/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index bf58b0f0b5..d74b361be6 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -214,13 +214,13 @@ struct CPUArchState { /* * When mideleg[i]=0 and mvien[i]=1, sie[i] is no more - * alias of mie[i] and needs to be maintained separatly. + * alias of mie[i] and needs to be maintained separately. */ uint64_t sie; /* * When hideleg[i]=0 and hvien[i]=1, vsie[i] is no more - * alias of sie[i] (mie[i]) and needs to be maintained separatly. + * alias of sie[i] (mie[i]) and needs to be maintained separately. */ uint64_t vsie; From 8053feaae0429562324efec47666653c28bda74a Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 24/27] tests/qtest/migration-test.c: spelling fix: bandwith Fixes: 17257b90be4f "tests: Add migration dirty-limit capability test" Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- tests/qtest/migration-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 5752412b64..0fbaa6a90f 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -3138,7 +3138,7 @@ static void test_migrate_dirty_limit(void) uint64_t throttle_us_per_full; /* * We want the test to be stable and as fast as possible. - * E.g., with 1Gb/s bandwith migration may pass without dirty limit, + * E.g., with 1Gb/s bandwidth migration may pass without dirty limit, * so we need to decrease a bandwidth. */ const int64_t dirtylimit_period = 1000, dirtylimit_value = 50; From 4b3e4d2b43a94051b017d70461babe4e7b994aad Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 25/27] tests/qtest/ufs-test.c: spelling fix: tranfer Fixes: 631c872614ac "tests/qtest: Introduce tests for UFS" Reviewed-by: Jeuk Kim Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- tests/qtest/ufs-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c index 5daf8c9c49..95e82f9472 100644 --- a/tests/qtest/ufs-test.c +++ b/tests/qtest/ufs-test.c @@ -319,7 +319,7 @@ static void ufs_init(QUfs *ufs, QGuestAllocator *alloc) ufs_wreg(ufs, A_IE, ie); ufs_wreg(ufs, A_UTRIACR, 0); - /* Enable tranfer request and task management request */ + /* Enable transfer request and task management request */ cap = ufs_rreg(ufs, A_CAP); nutrs = FIELD_EX32(cap, CAP, NUTRS) + 1; nutmrs = FIELD_EX32(cap, CAP, NUTMRS) + 1; From f0dbe427ec7c0dd81fc95c1d0d7174b79b6e6587 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 26/27] util/filemonitor-inotify.c: spelling fix: kenel Fixes: 2e12dd405c66 "util/filemonitor-inotify: qemu_file_monitor_watch(): assert no overflow" Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Michael Tokarev --- util/filemonitor-inotify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/filemonitor-inotify.c b/util/filemonitor-inotify.c index 2121111f38..7352b9fe53 100644 --- a/util/filemonitor-inotify.c +++ b/util/filemonitor-inotify.c @@ -89,7 +89,7 @@ static void qemu_file_monitor_watch(void *arg) struct inotify_event *ev = (struct inotify_event *)(buf + used); /* - * We trust the kenel to provide valid buffer with complete event + * We trust the kernel to provide valid buffer with complete event * records. */ assert(len - used >= sizeof(struct inotify_event)); From f779357882b4758551ff30074b4b915d7d249d3d Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 14 Nov 2023 19:11:33 +0300 Subject: [PATCH 27/27] util/range.c: spelling fix: inbetween MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: b439595a08d7 "range: Introduce range_inverse_array()" Reviewed-by: Eric Auger Reviewed-by: Cédric Le Goater Signed-off-by: Michael Tokarev --- util/range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/range.c b/util/range.c index 9605ccfcbe..f3f40098d5 100644 --- a/util/range.c +++ b/util/range.c @@ -98,7 +98,7 @@ void range_inverse_array(GList *in, GList **rev, out = append_new_range(out, low, MIN(range_lob(r) - 1, high)); } - /* insert a range inbetween each original range until we reach high */ + /* insert a range in between each original range until we reach high */ for (; l->next; l = l->next) { r = (Range *)l->data; rn = (Range *)l->next->data;