system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-09 12:36:32 +00:00
Code Issues Projects Releases Wiki Activity

s390x: Fix spelling errors

Browse Source 
Fix typos (discovered with the 'codespell' utility).
Note: Though "migrateable" still seems to be a valid spelling, we change
it to "migratable" since this is the way more common spelling here.

Message-Id: <20221111182828.282251-1-thuth@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2022-11-11 19:17:33 +01:00
parent 2c8311241d
commit 44ee69ea16
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/ipl.h
View File

@ -140,7 +140,7 @@ void s390_ipl_clear_reset_request(void);
* have an offset of 4 + n * 8 bytes within the struct in order * have an offset of 4 + n * 8 bytes within the struct in order
* to keep it double-word aligned. * to keep it double-word aligned.
* The total size of the struct must never exceed 28 bytes. * 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. * in pc-bios/s390-ccw/iplb.h.
*/ */
struct QemuIplParameters { struct QemuIplParameters {

2
hw/s390x/s390-pci-vfio.c
View File

@ -313,7 +313,7 @@ retry:
/* /*
* Get the host function handle from the vfio CLP capabilities chain. Returns * 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 * 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) * not include the fh)
*/ */
bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh) bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh)

6
hw/s390x/s390-virtio-ccw.c
View File

@ -354,7 +354,7 @@ static int s390_machine_protect(S390CcwMachineState *ms)
} }
error_setg(&pv_mig_blocker, 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); rc = migrate_add_blocker(pv_mig_blocker, &local_err);
if (rc) { if (rc) {
ram_block_discard_disable(false); ram_block_discard_disable(false);
@ -449,7 +449,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason)
break; break;
case S390_RESET_MODIFIED_CLEAR: 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. * and lose access to VIRTIO structures in guest memory.
*/ */
subsystem_reset(); subsystem_reset();
@ -462,7 +462,7 @@ static void s390_machine_reset(MachineState *machine, ShutdownCause reason)
break; break;
case S390_RESET_LOAD_NORMAL: 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. * and lose access to VIRTIO structures in guest memory.
*/ */
subsystem_reset(); subsystem_reset();

2
pc-bios/s390-ccw/cio.h
View File

@ -20,7 +20,7 @@ struct pmcw {
__u32 intparm; /* interruption parameter */ __u32 intparm; /* interruption parameter */
__u32 qf:1; /* qdio facility */ __u32 qf:1; /* qdio facility */
__u32 w:1; __u32 w:1;
__u32 isc:3; /* interruption sublass */ __u32 isc:3; /* interruption subclass */
__u32 res5:3; /* reserved zeros */ __u32 res5:3; /* reserved zeros */
__u32 ena:1; /* enabled */ __u32 ena:1; /* enabled */
__u32 lm:2; /* limit mode */ __u32 lm:2; /* limit mode */

2
pc-bios/s390-ccw/iplb.h
View File

@ -81,7 +81,7 @@ extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
#define QIPL_FLAG_BM_OPTS_ZIPL 0x40 #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 * in hw/s390x/ipl.h
*/ */
struct QemuIplParameters { struct QemuIplParameters {

2
pc-bios/s390-ccw/start.S
View File

@ -19,7 +19,7 @@ _start:
larl %r2, __bss_start larl %r2, __bss_start
larl %r3, _end larl %r3, _end
slgr %r3, %r2 /* get sizeof bss */ slgr %r3, %r2 /* get sizeof bss */
ltgr %r3,%r3 /* bss emtpy? */ ltgr %r3,%r3 /* bss empty? */
jz done jz done
aghi %r3,-1 aghi %r3,-1
srlg %r4,%r3,8 /* how many 256 byte chunks? */ srlg %r4,%r3,8 /* how many 256 byte chunks? */

4
target/s390x/cpu_models.h
View File

@ -24,13 +24,13 @@ struct S390CPUDef {
uint8_t gen; /* hw generation identification */ uint8_t gen; /* hw generation identification */
uint16_t type; /* cpu type identification */ uint16_t type; /* cpu type identification */
uint8_t ec_ga; /* EC GA version (on which also the BC is based) */ 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 */ uint32_t hmfai; /* hypervisor-managed facilities */
/* base/min features, must never be changed between QEMU versions */ /* base/min features, must never be changed between QEMU versions */
S390FeatBitmap base_feat; S390FeatBitmap base_feat;
/* used to init base_feat from generated data */ /* used to init base_feat from generated data */
S390FeatInit base_init; S390FeatInit base_init;
/* deafault features, QEMU version specific */ /* default features, QEMU version specific */
S390FeatBitmap default_feat; S390FeatBitmap default_feat;
/* used to init default_feat from generated data */ /* used to init default_feat from generated data */
S390FeatInit default_init; S390FeatInit default_init;

2
target/s390x/ioinst.c
View File

@ -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, * As operand exceptions have a lower priority than access exceptions,
* we check whether the memory area is writable (injecting the * 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))) { if (!s390_cpu_virt_mem_check_write(cpu, addr, ar, sizeof(schib))) {
s390_program_interrupt(env, PGM_OPERAND, ra); s390_program_interrupt(env, PGM_OPERAND, ra);

2
target/s390x/tcg/excp_helper.c
View File

@ -553,7 +553,7 @@ try_deliver:
/* don't trigger a cpu_loop_exit(), use an interrupt instead */ /* don't trigger a cpu_loop_exit(), use an interrupt instead */
cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT); cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT);
} else if (cs->halted) { } 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); s390_cpu_unhalt(cpu);
} }
} }

2
target/s390x/tcg/fpu_helper.c
View File

@ -89,7 +89,7 @@ static void handle_exceptions(CPUS390XState *env, bool XxC, uintptr_t retaddr)
/* /*
* invalid/divbyzero cannot coexist with other conditions. * invalid/divbyzero cannot coexist with other conditions.
* overflow/underflow however can coexist with inexact, we have to * 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) {
if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >> 24) { if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >> 24) {

2
target/s390x/tcg/misc_helper.c
View File

@ -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 */ /* same as machine type number in STORE CPU ID, but in EBCDIC */
snprintf(type, ARRAY_SIZE(type), "%X", cpu->model->def->type); snprintf(type, ARRAY_SIZE(type), "%X", cpu->model->def->type);
ebcdic_put(sysib.sysib_111.type, type, 4); 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.model, "QEMU ", 16);
ebcdic_put(sysib.sysib_111.sequence, "QEMU ", 16); ebcdic_put(sysib.sysib_111.sequence, "QEMU ", 16);
ebcdic_put(sysib.sysib_111.plant, "QEMU", 4); ebcdic_put(sysib.sysib_111.plant, "QEMU", 4);

4
target/s390x/tcg/translate.c
View File

@ -435,7 +435,7 @@ static void gen_program_exception(DisasContext *s, int code)
{ {
TCGv_i32 tmp; TCGv_i32 tmp;
/* Remember what pgm exeption this was. */ /* Remember what pgm exception this was. */
tmp = tcg_const_i32(code); tmp = tcg_const_i32(code);
tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUS390XState, int_pgm_code)); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUS390XState, int_pgm_code));
tcg_temp_free_i32(tmp); 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 * 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) { if (b2 && x2) {
tcg_gen_add_i64(tmp, regs[b2], regs[x2]); tcg_gen_add_i64(tmp, regs[b2], regs[x2]);

6
target/s390x/tcg/translate_vx.c.inc
View File

@ -960,7 +960,7 @@ static DisasJumpType op_vpk(DisasContext *s, DisasOps *o)
} }
break; break;
case 0x94: 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) { if (v1 != v2 && v1 != v3) {
const uint8_t src_es = get_field(s, m4); const uint8_t src_es = get_field(s, m4);
const uint8_t dst_es = src_es - 1; 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(); l2 = tcg_temp_new_i64();
h2 = 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(l1, get_field(s, v2), 0, ES_64);
read_vec_element_i64(h1, get_field(s, v3), 0, ES_64); read_vec_element_i64(h1, get_field(s, v3), 0, ES_64);
tcg_gen_mulu2_i64(l1, h1, l1, h1); 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); 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(l2, get_field(s, v2), 1, ES_64);
read_vec_element_i64(h2, get_field(s, v3), 1, ES_64); read_vec_element_i64(h2, get_field(s, v3), 1, ES_64);
tcg_gen_mulu2_i64(l2, h2, l2, h2); tcg_gen_mulu2_i64(l2, h2, l2, h2);