Le 09/03/2021 à 12:15, Michael Tokarev a écrit : > An assorted set of spelling fixes in various places. > > Signed-off-by: Michael Tokarev <m...@tls.msk.ru> > Reviewed-by: Stefan Weil <s...@weilnetz.de> > --- > V1: https://lists.nongnu.org/archive/html/qemu-devel/2020-12/msg05959.html > Changes: incorporated suggestions by Stefan Weil and added his R-b. > > Please note: this also patches one file in disas/ > > disas/nanomips.cpp | 2 +- > hw/misc/trace-events | 2 +- > hw/net/allwinner-sun8i-emac.c | 2 +- > hw/ppc/pnv_bmc.c | 2 +- > hw/usb/ccid-card-emulated.c | 2 +- > hw/usb/hcd-ohci.c | 2 +- > hw/virtio/vhost.c | 2 +- > include/hw/s390x/css.h | 2 +- > qemu-options.hx | 4 ++-- > target/i386/cpu.c | 2 +- > target/i386/machine.c | 2 +- > target/m68k/op_helper.c | 2 +- > target/riscv/cpu.c | 2 +- > 13 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp > index 90e63b8367..2b09655271 100644 > --- a/disas/nanomips.cpp > +++ b/disas/nanomips.cpp > @@ -837,7 +837,7 @@ int NMD::Disassemble(const uint16 * data, std::string & > dis, > * an ASE attribute and the requested version > * not having that attribute > */ > - dis = "ASE attribute missmatch"; > + dis = "ASE attribute mismatch"; > return -5; > } > disassembly_function dis_fn = > table[i].disassembly; > diff --git a/hw/misc/trace-events b/hw/misc/trace-events > index d626b9d7a7..ef0a4de39d 100644 > --- a/hw/misc/trace-events > +++ b/hw/misc/trace-events > @@ -127,7 +127,7 @@ npcm7xx_pwm_update_freq(const char *id, uint8_t index, > uint32_t old_value, uint3 > npcm7xx_pwm_update_duty(const char *id, uint8_t index, uint32_t old_value, > uint32_t new_value) "%s pwm[%u] Update Duty: old_duty: %u, new_duty: %u" > > # stm32f4xx_syscfg.c > -stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interupt: GPIO: %d, > Line: %d; Level: %d" > +stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interrupt: GPIO: > %d, Line: %d; Level: %d" > stm32f4xx_pulse_exti(int irq) "Pulse EXTI: %d" > stm32f4xx_syscfg_read(uint64_t addr) "reg read: addr: 0x%" PRIx64 " " > stm32f4xx_syscfg_write(uint64_t addr, uint64_t data) "reg write: addr: 0x%" > PRIx64 " val: 0x%" PRIx64 "" > diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c > index 042768922c..bf91803d65 100644 > --- a/hw/net/allwinner-sun8i-emac.c > +++ b/hw/net/allwinner-sun8i-emac.c > @@ -579,7 +579,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, > hwaddr offset, > case REG_INT_STA: /* Interrupt Status */ > value = s->int_sta; > break; > - case REG_INT_EN: /* Interupt Enable */ > + case REG_INT_EN: /* Interrupt Enable */ > value = s->int_en; > break; > case REG_TX_CTL_0: /* Transmit Control 0 */ > diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c > index b9bf5735ea..75a22ce50b 100644 > --- a/hw/ppc/pnv_bmc.c > +++ b/hw/ppc/pnv_bmc.c > @@ -233,7 +233,7 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, > unsigned int cmd_len, > case HIOMAP_C_RESET: > case HIOMAP_C_LOCK: > default: > - qemu_log_mask(LOG_GUEST_ERROR, "HIOMAP: unknow command %02X\n", > cmd[2]); > + qemu_log_mask(LOG_GUEST_ERROR, "HIOMAP: unknown command %02X\n", > cmd[2]); > break; > } > } > diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c > index 2d566f7db1..5c76bed77a 100644 > --- a/hw/usb/ccid-card-emulated.c > +++ b/hw/usb/ccid-card-emulated.c > @@ -301,7 +301,7 @@ static void *event_thread(void *arg) > } else { > if (event->reader != card->reader) { > fprintf(stderr, > - "ERROR: wrong reader: quiting event_thread\n"); > + "ERROR: wrong reader: quitting event_thread\n"); > break; > } > } > diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c > index f8c64c8b95..1cf2816772 100644 > --- a/hw/usb/hcd-ohci.c > +++ b/hw/usb/hcd-ohci.c > @@ -1126,7 +1126,7 @@ static int ohci_service_td(OHCIState *ohci, struct > ohci_ed *ed) > OHCI_SET_BM(td.flags, TD_EC, 3); > break; > } > - /* An error occured so we have to clear the interrupt counter. > See > + /* An error occurred so we have to clear the interrupt counter. > See > * spec at 6.4.4 on page 104 */ > ohci->done_count = 0; > } > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index 2a01662b08..e2163a0d63 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -909,7 +909,7 @@ check_dev_state: > r = 0; > } > if (r) { > - /* An error is occured. */ > + /* An error occurred. */ > dev->log_enabled = false; > } > > diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h > index 08c869ab0a..7901ab276c 100644 > --- a/include/hw/s390x/css.h > +++ b/include/hw/s390x/css.h > @@ -133,7 +133,7 @@ struct SubchDev { > bool ccw_fmt_1; > bool thinint_active; > uint8_t ccw_no_data_cnt; > - uint16_t migrated_schid; /* used for missmatch detection */ > + uint16_t migrated_schid; /* used for mismatch detection */ > CcwDataStream cds; > /* transport-provided data: */ > int (*ccw_cb) (SubchDev *, CCW1); > diff --git a/qemu-options.hx b/qemu-options.hx > index 90801286c6..c324633fca 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -176,7 +176,7 @@ SRST > > ``thread=single|multi`` > Controls number of TCG threads. When the TCG is multi-threaded > - there will be one thread per vCPU therefor taking advantage of > + there will be one thread per vCPU therefore taking advantage of > additional host cores. The default is to enable multi-threading > where both the back-end and front-ends support it and no > incompatible TCG features have been enabled (e.g. > @@ -2445,7 +2445,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, > " use 'vhostfd=h' to connect to an already opened vhost > net device\n" > " use 'vhostfds=x:y:...:z to connect to multiple already > opened vhost net devices\n" > " use 'queues=n' to specify the number of queues to be > created for multiqueue TAP\n" > - " use 'poll-us=n' to speciy the maximum number of > microseconds that could be\n" > + " use 'poll-us=n' to specify the maximum number of > microseconds that could be\n" > " spent on busy polling for vhost net\n" > "-netdev bridge,id=str[,br=bridge][,helper=helper]\n" > " configure a host TAP network backend with ID 'str' that > is\n" > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 50008431c3..ae9fd9f31d 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -7081,7 +7081,7 @@ static void x86_cpu_get_crash_info_qom(Object *obj, > Visitor *v, > GuestPanicInformation *panic_info; > > if (!cs->crash_occurred) { > - error_setg(errp, "No crash occured"); > + error_setg(errp, "No crash occurred"); > return; > } > > diff --git a/target/i386/machine.c b/target/i386/machine.c > index 3768a753af..3967dfc257 100644 > --- a/target/i386/machine.c > +++ b/target/i386/machine.c > @@ -1173,7 +1173,7 @@ static int nested_state_post_load(void *opaque, int > version_id) > return -EINVAL; > } > if (nested_state->size > max_nested_state_len) { > - error_report("Recieved unsupported nested state size: " > + error_report("Received unsupported nested state size: " > "nested_state->size=%d, max=%d", > nested_state->size, max_nested_state_len); > return -EINVAL; > diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c > index 202498deb5..579a66373a 100644 > --- a/target/m68k/op_helper.c > +++ b/target/m68k/op_helper.c > @@ -117,7 +117,7 @@ static const char *m68k_exception_name(int index) > case EXCP_FORMAT: > return "Format Error"; > case EXCP_UNINITIALIZED: > - return "Unitialized Interruot"; > + return "Uninitialized Interrupt"; > case EXCP_SPURIOUS: > return "Spurious Interrupt"; > case EXCP_INT_LEVEL_1: > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index ddea8fbeeb..2a990f6253 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -506,7 +506,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > return; > } > } else { > - qemu_log("vector verison is not specified, " > + qemu_log("vector version is not specified, " > "use the default value v0.7.1\n"); > } > set_vext_version(env, vext_version); >
Applied to my trivial-patches branch. Thanks, Laurent
