On 11/11/2022 19.38, Stefan Weil wrote:
Am 11.11.22 um 19:28 schrieb Thomas Huth:

Fix typos (discovered with the 'codespell' utility).

Signed-off-by: Thomas Huth <th...@redhat.com>
---
  hw/s390x/ipl.h                      | 2 +-
  pc-bios/s390-ccw/cio.h              | 2 +-
  pc-bios/s390-ccw/iplb.h             | 2 +-
  target/s390x/cpu_models.h           | 4 ++--
  hw/s390x/s390-pci-vfio.c            | 2 +-
  hw/s390x/s390-virtio-ccw.c          | 6 +++---
  target/s390x/ioinst.c               | 2 +-
  target/s390x/tcg/excp_helper.c      | 2 +-
  target/s390x/tcg/fpu_helper.c       | 2 +-
  target/s390x/tcg/misc_helper.c      | 2 +-
  target/s390x/tcg/translate.c        | 4 ++--
  target/s390x/tcg/translate_vx.c.inc | 6 +++---
  pc-bios/s390-ccw/start.S            | 2 +-
  13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index dfc6dfd89c..7fc86e7905 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -140,7 +140,7 @@ void s390_ipl_clear_reset_request(void);
   * have an offset of 4 + n * 8 bytes within the struct in order
   * to keep it double-word aligned.
   * The total size of the struct must never exceed 28 bytes.
- * This definition must be kept in sync with the defininition
+ * This definition must be kept in sync with the definition
   * in pc-bios/s390-ccw/iplb.h.
   */
  struct QemuIplParameters {
diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
index 1e5d4e92e1..88a88adfd2 100644
--- a/pc-bios/s390-ccw/cio.h
+++ b/pc-bios/s390-ccw/cio.h
@@ -20,7 +20,7 @@ struct pmcw {
      __u32 intparm;      /* interruption parameter */
      __u32 qf:1;         /* qdio facility */
      __u32 w:1;
-    __u32 isc:3;        /* interruption sublass */
+    __u32 isc:3;        /* interruption subclass */
      __u32 res5:3;       /* reserved zeros */
      __u32 ena:1;        /* enabled */
      __u32 lm:2;         /* limit mode */
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index 772d5c57c9..cb6ac8a880 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -81,7 +81,7 @@ extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
  #define QIPL_FLAG_BM_OPTS_ZIPL  0x40
  /*
- * This definition must be kept in sync with the defininition
+ * This definition must be kept in sync with the definition
   * in hw/s390x/ipl.h
   */
  struct QemuIplParameters {
diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index 74d1f87e4f..15c0f0dcfe 100644
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -24,13 +24,13 @@ struct S390CPUDef {
      uint8_t gen;            /* hw generation identification */
      uint16_t type;          /* cpu type identification */
      uint8_t ec_ga;          /* EC GA version (on which also the BC is based) */
-    uint8_t mha_pow;        /* Maximum Host Adress Power, mha = 2^pow-1 */
+    uint8_t mha_pow;        /* Maximum Host Address Power, mha = 2^pow-1 */


This comment could use lower case words.

I thought so, too, but I guess the author used capital letters on purpose to make sure to explain the "mha" acronym this way ...

Anyway, I don't mind, we can also switch to lower case here, if that's preferred.


diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 2aefa508a0..5f0adb0b4a 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -313,7 +313,7 @@ retry:
  /*
   * Get the host function handle from the vfio CLP capabilities chain. Returns
   * true if a fh value was placed into the provided buffer.  Returns false
- * if a fh could not be obtained (ioctl failed or capabilitiy version does
+ * if a fh could not be obtained (ioctl failed or capability version does
   * not include the fh)
   */
  bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7d80bc1837..2e64ffab45 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -354,7 +354,7 @@ static int s390_machine_protect(S390CcwMachineState *ms)
      }
      error_setg(&pv_mig_blocker,
-               "protected VMs are currently not migrateable.");
+               "protected VMs are currently not migratable.");


This might again be a different British / American spelling.

Maybe ... I did some internet search but I did not found anything reliable apart from some few pages saying that "migrateable" is an alternative spelling for "migratable". Anyway, the latter seems much more common, so I think we should switch to it - also to silence codespell here in future runs.

 Thomas


Reply via email to