[PATCH 0/4] trivial: Fix superfluous trailing semicolon

[PATCH 0/4] trivial: Fix superfluous trailing semicolon

[Zhao Liu]

Hi,

I checked the files in QEMU to fix these few errors about "superfluous
trailing semicolon" to honor the requirement in checkpatch.pl.

Thanks and Best Regards,
Zhao
---
Zhao Liu (4):
  accel/kvm/kvm-all: Fix superfluous trailing semicolon
  hw/i386/x86: Fix superfluous trailing semicolon
  util/oslib-posix: Fix superfluous trailing semicolon
  target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

 accel/kvm/kvm-all.c                    | 2 +-
 hw/i386/x86.c                          | 2 +-
 target/hexagon/imported/mmvec/ext.idef | 2 +-
 util/oslib-posix.c                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.34.1

[PATCH 1/4] accel/kvm/kvm-all: Fix superfluous trailing semicolon

[Zhao Liu]

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 accel/kvm/kvm-all.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 2b4ab896794b..64bf47a03300 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -3878,7 +3878,7 @@ static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc,
     /* Alloc and populate data list */
     stats = g_new0(Stats, 1);
     stats->name = g_strdup(pdesc->name);
-    stats->value = g_new0(StatsValue, 1);;
+    stats->value = g_new0(StatsValue, 1);
 
     if ((pdesc->flags & KVM_STATS_UNIT_MASK) == KVM_STATS_UNIT_BOOLEAN) {
         stats->value->u.boolean = *stats_data;
-- 
2.34.1

[PATCH 2/4] hw/i386/x86: Fix superfluous trailing semicolon

[Zhao Liu]

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/i386/x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index a4aa8e081098..01fc5e656272 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -242,7 +242,7 @@ static void x86_machine_get_pit(Object *obj, Visitor *v, const char *name,
 static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name,
                                     void *opaque, Error **errp)
 {
-    X86MachineState *x86ms = X86_MACHINE(obj);;
+    X86MachineState *x86ms = X86_MACHINE(obj);
 
     visit_type_OnOffAuto(v, name, &x86ms->pit, errp);
 }
-- 
2.34.1

[PATCH 3/4] util/oslib-posix: Fix superfluous trailing semicolon

[Zhao Liu]

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 util/oslib-posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index e76441695bdc..b090fe0eed0d 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -263,7 +263,7 @@ int qemu_socketpair(int domain, int type, int protocol, int sv[2])
         return ret;
     }
 #endif
-    ret = socketpair(domain, type, protocol, sv);;
+    ret = socketpair(domain, type, protocol, sv);
     if (ret == 0) {
         qemu_set_cloexec(sv[0]);
         qemu_set_cloexec(sv[1]);
-- 
2.34.1

[PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Zhao Liu]

Fix the superfluous trailing semicolon in target/hexagon/imported/mmvec/
ext.idef.

Cc: Brian Cain <bcain@quicinc.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 target/hexagon/imported/mmvec/ext.idef | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/hexagon/imported/mmvec/ext.idef b/target/hexagon/imported/mmvec/ext.idef
index 98daabfb07c4..03d31f6181d7 100644
--- a/target/hexagon/imported/mmvec/ext.idef
+++ b/target/hexagon/imported/mmvec/ext.idef
@@ -2855,7 +2855,7 @@ EXTINSN(V6_vscattermhw_add,  "vscatter(Rt32,Mu2,Vvv32.w).h+=Vw32", ATTRIBS(A_EXT
     fVALIGN(RtV, element_size);
     fVFOREACH(32, i) {
         for(j = 0; j < 2; j++) {
-             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);;
+             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);
              fVLOG_VTCM_HALFWORD_INCREMENT_DV(EA,VvvV.v[j].uw[i],VwV,(2*i+j),i,j,ALIGNMENT,MuV);
         }
     }
-- 
2.34.1

Re: [PATCH 1/4] accel/kvm/kvm-all: Fix superfluous trailing semicolon

[Peter Maydell]

On Thu, 4 Jul 2024 at 09:32, Zhao Liu <zhao1.liu@intel.com> wrote:
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  accel/kvm/kvm-all.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 2b4ab896794b..64bf47a03300 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -3878,7 +3878,7 @@ static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc,
>      /* Alloc and populate data list */
>      stats = g_new0(Stats, 1);
>      stats->name = g_strdup(pdesc->name);
> -    stats->value = g_new0(StatsValue, 1);;
> +    stats->value = g_new0(StatsValue, 1);
>
>      if ((pdesc->flags & KVM_STATS_UNIT_MASK) == KVM_STATS_UNIT_BOOLEAN) {
>          stats->value->u.boolean = *stats_data;

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH 3/4] util/oslib-posix: Fix superfluous trailing semicolon

[Peter Maydell]

On Thu, 4 Jul 2024 at 09:33, Zhao Liu <zhao1.liu@intel.com> wrote:
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  util/oslib-posix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index e76441695bdc..b090fe0eed0d 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -263,7 +263,7 @@ int qemu_socketpair(int domain, int type, int protocol, int sv[2])
>          return ret;
>      }
>  #endif
> -    ret = socketpair(domain, type, protocol, sv);;
> +    ret = socketpair(domain, type, protocol, sv);
>      if (ret == 0) {
>          qemu_set_cloexec(sv[0]);
>          qemu_set_cloexec(sv[1]);
> --
> 2.34.1
>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Peter Maydell]

On Thu, 4 Jul 2024 at 09:33, Zhao Liu <zhao1.liu@intel.com> wrote:
>
> Fix the superfluous trailing semicolon in target/hexagon/imported/mmvec/
> ext.idef.
>
> Cc: Brian Cain <bcain@quicinc.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  target/hexagon/imported/mmvec/ext.idef | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/hexagon/imported/mmvec/ext.idef b/target/hexagon/imported/mmvec/ext.idef
> index 98daabfb07c4..03d31f6181d7 100644
> --- a/target/hexagon/imported/mmvec/ext.idef
> +++ b/target/hexagon/imported/mmvec/ext.idef
> @@ -2855,7 +2855,7 @@ EXTINSN(V6_vscattermhw_add,  "vscatter(Rt32,Mu2,Vvv32.w).h+=Vw32", ATTRIBS(A_EXT
>      fVALIGN(RtV, element_size);
>      fVFOREACH(32, i) {
>          for(j = 0; j < 2; j++) {
> -             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);;
> +             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);
>               fVLOG_VTCM_HALFWORD_INCREMENT_DV(EA,VvvV.v[j].uw[i],VwV,(2*i+j),i,j,ALIGNMENT,MuV);
>          }
>      }
> --
> 2.34.1

As a change this is obviously fine, but given the "imported"
in the pathname I don't know if this is something that should
be fixed in whatever upstream source we got this from instead
or as well. Brian ?

thanks
-- PMM

Re: [PATCH 2/4] hw/i386/x86: Fix superfluous trailing semicolon

[Peter Maydell]

On Thu, 4 Jul 2024 at 09:33, Zhao Liu <zhao1.liu@intel.com> wrote:
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  hw/i386/x86.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index a4aa8e081098..01fc5e656272 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -242,7 +242,7 @@ static void x86_machine_get_pit(Object *obj, Visitor *v, const char *name,
>  static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name,
>                                      void *opaque, Error **errp)
>  {
> -    X86MachineState *x86ms = X86_MACHINE(obj);;
> +    X86MachineState *x86ms = X86_MACHINE(obj);
>
>      visit_type_OnOffAuto(v, name, &x86ms->pit, errp);
>  }
> --
> 2.34.1

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH 1/4] accel/kvm/kvm-all: Fix superfluous trailing semicolon

[Alex Bennée]

Zhao Liu <zhao1.liu@intel.com> writes:

> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>  accel/kvm/kvm-all.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 2b4ab896794b..64bf47a03300 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -3878,7 +3878,7 @@ static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc,
>      /* Alloc and populate data list */
>      stats = g_new0(Stats, 1);
>      stats->name = g_strdup(pdesc->name);
> -    stats->value = g_new0(StatsValue, 1);;
> +    stats->value = g_new0(StatsValue, 1);
>  
>      if ((pdesc->flags & KVM_STATS_UNIT_MASK) == KVM_STATS_UNIT_BOOLEAN) {
>          stats->value->u.boolean = *stats_data;

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 3/4] util/oslib-posix: Fix superfluous trailing semicolon

[Alex Bennée]

Zhao Liu <zhao1.liu@intel.com> writes:

> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Alex Bennée]

Zhao Liu <zhao1.liu@intel.com> writes:

> Fix the superfluous trailing semicolon in target/hexagon/imported/mmvec/
> ext.idef.
>
> Cc: Brian Cain <bcain@quicinc.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Brian Cain]

On 7/4/2024 3:47 AM, Zhao Liu wrote:
> Fix the superfluous trailing semicolon in target/hexagon/imported/mmvec/
> ext.idef.
>
> Cc: Brian Cain <bcain@quicinc.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>

Reviewed-by: Brian Cain <bcain@quicinc.com>


> ---
>   target/hexagon/imported/mmvec/ext.idef | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/hexagon/imported/mmvec/ext.idef b/target/hexagon/imported/mmvec/ext.idef
> index 98daabfb07c4..03d31f6181d7 100644
> --- a/target/hexagon/imported/mmvec/ext.idef
> +++ b/target/hexagon/imported/mmvec/ext.idef
> @@ -2855,7 +2855,7 @@ EXTINSN(V6_vscattermhw_add,  "vscatter(Rt32,Mu2,Vvv32.w).h+=Vw32", ATTRIBS(A_EXT
>       fVALIGN(RtV, element_size);
>       fVFOREACH(32, i) {
>           for(j = 0; j < 2; j++) {
> -             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);;
> +             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);
>                fVLOG_VTCM_HALFWORD_INCREMENT_DV(EA,VvvV.v[j].uw[i],VwV,(2*i+j),i,j,ALIGNMENT,MuV);
>           }
>       }

Re: [PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Michael Tokarev]

06.07.2024 00:50, Brian Cain wrote:
> 
> On 7/4/2024 3:47 AM, Zhao Liu wrote:
>> Fix the superfluous trailing semicolon in target/hexagon/imported/mmvec/
>> ext.idef.
>>
>> Cc: Brian Cain <bcain@quicinc.com>
>> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> 
> Reviewed-by: Brian Cain <bcain@quicinc.com>

Brian, is it okay to fix this in something "imported" ?
I realize you added your R-b, but do you realize it's "imported"?

Thanks,

/mjt

>> ---
>>   target/hexagon/imported/mmvec/ext.idef | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/target/hexagon/imported/mmvec/ext.idef b/target/hexagon/imported/mmvec/ext.idef
>> index 98daabfb07c4..03d31f6181d7 100644
>> --- a/target/hexagon/imported/mmvec/ext.idef
>> +++ b/target/hexagon/imported/mmvec/ext.idef
>> @@ -2855,7 +2855,7 @@ EXTINSN(V6_vscattermhw_add,  "vscatter(Rt32,Mu2,Vvv32.w).h+=Vw32", ATTRIBS(A_EXT
>>       fVALIGN(RtV, element_size);
>>       fVFOREACH(32, i) {
>>           for(j = 0; j < 2; j++) {
>> -             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);;
>> +             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);
>>                fVLOG_VTCM_HALFWORD_INCREMENT_DV(EA,VvvV.v[j].uw[i],VwV,(2*i+j),i,j,ALIGNMENT,MuV);
>>           }
>>       }
> 

Re: [PATCH 0/4] trivial: Fix superfluous trailing semicolon

[Michael Tokarev]

04.07.2024 11:47, Zhao Liu wrote:
> Hi,
> 
> I checked the files in QEMU to fix these few errors about "superfluous
> trailing semicolon" to honor the requirement in checkpatch.pl.

Applied to the trivial-patches queue (pending confirmation from Brian
for the 4th patch).

Thanks,

/mjt

-- 
GPG Key transition (from rsa2048 to rsa4096) since 2024-04-24.
New key: rsa4096/61AD3D98ECDF2C8E  9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
Old key: rsa2048/457CE0A0804465C5  6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
Transition statement: http://www.corpit.ru/mjt/gpg-transition-2024.txt

Re: [PATCH 4/4] target/hexagon/imported/mmvec: Fix superfluous trailing semicolon

[Brian Cain]

On 7/15/2024 4:59 AM, Michael Tokarev wrote:
> 06.07.2024 00:50, Brian Cain wrote:
>>
>> On 7/4/2024 3:47 AM, Zhao Liu wrote:
>>> Fix the superfluous trailing semicolon in 
>>> target/hexagon/imported/mmvec/
>>> ext.idef.
>>>
>>> Cc: Brian Cain <bcain@quicinc.com>
>>> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
>>
>> Reviewed-by: Brian Cain <bcain@quicinc.com>
>
> Brian, is it okay to fix this in something "imported" ?
> I realize you added your R-b, but do you realize it's "imported"?
>
Sure, it's fine - I'll just have to take extra care not to re-introduce 
issues like these when making updates.  I can try and work with the 
original sources to make sure it's addressed there.


> Thanks,
>
> /mjt
>
>>> ---
>>>   target/hexagon/imported/mmvec/ext.idef | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/target/hexagon/imported/mmvec/ext.idef 
>>> b/target/hexagon/imported/mmvec/ext.idef
>>> index 98daabfb07c4..03d31f6181d7 100644
>>> --- a/target/hexagon/imported/mmvec/ext.idef
>>> +++ b/target/hexagon/imported/mmvec/ext.idef
>>> @@ -2855,7 +2855,7 @@ EXTINSN(V6_vscattermhw_add, 
>>> "vscatter(Rt32,Mu2,Vvv32.w).h+=Vw32", ATTRIBS(A_EXT
>>>       fVALIGN(RtV, element_size);
>>>       fVFOREACH(32, i) {
>>>           for(j = 0; j < 2; j++) {
>>> -             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);;
>>> +             EA =  RtV + fVALIGN(VvvV.v[j].uw[i],ALIGNMENT);
>>> fVLOG_VTCM_HALFWORD_INCREMENT_DV(EA,VvvV.v[j].uw[i],VwV,(2*i+j),i,j,ALIGNMENT,MuV);
>>>           }
>>>       }
>>
>