[PULL 0/4] Trivial patches for 2026-03-23

[PULL 0/4] Trivial patches for 2026-03-23

[Michael Tokarev]

The following changes since commit eb153d8fd3be325a5aa7e1a6a73be8854eeaaf27:

  Merge tag 'pull-target-arm-20260323' of https://gitlab.com/pm215/qemu into staging (2026-03-23 10:55:20 +0000)

are available in the Git repository at:

  https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches

for you to fetch changes up to 8ef2576d32dcabc3cfe9abfde7c23c1587444584:

  Fix several typos in documentation (found by codespell) (2026-03-23 15:14:34 +0300)

----------------------------------------------------------------
trivial patches for 2026-03-23

minor u2f tweaks ny Stefan, and small docs/comments updates

----------------------------------------------------------------
Stefan Weil (3):
      Fix include statement for u2f-emu.h
      docs: Update GitHub URL of libu2f-emu
      Fix several typos in documentation (found by codespell)

xieyi (1):
      tests: fix typo in char unit test comment

 contrib/plugins/traps.c         | 2 +-
 docs/about/emulation.rst        | 2 +-
 docs/devel/code-provenance.rst  | 4 ++--
 docs/system/devices/usb-u2f.rst | 2 +-
 docs/system/tls.rst             | 8 ++++----
 hw/arm/virt.c                   | 2 +-
 hw/usb/u2f-emulated.c           | 2 +-
 include/hw/arm/virt.h           | 2 +-
 include/plugins/qemu-plugin.h   | 2 +-
 qapi/block-core.json            | 8 ++++----
 qapi/job.json                   | 2 +-
 qapi/uefi.json                  | 2 +-
 qemu-options.hx                 | 6 +++---
 tests/unit/test-char.c          | 2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)

[PULL 1/4] tests: fix typo in char unit test comment

[Michael Tokarev]

From: xieyi <xieyi@kylinos.cn>

Signed-off-by: xieyi <xieyi@kylinos.cn>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 tests/unit/test-char.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/test-char.c b/tests/unit/test-char.c
index 2869c4e09d..b88b557133 100644
--- a/tests/unit/test-char.c
+++ b/tests/unit/test-char.c
@@ -710,7 +710,7 @@ static void char_hub_test(void)
         /*
          * Now we are good to go, first repeat "lost" sequence, which
          * was already consumed and drained by the ring buffers, but
-         * pipe have not recieved that yet.
+         * the pipe has not received it yet.
          */
         ret = qemu_chr_fe_write(&chr_fe, (void *)"thisisit", 8);
         g_assert_cmpint(ret, ==, 8);
-- 
2.47.3

[PULL 2/4] Fix include statement for u2f-emu.h

[Michael Tokarev]

From: Stefan Weil via <qemu-trivial@nongnu.org>

All examples on https://github.com/Agnoctopus/libu2f-emu/ don't
simply include u2f-emu.h without any added directory.

The additional include directory does not exist when libu2f
was built with meson.

It's up to pkgconfig to make sure that u2f-emu.h is found in any case.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/usb/u2f-emulated.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c
index 196d05a83a..b82a315019 100644
--- a/hw/usb/u2f-emulated.c
+++ b/hw/usb/u2f-emulated.c
@@ -31,7 +31,7 @@
 #include "hw/usb/usb.h"
 #include "hw/core/qdev-properties.h"
 
-#include <u2f-emu/u2f-emu.h>
+#include <u2f-emu.h>
 
 #include "u2f.h"
 
-- 
2.47.3

[PULL 3/4] docs: Update GitHub URL of libu2f-emu

[Michael Tokarev]

From: Stefan Weil via <qemu-trivial@nongnu.org>

This avoids a redirect from the old to the new URL.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 docs/system/devices/usb-u2f.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/system/devices/usb-u2f.rst b/docs/system/devices/usb-u2f.rst
index 4f57d5c8c3..f7ca127cbb 100644
--- a/docs/system/devices/usb-u2f.rst
+++ b/docs/system/devices/usb-u2f.rst
@@ -41,7 +41,7 @@ requires a working libudev):
 ----------------
 
 ``u2f-emulated`` is a completely software emulated U2F device.
-It uses `libu2f-emu <https://github.com/MattGorko/libu2f-emu>`__
+It uses `libu2f-emu <https://github.com/Agnoctopus/libu2f-emu>`__
 for the U2F key emulation. libu2f-emu
 provides a complete implementation of the U2F protocol device part for
 all specified transports given by the FIDO Alliance.
-- 
2.47.3

[PULL 4/4] Fix several typos in documentation (found by codespell)

[Michael Tokarev]

From: Stefan Weil via <qemu-trivial@nongnu.org>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
[Mjt: add 2 fixes suggested by Peter: "as a" and "deactivate"]
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 contrib/plugins/traps.c        | 2 +-
 docs/about/emulation.rst       | 2 +-
 docs/devel/code-provenance.rst | 4 ++--
 docs/system/tls.rst            | 8 ++++----
 hw/arm/virt.c                  | 2 +-
 include/hw/arm/virt.h          | 2 +-
 include/plugins/qemu-plugin.h  | 2 +-
 qapi/block-core.json           | 8 ++++----
 qapi/job.json                  | 2 +-
 qapi/uefi.json                 | 2 +-
 qemu-options.hx                | 6 +++---
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/contrib/plugins/traps.c b/contrib/plugins/traps.c
index d5ddc0f3dd..a741580fbf 100644
--- a/contrib/plugins/traps.c
+++ b/contrib/plugins/traps.c
@@ -4,7 +4,7 @@
  *
  * Traps - count traps
  *
- * Count the number of interrupts (asyncronous events), exceptions (synchronous
+ * Count the number of interrupts (asynchronous events), exceptions (synchronous
  * events) and host calls (e.g. semihosting) per cpu and report those counts on
  * exit.
  */
diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst
index 76c6ea92ca..469f31bab6 100644
--- a/docs/about/emulation.rst
+++ b/docs/about/emulation.rst
@@ -1043,7 +1043,7 @@ Count traps
 
 ``contrib/plugins/traps.c``
 
-This plugin counts the number of interrupts (asyncronous events), exceptions
+This plugin counts the number of interrupts (asynchronous events), exceptions
 (synchronous events) and host calls (e.g. semihosting) per cpu.
 
 Other emulation features
diff --git a/docs/devel/code-provenance.rst b/docs/devel/code-provenance.rst
index 8cdc56f664..4e6a9afe0d 100644
--- a/docs/devel/code-provenance.rst
+++ b/docs/devel/code-provenance.rst
@@ -213,7 +213,7 @@ The general principles when picking up abandoned work are:
  * Indicate where the original patch was obtained from (mailing list, bug
    tracker, author's git repo, etc) when sending it for review
  * Acknowledge the extra work of the new contributor by including their
-   ``Signed-off-by`` in the patch in addition to the orignal author's
+   ``Signed-off-by`` in the patch in addition to the original author's
  * Indicate who is responsible for what parts of the patch. This is typically
    done via a note in the commit message, just prior to the new contributor's
    ``Signed-off-by``::
@@ -259,7 +259,7 @@ process. A non-exhaustive list of examples is:
    container images from a clean git checkout.
 
  * eBPF: QEMU includes some generated eBPF machine code, since the required
-   eBPF compilation tools are not broadly available on all targetted OS
+   eBPF compilation tools are not broadly available on all targeted OS
    distributions. The corresponding eBPF C code for the binary is also
    provided. This is a time-limited exception until the eBPF toolchain is
    sufficiently broadly available in distros.
diff --git a/docs/system/tls.rst b/docs/system/tls.rst
index 03fa1d8166..477ec7dcd1 100644
--- a/docs/system/tls.rst
+++ b/docs/system/tls.rst
@@ -76,10 +76,10 @@ loaded certificate will preferred. IOW file naming can influence
 which certificates are used for a session.
 
 The use of multiple sets of certificates is intended to allow an
-incremental transition to certificates using different crytographic
+incremental transition to certificates using different cryptographic
 algorithms. This allows a newly deployed QEMU to introduce use of
 stronger cryptographic algorithms that will be preferred when talking
-to other newly deployed QEMU instances, while retaining compatbility
+to other newly deployed QEMU instances, while retaining compatibility
 with certificates issued to a historically deployed QEMU. This is
 notably useful to support live migration from an old QEMU deployed
 on older operating system releases, which may support fewer crypto
@@ -350,7 +350,7 @@ TLS certificates for Post-Quantum Cryptography
 
 Given a new enough gnutls release, suitably integrated & configured with the
 operating system crypto policies, QEMU is able to support post-quantum
-crytography on TLS enabled services, either exclusively or in a hybrid mode.
+cryptography on TLS enabled services, either exclusively or in a hybrid mode.
 
 In exclusive mode, only a single set of certificates need to be configured
 for QEMU, with PQC compliant algorithms. Such a QEMU configuration will only
@@ -404,7 +404,7 @@ Force disabling PQC via crypto priority
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In the OS configuration for system crypto algorithm priorities has
-enabled PQC, this can (optionally) be overriden in QEMU configuration
+enabled PQC, this can (optionally) be overridden in QEMU configuration
 disable use of PQC using the ``priority`` parameter to the ``tls-creds-x509``
 object::
 
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 06798c6c0f..ec0d8475ca 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2784,7 +2784,7 @@ static void virt_set_msi(Object *obj, const char *value, Error **errp)
     VirtMachineState *vms = VIRT_MACHINE(obj);
 
     if (!strcmp(value, "auto")) {
-        vms->msi_controller = VIRT_MSI_CTRL_AUTO; /* Will be overriden later */
+        vms->msi_controller = VIRT_MSI_CTRL_AUTO; /* Will be overridden later */
     } else if (!strcmp(value, "its")) {
         vms->msi_controller = VIRT_MSI_CTRL_ITS;
     } else if (!strcmp(value, "gicv2m")) {
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index dba8ac7f2f..5fcbd1c76f 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -101,7 +101,7 @@ typedef enum VirtIOMMUType {
 
 typedef enum VirtMSIControllerType {
     VIRT_MSI_CTRL_NONE,
-    /* This value is overriden at runtime.*/
+    /* This value is overridden at runtime.*/
     VIRT_MSI_CTRL_AUTO,
     /* Legacy option: its=off provides a GICv2m when using GICv2 */
     VIRT_MSI_LEGACY_OPT_ITS_OFF,
diff --git a/include/plugins/qemu-plugin.h b/include/plugins/qemu-plugin.h
index 9e4e40acee..2ce7a7fb6c 100644
--- a/include/plugins/qemu-plugin.h
+++ b/include/plugins/qemu-plugin.h
@@ -1125,7 +1125,7 @@ bool qemu_plugin_read_register(struct qemu_plugin_register *handle,
  * Attempting to write a register with @buf smaller than the register size
  * will result in a crash or other undesired behavior.
  *
- * Returns true on sucess, false on failure.
+ * Returns true on success, false on failure.
  */
 QEMU_PLUGIN_API
 bool qemu_plugin_write_register(struct qemu_plugin_register *handle,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index f8d446b3d6..508b081ac1 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3122,7 +3122,7 @@
 # the device to write to the target path only.  Note that drive
 # mirroring includes `drive-mirror`, `blockdev-mirror` and
 # `block-commit` job (only in case of "active commit", when the node
-# being commited is used by the guest).  The ability to complete is
+# being committed is used by the guest).  The ability to complete is
 # signaled with a `BLOCK_JOB_READY` event.
 #
 # This command completes an active background block operation
@@ -5086,14 +5086,14 @@
 ##
 # @blockdev-set-active:
 #
-# Activate or inactivate a block device.  Use this to manage the
+# Activate or deactivate a block device.  Use this to manage the
 # handover of block devices on migration with qemu-storage-daemon.
 #
 # Activating a node automatically activates all of its child nodes
-# first.  Inactivating a node automatically inactivates any of its
+# first.  Deactivating a node automatically deactivates any of its
 # child nodes that are not in use by a still active node.
 #
-# @node-name: Name of the graph node to activate or inactivate.  By
+# @node-name: Name of the graph node to activate or deactivate.  By
 #     default, all nodes are affected by the operation.
 #
 # @active: true if the nodes should be active when the command returns
diff --git a/qapi/job.json b/qapi/job.json
index 0a301fc094..31618e6ebc 100644
--- a/qapi/job.json
+++ b/qapi/job.json
@@ -196,7 +196,7 @@
 # the device to write to the target path only.  Note that drive
 # mirroring includes `drive-mirror`, `blockdev-mirror` and
 # `block-commit` job (only in case of "active commit", when the node
-# being commited is used by the guest).  The ability to complete is
+# being committed is used by the guest).  The ability to complete is
 # signaled with a `BLOCK_JOB_READY` event.
 #
 # This command completes an active background block operation
diff --git a/qapi/uefi.json b/qapi/uefi.json
index a206c2e953..86f33b234b 100644
--- a/qapi/uefi.json
+++ b/qapi/uefi.json
@@ -18,7 +18,7 @@
 ##
 # @UefiVariable:
 #
-# UEFI Variable.  Check the UEFI specifification for more detailed
+# UEFI Variable.  Check the UEFI specification for more detailed
 # information on the fields.
 #
 # @guid: variable namespace GUID
diff --git a/qemu-options.hx b/qemu-options.hx
index 69e5a874c1..dbcb0155ba 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3223,7 +3223,7 @@ SRST
         Enable/disable list in DHCP/DHCPv6/NDP
 
     ``map-host-loopback``
-        Addresse to refer to host
+        Address to refer to host
 
     ``map-guest-addr``
         Addr to translate to guest's address
@@ -3271,8 +3271,8 @@ SRST
         UDP ports to forward
 
     ``param=string``
-         ``string`` will be passed to passt has a command line parameter,
-         we can have multiple occurences of the ``param`` parameter to
+         ``string`` will be passed to passt as a command line parameter,
+         we can have multiple occurrences of the ``param`` parameter to
          pass multiple parameters to passt.
 
          For instance, to pass ``--trace --log=trace.log``:
-- 
2.47.3

Re: [PULL 0/4] Trivial patches for 2026-03-23

[Peter Maydell]

On Mon, 23 Mar 2026 at 13:03, Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> The following changes since commit eb153d8fd3be325a5aa7e1a6a73be8854eeaaf27:
>
>   Merge tag 'pull-target-arm-20260323' of https://gitlab.com/pm215/qemu into staging (2026-03-23 10:55:20 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches
>
> for you to fetch changes up to 8ef2576d32dcabc3cfe9abfde7c23c1587444584:
>
>   Fix several typos in documentation (found by codespell) (2026-03-23 15:14:34 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2026-03-23
>
> minor u2f tweaks ny Stefan, and small docs/comments updates
>
> ----------------------------------------------------------------

ERROR: pull request includes commits attributed to list

$ git log --no-mailmap
[...]
commit 8ef2576d32dcabc3cfe9abfde7c23c1587444584
Author: Stefan Weil via <qemu-trivial@nongnu.org>

and similarly for the others by Stefan.

Could you fix and respin, please?

thanks
-- PMM