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(-)
Fix typos (discovered with the 'codespell' utility).
Signed-off-by: Thomas Huth <thuth@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 */
uint32_t hmfai; /* hypervisor-managed facilities */
/* base/min features, must never be changed between QEMU versions */
S390FeatBitmap base_feat;
/* used to init base_feat from generated data */
S390FeatInit base_init;
- /* deafault features, QEMU version specific */
+ /* default features, QEMU version specific */
S390FeatBitmap default_feat;
/* used to init default_feat from generated data */
S390FeatInit default_init;
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.");
rc = migrate_add_blocker(pv_mig_blocker, &local_err);
if (rc) {
ram_block_discard_disable(false);
@@ -449,7 +449,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason)
break;
case S390_RESET_MODIFIED_CLEAR:
/*
- * Susbsystem reset needs to be done before we unshare memory
+ * Subsystem reset needs to be done before we unshare memory
* and lose access to VIRTIO structures in guest memory.
*/
subsystem_reset();
@@ -462,7 +462,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason)
break;
case S390_RESET_LOAD_NORMAL:
/*
- * Susbsystem reset needs to be done before we unshare memory
+ * Subsystem reset needs to be done before we unshare memory
* and lose access to VIRTIO structures in guest memory.
*/
subsystem_reset();
diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index b12f18d346..053aaabb5a 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -285,7 +285,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb,
/*
* As operand exceptions have a lower priority than access exceptions,
* we check whether the memory area is writable (injecting the
- * access execption if it is not) first.
+ * access exception if it is not) first.
*/
if (!s390_cpu_virt_mem_check_write(cpu, addr, ar, sizeof(schib))) {
s390_program_interrupt(env, PGM_OPERAND, ra);
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index 2cd6d062b9..fe02d82201 100644
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -553,7 +553,7 @@ try_deliver:
/* don't trigger a cpu_loop_exit(), use an interrupt instead */
cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT);
} else if (cs->halted) {
- /* unhalt if we had a WAIT PSW somehwere in our injection chain */
+ /* unhalt if we had a WAIT PSW somewhere in our injection chain */
s390_cpu_unhalt(cpu);
}
}
diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c
index 4067205405..be80b2373c 100644
--- a/target/s390x/tcg/fpu_helper.c
+++ b/target/s390x/tcg/fpu_helper.c
@@ -89,7 +89,7 @@ static void handle_exceptions(CPUS390XState *env, bool XxC, uintptr_t retaddr)
/*
* invalid/divbyzero cannot coexist with other conditions.
* overflow/underflow however can coexist with inexact, we have to
- * handle it separatly.
+ * handle it separately.
*/
if (s390_exc & ~S390_IEEE_MASK_INEXACT) {
if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >> 24) {
diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c
index 10dadb002a..71388a7119 100644
--- a/target/s390x/tcg/misc_helper.c
+++ b/target/s390x/tcg/misc_helper.c
@@ -333,7 +333,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1)
/* same as machine type number in STORE CPU ID, but in EBCDIC */
snprintf(type, ARRAY_SIZE(type), "%X", cpu->model->def->type);
ebcdic_put(sysib.sysib_111.type, type, 4);
- /* model number (not stored in STORE CPU ID for z/Architecure) */
+ /* model number (not stored in STORE CPU ID for z/Architecture) */
ebcdic_put(sysib.sysib_111.model, "QEMU ", 16);
ebcdic_put(sysib.sysib_111.sequence, "QEMU ", 16);
ebcdic_put(sysib.sysib_111.plant, "QEMU", 4);
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 2fbdab7252..1e599ac259 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -435,7 +435,7 @@ static void gen_program_exception(DisasContext *s, int code)
{
TCGv_i32 tmp;
- /* Remember what pgm exeption this was. */
+ /* Remember what pgm exception this was. */
tmp = tcg_const_i32(code);
tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUS390XState, int_pgm_code));
tcg_temp_free_i32(tmp);
@@ -491,7 +491,7 @@ static TCGv_i64 get_address(DisasContext *s, int x2, int b2, int d2)
/*
* Note that d2 is limited to 20 bits, signed. If we crop negative
- * displacements early we create larger immedate addends.
+ * displacements early we create larger immediate addends.
*/
if (b2 && x2) {
tcg_gen_add_i64(tmp, regs[b2], regs[x2]);
diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc
index b69c1a111c..d39ee81cd6 100644
--- a/target/s390x/tcg/translate_vx.c.inc
+++ b/target/s390x/tcg/translate_vx.c.inc
@@ -960,7 +960,7 @@ static DisasJumpType op_vpk(DisasContext *s, DisasOps *o)
}
break;
case 0x94:
- /* If sources and destination dont't overlap -> fast path */
+ /* If sources and destination don't overlap -> fast path */
if (v1 != v2 && v1 != v3) {
const uint8_t src_es = get_field(s, m4);
const uint8_t dst_es = src_es - 1;
@@ -2075,7 +2075,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOps *o)
l2 = tcg_temp_new_i64();
h2 = tcg_temp_new_i64();
- /* Multipy both even elements from v2 and v3 */
+ /* Multiply both even elements from v2 and v3 */
read_vec_element_i64(l1, get_field(s, v2), 0, ES_64);
read_vec_element_i64(h1, get_field(s, v3), 0, ES_64);
tcg_gen_mulu2_i64(l1, h1, l1, h1);
@@ -2084,7 +2084,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOps *o)
tcg_gen_add2_i64(l1, h1, l1, h1, l1, h1);
}
- /* Multipy both odd elements from v2 and v3 */
+ /* Multiply both odd elements from v2 and v3 */
read_vec_element_i64(l2, get_field(s, v2), 1, ES_64);
read_vec_element_i64(h2, get_field(s, v3), 1, ES_64);
tcg_gen_mulu2_i64(l2, h2, l2, h2);
diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
index 4d5ad21653..6072906df4 100644
--- a/pc-bios/s390-ccw/start.S
+++ b/pc-bios/s390-ccw/start.S
@@ -19,7 +19,7 @@ _start:
larl %r2, __bss_start
larl %r3, _end
slgr %r3, %r2 /* get sizeof bss */
- ltgr %r3,%r3 /* bss emtpy? */
+ ltgr %r3,%r3 /* bss empty? */
jz done
aghi %r3,-1
srlg %r4,%r3,8 /* how many 256 byte chunks? */
--
2.31.1
On Fri, Nov 11, 2022 at 07:28:28PM +0100, Thomas Huth wrote: > Fix typos (discovered with the 'codespell' utility). > > Signed-off-by: Thomas Huth <thuth@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(-) Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Am 11.11.22 um 19:28 schrieb Thomas Huth: > Fix typos (discovered with the 'codespell' utility). > > Signed-off-by: Thomas Huth <thuth@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. > uint32_t hmfai; /* hypervisor-managed facilities */ > /* base/min features, must never be changed between QEMU versions */ > S390FeatBitmap base_feat; > /* used to init base_feat from generated data */ > S390FeatInit base_init; > - /* deafault features, QEMU version specific */ > + /* default features, QEMU version specific */ > S390FeatBitmap default_feat; > /* used to init default_feat from generated data */ > S390FeatInit default_init; > 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. > rc = migrate_add_blocker(pv_mig_blocker, &local_err); > if (rc) { > ram_block_discard_disable(false); > @@ -449,7 +449,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason) > break; > case S390_RESET_MODIFIED_CLEAR: > /* > - * Susbsystem reset needs to be done before we unshare memory > + * Subsystem reset needs to be done before we unshare memory > * and lose access to VIRTIO structures in guest memory. > */ > subsystem_reset(); > @@ -462,7 +462,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason) > break; > case S390_RESET_LOAD_NORMAL: > /* > - * Susbsystem reset needs to be done before we unshare memory > + * Subsystem reset needs to be done before we unshare memory > * and lose access to VIRTIO structures in guest memory. > */ > subsystem_reset(); > diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c > index b12f18d346..053aaabb5a 100644 > --- a/target/s390x/ioinst.c > +++ b/target/s390x/ioinst.c > @@ -285,7 +285,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, > /* > * As operand exceptions have a lower priority than access exceptions, > * we check whether the memory area is writable (injecting the > - * access execption if it is not) first. > + * access exception if it is not) first. > */ > if (!s390_cpu_virt_mem_check_write(cpu, addr, ar, sizeof(schib))) { > s390_program_interrupt(env, PGM_OPERAND, ra); > diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c > index 2cd6d062b9..fe02d82201 100644 > --- a/target/s390x/tcg/excp_helper.c > +++ b/target/s390x/tcg/excp_helper.c > @@ -553,7 +553,7 @@ try_deliver: > /* don't trigger a cpu_loop_exit(), use an interrupt instead */ > cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT); > } else if (cs->halted) { > - /* unhalt if we had a WAIT PSW somehwere in our injection chain */ > + /* unhalt if we had a WAIT PSW somewhere in our injection chain */ > s390_cpu_unhalt(cpu); > } > } > diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c > index 4067205405..be80b2373c 100644 > --- a/target/s390x/tcg/fpu_helper.c > +++ b/target/s390x/tcg/fpu_helper.c > @@ -89,7 +89,7 @@ static void handle_exceptions(CPUS390XState *env, bool XxC, uintptr_t retaddr) > /* > * invalid/divbyzero cannot coexist with other conditions. > * overflow/underflow however can coexist with inexact, we have to > - * handle it separatly. > + * handle it separately. > */ > if (s390_exc & ~S390_IEEE_MASK_INEXACT) { > if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >> 24) { > diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c > index 10dadb002a..71388a7119 100644 > --- a/target/s390x/tcg/misc_helper.c > +++ b/target/s390x/tcg/misc_helper.c > @@ -333,7 +333,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1) > /* same as machine type number in STORE CPU ID, but in EBCDIC */ > snprintf(type, ARRAY_SIZE(type), "%X", cpu->model->def->type); > ebcdic_put(sysib.sysib_111.type, type, 4); > - /* model number (not stored in STORE CPU ID for z/Architecure) */ > + /* model number (not stored in STORE CPU ID for z/Architecture) */ > ebcdic_put(sysib.sysib_111.model, "QEMU ", 16); > ebcdic_put(sysib.sysib_111.sequence, "QEMU ", 16); > ebcdic_put(sysib.sysib_111.plant, "QEMU", 4); > diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c > index 2fbdab7252..1e599ac259 100644 > --- a/target/s390x/tcg/translate.c > +++ b/target/s390x/tcg/translate.c > @@ -435,7 +435,7 @@ static void gen_program_exception(DisasContext *s, int code) > { > TCGv_i32 tmp; > > - /* Remember what pgm exeption this was. */ > + /* Remember what pgm exception this was. */ > tmp = tcg_const_i32(code); > tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUS390XState, int_pgm_code)); > tcg_temp_free_i32(tmp); > @@ -491,7 +491,7 @@ static TCGv_i64 get_address(DisasContext *s, int x2, int b2, int d2) > > /* > * Note that d2 is limited to 20 bits, signed. If we crop negative > - * displacements early we create larger immedate addends. > + * displacements early we create larger immediate addends. > */ > if (b2 && x2) { > tcg_gen_add_i64(tmp, regs[b2], regs[x2]); > diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc > index b69c1a111c..d39ee81cd6 100644 > --- a/target/s390x/tcg/translate_vx.c.inc > +++ b/target/s390x/tcg/translate_vx.c.inc > @@ -960,7 +960,7 @@ static DisasJumpType op_vpk(DisasContext *s, DisasOps *o) > } > break; > case 0x94: > - /* If sources and destination dont't overlap -> fast path */ > + /* If sources and destination don't overlap -> fast path */ > if (v1 != v2 && v1 != v3) { > const uint8_t src_es = get_field(s, m4); > const uint8_t dst_es = src_es - 1; > @@ -2075,7 +2075,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOps *o) > l2 = tcg_temp_new_i64(); > h2 = tcg_temp_new_i64(); > > - /* Multipy both even elements from v2 and v3 */ > + /* Multiply both even elements from v2 and v3 */ > read_vec_element_i64(l1, get_field(s, v2), 0, ES_64); > read_vec_element_i64(h1, get_field(s, v3), 0, ES_64); > tcg_gen_mulu2_i64(l1, h1, l1, h1); > @@ -2084,7 +2084,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOps *o) > tcg_gen_add2_i64(l1, h1, l1, h1, l1, h1); > } > > - /* Multipy both odd elements from v2 and v3 */ > + /* Multiply both odd elements from v2 and v3 */ > read_vec_element_i64(l2, get_field(s, v2), 1, ES_64); > read_vec_element_i64(h2, get_field(s, v3), 1, ES_64); > tcg_gen_mulu2_i64(l2, h2, l2, h2); > diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S > index 4d5ad21653..6072906df4 100644 > --- a/pc-bios/s390-ccw/start.S > +++ b/pc-bios/s390-ccw/start.S > @@ -19,7 +19,7 @@ _start: > larl %r2, __bss_start > larl %r3, _end > slgr %r3, %r2 /* get sizeof bss */ > - ltgr %r3,%r3 /* bss emtpy? */ > + ltgr %r3,%r3 /* bss empty? */ > jz done > aghi %r3,-1 > srlg %r4,%r3,8 /* how many 256 byte chunks? */ Thanks. Reviewed-by: Stefan Weil <sw@weilnetz.de>
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 <thuth@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
© 2016 - 2024 Red Hat, Inc.