[PATCH 0/3] trivial: Fix some typos

[PATCH 0/3] trivial: Fix some typos

[Philippe Mathieu-Daudé]

Fix few typos:
. Uncoditional -> Unconditional
. havn't -> haven't
. stdin -> stdio

Philippe Mathieu-Daudé (3):
  misc: Fix "havn't" typo
  target/mips: Fix 'Uncoditional' typo
  scripts/oss-fuzz: Fix typo in documentation

 hw/usb/desc-msos.c                             | 2 +-
 target/mips/tcg/translate.c                    | 6 +++---
 target/s390x/translate.c                       | 6 ++++--
 tcg/tcg-op.c                                   | 2 +-
 tcg/arm/tcg-target.c.inc                       | 6 ++++--
 tcg/sparc/tcg-target.c.inc                     | 6 ++++--
 scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

-- 
2.26.3

[PATCH 1/3] misc: Fix "havn't" typo

[Philippe Mathieu-Daudé]

Fix havn't -> haven't typo.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/usb/desc-msos.c         | 2 +-
 target/s390x/translate.c   | 6 ++++--
 tcg/tcg-op.c               | 2 +-
 tcg/arm/tcg-target.c.inc   | 6 ++++--
 tcg/sparc/tcg-target.c.inc | 6 ++++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index 3a5ad7c8d0f..836e38c67e1 100644
--- a/hw/usb/desc-msos.c
+++ b/hw/usb/desc-msos.c
@@ -181,7 +181,7 @@ static int usb_desc_msos_prop(const USBDesc *desc, uint8_t *dest)
 
     if (desc->msos->Label) {
         /*
-         * Given as example in the specs.  Havn't figured yet where
+         * Given as example in the specs.  Haven't figured yet where
          * this label shows up in the windows gui.
          */
         length += usb_desc_msos_prop_str(dest+length, MSOS_REG_SZ,
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index e243624d2a6..f3124a52207 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6270,8 +6270,10 @@ static void extract_field(DisasFields *o, const DisasField *f, uint64_t insn)
         abort();
     }
 
-    /* Validate that the "compressed" encoding we selected above is valid.
-       I.e. we havn't make two different original fields overlap.  */
+    /*
+     * Validate that the "compressed" encoding we selected above is valid.
+     * I.e. we haven't make two different original fields overlap.
+     */
     assert(((o->presentC >> f->indexC) & 1) == 0);
     o->presentC |= 1 << f->indexC;
     o->presentO |= 1 << f->indexO;
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index dcc2ed0bbc8..869dc6cdd29 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -2695,7 +2695,7 @@ void tcg_gen_goto_tb(unsigned idx)
     /* We only support two chained exits.  */
     tcg_debug_assert(idx <= TB_EXIT_IDXMAX);
 #ifdef CONFIG_DEBUG_TCG
-    /* Verify that we havn't seen this numbered exit before.  */
+    /* Verify that we haven't seen this numbered exit before.  */
     tcg_debug_assert((tcg_ctx->goto_tb_issue_mask & (1 << idx)) == 0);
     tcg_ctx->goto_tb_issue_mask |= 1 << idx;
 #endif
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index 8457108a87a..751fcd96930 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -2127,8 +2127,10 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op)
 
 static void tcg_target_init(TCGContext *s)
 {
-    /* Only probe for the platform and capabilities if we havn't already
-       determined maximum values at compile time.  */
+    /*
+     * Only probe for the platform and capabilities if we haven't already
+     * determined maximum values at compile time.
+     */
 #ifndef use_idiv_instructions
     {
         unsigned long hwcap = qemu_getauxval(AT_HWCAP);
diff --git a/tcg/sparc/tcg-target.c.inc b/tcg/sparc/tcg-target.c.inc
index 3d50f985c6c..520b91d8b10 100644
--- a/tcg/sparc/tcg-target.c.inc
+++ b/tcg/sparc/tcg-target.c.inc
@@ -1689,8 +1689,10 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op)
 
 static void tcg_target_init(TCGContext *s)
 {
-    /* Only probe for the platform and capabilities if we havn't already
-       determined maximum values at compile time.  */
+    /*
+     * Only probe for the platform and capabilities if we haven't already
+     * determined maximum values at compile time.
+     */
 #ifndef use_vis3_instructions
     {
         unsigned long hwcap = qemu_getauxval(AT_HWCAP);
-- 
2.26.3

RE: [PATCH 1/3] misc: Fix "havn't" typo

[Luis Fernando Fujita Pires]

From: Philippe Mathieu-Daudé
> Fix havn't -> haven't typo.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/usb/desc-msos.c         | 2 +-
>  target/s390x/translate.c   | 6 ++++--
>  tcg/tcg-op.c               | 2 +-
>  tcg/arm/tcg-target.c.inc   | 6 ++++--
>  tcg/sparc/tcg-target.c.inc | 6 ++++--
>  5 files changed, 14 insertions(+), 8 deletions(-)
> -    /* Validate that the "compressed" encoding we selected above is valid.
> -       I.e. we havn't make two different original fields overlap.  */
> +    /*
> +     * Validate that the "compressed" encoding we selected above is valid.
> +     * I.e. we haven't make two different original fields overlap.
> +     */

haven't make -> haven't made?

Other than that,

Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>

--
Luis Pires
Instituto de Pesquisas ELDORADO
Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>

Re: [PATCH 1/3] misc: Fix "havn't" typo

[Philippe Mathieu-Daudé]

On 6/2/21 7:25 PM, Luis Fernando Fujita Pires wrote:
> From: Philippe Mathieu-Daudé
>> Fix havn't -> haven't typo.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  hw/usb/desc-msos.c         | 2 +-
>>  target/s390x/translate.c   | 6 ++++--
>>  tcg/tcg-op.c               | 2 +-
>>  tcg/arm/tcg-target.c.inc   | 6 ++++--
>>  tcg/sparc/tcg-target.c.inc | 6 ++++--
>>  5 files changed, 14 insertions(+), 8 deletions(-)
>> -    /* Validate that the "compressed" encoding we selected above is valid.
>> -       I.e. we havn't make two different original fields overlap.  */
>> +    /*
>> +     * Validate that the "compressed" encoding we selected above is valid.
>> +     * I.e. we haven't make two different original fields overlap.
>> +     */
> 
> haven't make -> haven't made?

Oops yes... Thanks!

> 
> Other than that,
> 
> Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>

[PATCH 2/3] target/mips: Fix 'Uncoditional' typo

[Philippe Mathieu-Daudé]

Fix Uncoditional -> Unconditional typo.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/mips/tcg/translate.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index c03a8ae1fed..797eba44347 100644
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -12238,7 +12238,7 @@ static void gen_compute_compact_branch(DisasContext *ctx, uint32_t opc,
     }
 
     if (bcond_compute == 0) {
-        /* Uncoditional compact branch */
+        /* Unconditional compact branch */
         switch (opc) {
         case OPC_JIALC:
             tcg_gen_movi_tl(cpu_gpr[31], ctx->base.pc_next + 4 + m16_lowbit);
@@ -19092,7 +19092,7 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc,
     ctx->base.is_jmp = DISAS_NORETURN;
 
     if (cond == TCG_COND_ALWAYS) {
-        /* Uncoditional compact branch */
+        /* Unconditional compact branch */
         gen_goto_tb(ctx, 0, ctx->btarget);
     } else {
         /* Conditional compact branch */
@@ -19201,7 +19201,7 @@ static void gen_compute_compact_branch_nm(DisasContext *ctx, uint32_t opc,
     }
 
     if (bcond_compute == 0) {
-        /* Uncoditional compact branch */
+        /* Unconditional compact branch */
         switch (opc) {
         case OPC_BC:
             gen_goto_tb(ctx, 0, ctx->btarget);
-- 
2.26.3

RE: [PATCH 2/3] target/mips: Fix 'Uncoditional' typo

[Luis Fernando Fujita Pires]

From: Philippe Mathieu-Daudé
> Fix Uncoditional -> Unconditional typo.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  target/mips/tcg/translate.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>

--
Luis Pires
Instituto de Pesquisas ELDORADO
Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>

Re: [PATCH 2/3] target/mips: Fix 'Uncoditional' typo

[Laurent Vivier]

Le 02/06/2021 à 19:07, Philippe Mathieu-Daudé a écrit :
> Fix Uncoditional -> Unconditional typo.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  target/mips/tcg/translate.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
> index c03a8ae1fed..797eba44347 100644
> --- a/target/mips/tcg/translate.c
> +++ b/target/mips/tcg/translate.c
> @@ -12238,7 +12238,7 @@ static void gen_compute_compact_branch(DisasContext *ctx, uint32_t opc,
>      }
>  
>      if (bcond_compute == 0) {
> -        /* Uncoditional compact branch */
> +        /* Unconditional compact branch */
>          switch (opc) {
>          case OPC_JIALC:
>              tcg_gen_movi_tl(cpu_gpr[31], ctx->base.pc_next + 4 + m16_lowbit);
> @@ -19092,7 +19092,7 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc,
>      ctx->base.is_jmp = DISAS_NORETURN;
>  
>      if (cond == TCG_COND_ALWAYS) {
> -        /* Uncoditional compact branch */
> +        /* Unconditional compact branch */
>          gen_goto_tb(ctx, 0, ctx->btarget);
>      } else {
>          /* Conditional compact branch */
> @@ -19201,7 +19201,7 @@ static void gen_compute_compact_branch_nm(DisasContext *ctx, uint32_t opc,
>      }
>  
>      if (bcond_compute == 0) {
> -        /* Uncoditional compact branch */
> +        /* Unconditional compact branch */
>          switch (opc) {
>          case OPC_BC:
>              gen_goto_tb(ctx, 0, ctx->btarget);
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH 3/3] scripts/oss-fuzz: Fix typo in documentation

[Philippe Mathieu-Daudé]

While we only use stdin, the chardev is named 'stdio'.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
index 890e1def856..b154a25508f 100755
--- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
+++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
@@ -14,7 +14,7 @@
         /path/to/crash 2> qtest_log_output
 scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace
 ./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \
-        -qtest stdin < qtest_trace
+        -qtest stdio < qtest_trace
 
 ### Details ###
 
-- 
2.26.3

Re: [PATCH 3/3] scripts/oss-fuzz: Fix typo in documentation

[Alexander Bulekov]

On 210602 1907, Philippe Mathieu-Daudé wrote:
> While we only use stdin, the chardev is named 'stdio'.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alexander Bulekov <alxndr@bu.edu>

Thanks!

Re: [PATCH 3/3] scripts/oss-fuzz: Fix typo in documentation

[Laurent Vivier]

Le 02/06/2021 à 19:07, Philippe Mathieu-Daudé a écrit :
> While we only use stdin, the chardev is named 'stdio'.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
> index 890e1def856..b154a25508f 100755
> --- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
> +++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py
> @@ -14,7 +14,7 @@
>          /path/to/crash 2> qtest_log_output
>  scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace
>  ./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \
> -        -qtest stdin < qtest_trace
> +        -qtest stdio < qtest_trace
>  
>  ### Details ###
>  
> 


Applied to my trivial-patches branch.

Thanks,
Laurent