[PATCH RFC 10/14] i386/: fix some comment spelling errors

zhaolichang posted 14 patches 5 years, 4 months ago
Maintainers: Sunil Muthuswamy <sunilmut@microsoft.com>, Palmer Dabbelt <palmer@dabbelt.com>, Wenchao Wang <wenchao.wang@intel.com>, Laurent Vivier <laurent@vivier.eu>, Halil Pasic <pasic@linux.ibm.com>, Marcelo Tosatti <mtosatti@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Sarah Harris <S.E.Harris@kent.ac.uk>, Colin Xu <colin.xu@intel.com>, Thomas Huth <thuth@redhat.com>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Aurelien Jarno <aurelien@aurel32.net>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Peter Maydell <peter.maydell@linaro.org>, Cornelia Huck <cohuck@redhat.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Alistair Francis <Alistair.Francis@wdc.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Michael Rolnik <mrolnik@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <rth@twiddle.net>, Artyom Tarasenko <atar4qemu@gmail.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Stafford Horne <shorne@gmail.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Eduardo Habkost <ehabkost@redhat.com>
There is a newer version of this series
[PATCH RFC 10/14] i386/: fix some comment spelling errors
Posted by zhaolichang 5 years, 4 months ago
I found that there are many spelling errors in the comments of qemu/target/i386.
I used spellcheck to check the spelling errors and found some errors in the folder.

Signed-off-by: zhaolichang <zhaolichang@huawei.com>
---
 target/i386/cpu.c           | 4 ++--
 target/i386/hax-interface.h | 4 ++--
 target/i386/hax-windows.c   | 2 +-
 target/i386/kvm.c           | 2 +-
 target/i386/machine.c       | 6 +++---
 target/i386/translate.c     | 8 ++++----
 target/i386/whpx-all.c      | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 3ffd877..23851e5 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -4677,7 +4677,7 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
     return name;
 }
 
-/* Compatibily hack to maintain legacy +-feat semantic,
+/* Compatibility hack to maintain legacy +-feat semantic,
  * where +-feat overwrites any feature set by
  * feat=on|feat even if the later is parsed after +-feat
  * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
@@ -6896,7 +6896,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/hax-interface.h b/target/i386/hax-interface.h
index 537ae08..edef4fd 100644
--- a/target/i386/hax-interface.h
+++ b/target/i386/hax-interface.h
@@ -238,7 +238,7 @@ enum exit_status {
     HAX_EXIT_UNKNOWN_VMEXIT,
     /* HALT from guest */
     HAX_EXIT_HLT,
-    /* Reboot request, like because of tripple fault in guest */
+    /* Reboot request, like because of triple fault in guest */
     HAX_EXIT_STATECHANGE,
     /* the vcpu is now only paused when destroy, so simply return to hax */
     HAX_EXIT_PAUSED,
@@ -295,7 +295,7 @@ struct hax_qemu_version {
     uint32_t min_version;
 } __attribute__ ((__packed__));
 
-/* The mac specfic interface to qemu, mostly is ioctl related */
+/* The mac specific interface to qemu, mostly is ioctl related */
 struct hax_tunnel_info {
     uint64_t va;
     uint64_t io_va;
diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c
index 863c2bc..881089b 100644
--- a/target/i386/hax-windows.c
+++ b/target/i386/hax-windows.c
@@ -174,7 +174,7 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version)
     if (!ret) {
         err = GetLastError();
         if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) {
-            fprintf(stderr, "hax module verion is too long to hold.\n");
+            fprintf(stderr, "hax module version is too long to hold.\n");
         }
         fprintf(stderr, "Failed to get Hax module version:%lu\n", err);
         return -EFAULT;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 9efb07e..fbdbb49 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1179,7 +1179,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struct kvm_cpuid2 *cpuid,
 /*
  * Fill in Hyper-V CPUIDs. Returns the number of entries filled in cpuid_ent in
  * case of success, errno < 0 in case of failure and 0 when no Hyper-V
- * extentions are enabled.
+ * extensions are enabled.
  */
 static int hyperv_handle_properties(CPUState *cs,
                                     struct kvm_cpuid_entry2 *cpuid_ent)
diff --git a/target/i386/machine.c b/target/i386/machine.c
index b1acf7d..90e6139 100644
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -264,12 +264,12 @@ static int cpu_pre_save(void *opaque)
      * hypervisor, its exception payload (CR2/DR6 on #PF/#DB)
      * should not be set yet in the respective vCPU register.
      * Thus, in case an exception is pending, it is
-     * important to save the exception payload seperately.
+     * important to save the exception payload separately.
      *
      * Therefore, if an exception is not in a pending state
      * or vCPU is not in guest-mode, it is not important to
      * distinguish between a pending and injected exception
-     * and we don't need to store seperately the exception payload.
+     * and we don't need to store separately the exception payload.
      *
      * In order to preserve better backwards-compatible migration,
      * convert a pending exception to an injected exception in
@@ -1138,7 +1138,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/i386/translate.c b/target/i386/translate.c
index caea6f5..5cdfe0e 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -893,7 +893,7 @@ static CCPrepare gen_prepare_eflags_z(DisasContext *s, TCGv reg)
 }
 
 /* perform a conditional store into register 'reg' according to jump opcode
-   value 'b'. In the fast case, T0 is guaranted not to be used. */
+   value 'b'. In the fast case, T0 is guaranteed not to be used. */
 static CCPrepare gen_prepare_cc(DisasContext *s, int b, TCGv reg)
 {
     int inv, jcc_op, cond;
@@ -1026,7 +1026,7 @@ static inline void gen_compute_eflags_c(DisasContext *s, TCGv reg)
 }
 
 /* generate a conditional jump to label 'l1' according to jump opcode
-   value 'b'. In the fast case, T0 is guaranted not to be used. */
+   value 'b'. In the fast case, T0 is guaranteed not to be used. */
 static inline void gen_jcc1_noeob(DisasContext *s, int b, TCGLabel *l1)
 {
     CCPrepare cc = gen_prepare_cc(s, b, s->T0);
@@ -1043,7 +1043,7 @@ static inline void gen_jcc1_noeob(DisasContext *s, int b, TCGLabel *l1)
 }
 
 /* Generate a conditional jump to label 'l1' according to jump opcode
-   value 'b'. In the fast case, T0 is guaranted not to be used.
+   value 'b'. In the fast case, T0 is guaranteed not to be used.
    A translation block must end soon.  */
 static inline void gen_jcc1(DisasContext *s, int b, TCGLabel *l1)
 {
@@ -6841,7 +6841,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
         if (s->prefix & PREFIX_LOCK) {
             switch (op) {
             case 0: /* bt */
-                /* Needs no atomic ops; we surpressed the normal
+                /* Needs no atomic ops; we suppressed the normal
                    memory load for LOCK above so do it now.  */
                 gen_op_ld_v(s, ot, s->T0, s->A0);
                 break;
diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index 5a0f337..661f9c7 100644
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -1214,7 +1214,7 @@ int whpx_init_vcpu(CPUState *cpu)
     vcpu = g_malloc0(sizeof(struct whpx_vcpu));
 
     if (!vcpu) {
-        error_report("WHPX: Failed to allocte VCPU context.");
+        error_report("WHPX: Failed to allocate VCPU context.");
         return -ENOMEM;
     }
 
-- 
2.26.2.windows.1


Re: [PATCH RFC 10/14] i386/: fix some comment spelling errors
Posted by David Edmondson 5 years, 4 months ago
On Wednesday, 2020-09-30 at 17:53:17 +08, zhaolichang wrote:

> I found that there are many spelling errors in the comments of qemu/target/i386.
> I used spellcheck to check the spelling errors and found some errors in the folder.
>
> Signed-off-by: zhaolichang <zhaolichang@huawei.com>

Reviewed-by: David Edmondson <david.edmondson@oracle.com>

> ---
>  target/i386/cpu.c           | 4 ++--
>  target/i386/hax-interface.h | 4 ++--
>  target/i386/hax-windows.c   | 2 +-
>  target/i386/kvm.c           | 2 +-
>  target/i386/machine.c       | 6 +++---
>  target/i386/translate.c     | 8 ++++----
>  target/i386/whpx-all.c      | 2 +-
>  7 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 3ffd877..23851e5 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -4677,7 +4677,7 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
>      return name;
>  }
>  
> -/* Compatibily hack to maintain legacy +-feat semantic,
> +/* Compatibility hack to maintain legacy +-feat semantic,
>   * where +-feat overwrites any feature set by
>   * feat=on|feat even if the later is parsed after +-feat
>   * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> @@ -6896,7 +6896,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/hax-interface.h b/target/i386/hax-interface.h
> index 537ae08..edef4fd 100644
> --- a/target/i386/hax-interface.h
> +++ b/target/i386/hax-interface.h
> @@ -238,7 +238,7 @@ enum exit_status {
>      HAX_EXIT_UNKNOWN_VMEXIT,
>      /* HALT from guest */
>      HAX_EXIT_HLT,
> -    /* Reboot request, like because of tripple fault in guest */
> +    /* Reboot request, like because of triple fault in guest */
>      HAX_EXIT_STATECHANGE,
>      /* the vcpu is now only paused when destroy, so simply return to hax */
>      HAX_EXIT_PAUSED,
> @@ -295,7 +295,7 @@ struct hax_qemu_version {
>      uint32_t min_version;
>  } __attribute__ ((__packed__));
>  
> -/* The mac specfic interface to qemu, mostly is ioctl related */
> +/* The mac specific interface to qemu, mostly is ioctl related */
>  struct hax_tunnel_info {
>      uint64_t va;
>      uint64_t io_va;
> diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c
> index 863c2bc..881089b 100644
> --- a/target/i386/hax-windows.c
> +++ b/target/i386/hax-windows.c
> @@ -174,7 +174,7 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version)
>      if (!ret) {
>          err = GetLastError();
>          if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) {
> -            fprintf(stderr, "hax module verion is too long to hold.\n");
> +            fprintf(stderr, "hax module version is too long to hold.\n");
>          }
>          fprintf(stderr, "Failed to get Hax module version:%lu\n", err);
>          return -EFAULT;
> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
> index 9efb07e..fbdbb49 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -1179,7 +1179,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struct kvm_cpuid2 *cpuid,
>  /*
>   * Fill in Hyper-V CPUIDs. Returns the number of entries filled in cpuid_ent in
>   * case of success, errno < 0 in case of failure and 0 when no Hyper-V
> - * extentions are enabled.
> + * extensions are enabled.
>   */
>  static int hyperv_handle_properties(CPUState *cs,
>                                      struct kvm_cpuid_entry2 *cpuid_ent)
> diff --git a/target/i386/machine.c b/target/i386/machine.c
> index b1acf7d..90e6139 100644
> --- a/target/i386/machine.c
> +++ b/target/i386/machine.c
> @@ -264,12 +264,12 @@ static int cpu_pre_save(void *opaque)
>       * hypervisor, its exception payload (CR2/DR6 on #PF/#DB)
>       * should not be set yet in the respective vCPU register.
>       * Thus, in case an exception is pending, it is
> -     * important to save the exception payload seperately.
> +     * important to save the exception payload separately.
>       *
>       * Therefore, if an exception is not in a pending state
>       * or vCPU is not in guest-mode, it is not important to
>       * distinguish between a pending and injected exception
> -     * and we don't need to store seperately the exception payload.
> +     * and we don't need to store separately the exception payload.
>       *
>       * In order to preserve better backwards-compatible migration,
>       * convert a pending exception to an injected exception in
> @@ -1138,7 +1138,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/i386/translate.c b/target/i386/translate.c
> index caea6f5..5cdfe0e 100644
> --- a/target/i386/translate.c
> +++ b/target/i386/translate.c
> @@ -893,7 +893,7 @@ static CCPrepare gen_prepare_eflags_z(DisasContext *s, TCGv reg)
>  }
>  
>  /* perform a conditional store into register 'reg' according to jump opcode
> -   value 'b'. In the fast case, T0 is guaranted not to be used. */
> +   value 'b'. In the fast case, T0 is guaranteed not to be used. */
>  static CCPrepare gen_prepare_cc(DisasContext *s, int b, TCGv reg)
>  {
>      int inv, jcc_op, cond;
> @@ -1026,7 +1026,7 @@ static inline void gen_compute_eflags_c(DisasContext *s, TCGv reg)
>  }
>  
>  /* generate a conditional jump to label 'l1' according to jump opcode
> -   value 'b'. In the fast case, T0 is guaranted not to be used. */
> +   value 'b'. In the fast case, T0 is guaranteed not to be used. */
>  static inline void gen_jcc1_noeob(DisasContext *s, int b, TCGLabel *l1)
>  {
>      CCPrepare cc = gen_prepare_cc(s, b, s->T0);
> @@ -1043,7 +1043,7 @@ static inline void gen_jcc1_noeob(DisasContext *s, int b, TCGLabel *l1)
>  }
>  
>  /* Generate a conditional jump to label 'l1' according to jump opcode
> -   value 'b'. In the fast case, T0 is guaranted not to be used.
> +   value 'b'. In the fast case, T0 is guaranteed not to be used.
>     A translation block must end soon.  */
>  static inline void gen_jcc1(DisasContext *s, int b, TCGLabel *l1)
>  {
> @@ -6841,7 +6841,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
>          if (s->prefix & PREFIX_LOCK) {
>              switch (op) {
>              case 0: /* bt */
> -                /* Needs no atomic ops; we surpressed the normal
> +                /* Needs no atomic ops; we suppressed the normal
>                     memory load for LOCK above so do it now.  */
>                  gen_op_ld_v(s, ot, s->T0, s->A0);
>                  break;
> diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
> index 5a0f337..661f9c7 100644
> --- a/target/i386/whpx-all.c
> +++ b/target/i386/whpx-all.c
> @@ -1214,7 +1214,7 @@ int whpx_init_vcpu(CPUState *cpu)
>      vcpu = g_malloc0(sizeof(struct whpx_vcpu));
>  
>      if (!vcpu) {
> -        error_report("WHPX: Failed to allocte VCPU context.");
> +        error_report("WHPX: Failed to allocate VCPU context.");
>          return -ENOMEM;
>      }
>  
> -- 
> 2.26.2.windows.1

dme.
-- 
Tell me sweet little lies.