1. Patchew
  2. QEMU
  3. View series

[PATCH] treewide: Remove the unnecessary space before semicolon

Bin Meng posted 1 patch 1 year, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20221024072802.457832-1-bmeng@tinylab.org
Maintainers: Greg Kurz <groug@kaod.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Peter Maydell <peter.maydell@linaro.org>, Pavel Pisa <pisa@cmp.felk.cvut.cz>, Vikram Garhwal <fnu.vikram@xilinx.com>, Jason Wang <jasowang@redhat.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Gerd Hoffmann <kraxel@redhat.com>
include/hw/elf_ops.h         | 2 +-
hw/9pfs/9p.c                 | 2 +-
hw/dma/pl330.c               | 2 +-
hw/net/can/can_sja1000.c     | 2 +-
hw/timer/renesas_cmt.c       | 2 +-
hw/timer/renesas_tmr.c       | 8 ++++----
hw/virtio/virtio-pci.c       | 2 +-
target/riscv/vector_helper.c | 2 +-
target/rx/op_helper.c        | 4 ++--
ui/vnc-jobs.c                | 2 +-
ui/vnc.c                     | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
[PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Bin Meng 1 year, 6 months ago 
%s/return ;/return;

Signed-off-by: Bin Meng <bmeng@tinylab.org>
---

 include/hw/elf_ops.h         | 2 +-
 hw/9pfs/9p.c                 | 2 +-
 hw/dma/pl330.c               | 2 +-
 hw/net/can/can_sja1000.c     | 2 +-
 hw/timer/renesas_cmt.c       | 2 +-
 hw/timer/renesas_tmr.c       | 8 ++++----
 hw/virtio/virtio-pci.c       | 2 +-
 target/riscv/vector_helper.c | 2 +-
 target/rx/op_helper.c        | 4 ++--
 ui/vnc-jobs.c                | 2 +-
 ui/vnc.c                     | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
index 7c3b1d0f6c..fbe0b1e956 100644
--- a/include/hw/elf_ops.h
+++ b/include/hw/elf_ops.h
@@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
     shdr_table = load_at(fd, ehdr->e_shoff,
                          sizeof(struct elf_shdr) * ehdr->e_shnum);
     if (!shdr_table) {
-        return ;
+        return;
     }
 
     if (must_swab) {
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index aebadeaa03..76c591a01b 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
     err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
     if (err < 0) {
         pdu_complete(pdu, err);
-        return ;
+        return;
     }
     offset += err;
 
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 08e5938ec7..e5d521c329 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
     }
     if (!insn) {
         pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
-        return ;
+        return;
     }
     ch->stall = 0;
     insn->exec(ch, opcode, args, insn->size - 1);
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index e0f76d3eb3..73201f9139 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
             (unsigned long long)val, (unsigned int)addr);
 
     if (addr > CAN_SJA_MEM_SIZE) {
-        return ;
+        return;
     }
 
     if (s->clock & 0x80) { /* PeliCAN Mode */
diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
index 2e0fd21a36..69eabc678a 100644
--- a/hw/timer/renesas_cmt.c
+++ b/hw/timer/renesas_cmt.c
@@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
 
     if ((cmt->cmstr & (1 << ch)) == 0) {
         /* count disable, so not happened next event. */
-        return ;
+        return;
     }
     next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
     next_time *= NANOSECONDS_PER_SECOND;
diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index d96002e1ee..c15f654738 100644
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
     int i, event;
 
     if (tmr->tccr[ch] == 0) {
-        return ;
+        return;
     }
     if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
         /* external clock mode */
         /* event not happened */
-        return ;
+        return;
     }
     if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
         /* cascading mode */
         if (ch == 1) {
             tmr->next[ch] = none;
-            return ;
+            return;
         }
         diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
         diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
@@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
                                     tmr->tcorb[ch]) & 0xff;
     } else {
         if (ch == 1) {
-            return ;
+            return;
         }
         tcnt = issue_event(tmr, ch, 16,
                            concat_reg(tmr->tcnt),
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index e7d80242b7..34db51e241 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
         if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
             error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
                        " neither legacy nor transitional device");
-            return ;
+            return;
         }
         /*
          * Legacy and transitional devices use specific subsystem IDs.
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index b94f809eb3..0020b9a95d 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
         return;
     }
     if (tot - cnt == 0) {
-        return ;
+        return;
     }
     memset(base + cnt, -1, tot - cnt);
 }
diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
index 9ca32dcc82..acce650185 100644
--- a/target/rx/op_helper.c
+++ b/target/rx/op_helper.c
@@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
     uint32_t tmp;
     tcg_debug_assert(sz < 3);
     if (env->regs[3] == 0) {
-        return ;
+        return;
     }
     do {
         tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
@@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
     uint32_t tmp;
     tcg_debug_assert(sz < 3);
     if (env->regs[3] == 0) {
-        return ;
+        return;
     }
     do {
         tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 4562bf8928..886f9bf611 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
     VncJobQueue *q;
 
     if (vnc_worker_thread_running())
-        return ;
+        return;
 
     q = vnc_queue_init();
     qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
diff --git a/ui/vnc.c b/ui/vnc.c
index acb3629cd8..88f55cbf3c 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
 
     rect = vnc_stat_rect(vd, x, y);
     if (rect->updated) {
-        return ;
+        return;
     }
     rect->times[rect->idx] = *tv;
     rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
-- 
2.25.1
Re: [PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Laurent Vivier 1 year, 6 months ago 
Le 24/10/2022 à 09:28, Bin Meng a écrit :
> %s/return ;/return;
> 
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
> 
>   include/hw/elf_ops.h         | 2 +-
>   hw/9pfs/9p.c                 | 2 +-
>   hw/dma/pl330.c               | 2 +-
>   hw/net/can/can_sja1000.c     | 2 +-
>   hw/timer/renesas_cmt.c       | 2 +-
>   hw/timer/renesas_tmr.c       | 8 ++++----
>   hw/virtio/virtio-pci.c       | 2 +-
>   target/riscv/vector_helper.c | 2 +-
>   target/rx/op_helper.c        | 4 ++--
>   ui/vnc-jobs.c                | 2 +-
>   ui/vnc.c                     | 2 +-
>   11 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
>       shdr_table = load_at(fd, ehdr->e_shoff,
>                            sizeof(struct elf_shdr) * ehdr->e_shnum);
>       if (!shdr_table) {
> -        return ;
> +        return;
>       }
>   
>       if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
>       err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
>       if (err < 0) {
>           pdu_complete(pdu, err);
> -        return ;
> +        return;
>       }
>       offset += err;
>   
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
>       }
>       if (!insn) {
>           pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> -        return ;
> +        return;
>       }
>       ch->stall = 0;
>       insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
>               (unsigned long long)val, (unsigned int)addr);
>   
>       if (addr > CAN_SJA_MEM_SIZE) {
> -        return ;
> +        return;
>       }
>   
>       if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>   
>       if ((cmt->cmstr & (1 << ch)) == 0) {
>           /* count disable, so not happened next event. */
> -        return ;
> +        return;
>       }
>       next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
>       next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
>       int i, event;
>   
>       if (tmr->tccr[ch] == 0) {
> -        return ;
> +        return;
>       }
>       if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
>           /* external clock mode */
>           /* event not happened */
> -        return ;
> +        return;
>       }
>       if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
>           /* cascading mode */
>           if (ch == 1) {
>               tmr->next[ch] = none;
> -            return ;
> +            return;
>           }
>           diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
>           diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
>                                       tmr->tcorb[ch]) & 0xff;
>       } else {
>           if (ch == 1) {
> -            return ;
> +            return;
>           }
>           tcnt = issue_event(tmr, ch, 16,
>                              concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
>           if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
>               error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
>                          " neither legacy nor transitional device");
> -            return ;
> +            return;
>           }
>           /*
>            * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
>           return;
>       }
>       if (tot - cnt == 0) {
> -        return ;
> +        return;
>       }
>       memset(base + cnt, -1, tot - cnt);
>   }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
>       uint32_t tmp;
>       tcg_debug_assert(sz < 3);
>       if (env->regs[3] == 0) {
> -        return ;
> +        return;
>       }
>       do {
>           tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
>       uint32_t tmp;
>       tcg_debug_assert(sz < 3);
>       if (env->regs[3] == 0) {
> -        return ;
> +        return;
>       }
>       do {
>           tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
>       VncJobQueue *q;
>   
>       if (vnc_worker_thread_running())
> -        return ;
> +        return;
>   
>       q = vnc_queue_init();
>       qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>   
>       rect = vnc_stat_rect(vd, x, y);
>       if (rect->updated) {
> -        return ;
> +        return;
>       }
>       rect->times[rect->idx] = *tv;
>       rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);

Applied to my trivial-patches branch.

Thanks,
Laurent
Re: [PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Christian Schoenebeck 1 year, 6 months ago 
On Monday, October 24, 2022 9:28:02 AM CEST Bin Meng wrote:
> %s/return ;/return;
> 
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---

Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

> 
>  include/hw/elf_ops.h         | 2 +-
>  hw/9pfs/9p.c                 | 2 +-
>  hw/dma/pl330.c               | 2 +-
>  hw/net/can/can_sja1000.c     | 2 +-
>  hw/timer/renesas_cmt.c       | 2 +-
>  hw/timer/renesas_tmr.c       | 8 ++++----
>  hw/virtio/virtio-pci.c       | 2 +-
>  target/riscv/vector_helper.c | 2 +-
>  target/rx/op_helper.c        | 4 ++--
>  ui/vnc-jobs.c                | 2 +-
>  ui/vnc.c                     | 2 +-
>  11 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
>      shdr_table = load_at(fd, ehdr->e_shoff,
>                           sizeof(struct elf_shdr) * ehdr->e_shnum);
>      if (!shdr_table) {
> -        return ;
> +        return;
>      }
>  
>      if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
>      err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
>      if (err < 0) {
>          pdu_complete(pdu, err);
> -        return ;
> +        return;
>      }
>      offset += err;
>  
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
>      }
>      if (!insn) {
>          pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> -        return ;
> +        return;
>      }
>      ch->stall = 0;
>      insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
>              (unsigned long long)val, (unsigned int)addr);
>  
>      if (addr > CAN_SJA_MEM_SIZE) {
> -        return ;
> +        return;
>      }
>  
>      if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>  
>      if ((cmt->cmstr & (1 << ch)) == 0) {
>          /* count disable, so not happened next event. */
> -        return ;
> +        return;
>      }
>      next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
>      next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
>      int i, event;
>  
>      if (tmr->tccr[ch] == 0) {
> -        return ;
> +        return;
>      }
>      if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
>          /* external clock mode */
>          /* event not happened */
> -        return ;
> +        return;
>      }
>      if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
>          /* cascading mode */
>          if (ch == 1) {
>              tmr->next[ch] = none;
> -            return ;
> +            return;
>          }
>          diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
>          diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
>                                      tmr->tcorb[ch]) & 0xff;
>      } else {
>          if (ch == 1) {
> -            return ;
> +            return;
>          }
>          tcnt = issue_event(tmr, ch, 16,
>                             concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
>          if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
>              error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
>                         " neither legacy nor transitional device");
> -            return ;
> +            return;
>          }
>          /*
>           * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
>          return;
>      }
>      if (tot - cnt == 0) {
> -        return ;
> +        return;
>      }
>      memset(base + cnt, -1, tot - cnt);
>  }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
>      uint32_t tmp;
>      tcg_debug_assert(sz < 3);
>      if (env->regs[3] == 0) {
> -        return ;
> +        return;
>      }
>      do {
>          tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
>      uint32_t tmp;
>      tcg_debug_assert(sz < 3);
>      if (env->regs[3] == 0) {
> -        return ;
> +        return;
>      }
>      do {
>          tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
>      VncJobQueue *q;
>  
>      if (vnc_worker_thread_running())
> -        return ;
> +        return;
>  
>      q = vnc_queue_init();
>      qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>  
>      rect = vnc_stat_rect(vd, x, y);
>      if (rect->updated) {
> -        return ;
> +        return;
>      }
>      rect->times[rect->idx] = *tv;
>      rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
>
Re: [PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Peter Maydell 1 year, 6 months ago 
On Mon, 24 Oct 2022 at 08:28, Bin Meng <bmeng@tinylab.org> wrote:
>
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---


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

thanks
-- PMM
Re: [PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Michael S. Tsirkin 1 year, 6 months ago 
On Mon, Oct 24, 2022 at 03:28:02PM +0800, Bin Meng wrote:
> %s/return ;/return;
> 
> Signed-off-by: Bin Meng <bmeng@tinylab.org>

ack for virtio

trivial tree pls

> ---
> 
>  include/hw/elf_ops.h         | 2 +-
>  hw/9pfs/9p.c                 | 2 +-
>  hw/dma/pl330.c               | 2 +-
>  hw/net/can/can_sja1000.c     | 2 +-
>  hw/timer/renesas_cmt.c       | 2 +-
>  hw/timer/renesas_tmr.c       | 8 ++++----
>  hw/virtio/virtio-pci.c       | 2 +-
>  target/riscv/vector_helper.c | 2 +-
>  target/rx/op_helper.c        | 4 ++--
>  ui/vnc-jobs.c                | 2 +-
>  ui/vnc.c                     | 2 +-
>  11 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
>      shdr_table = load_at(fd, ehdr->e_shoff,
>                           sizeof(struct elf_shdr) * ehdr->e_shnum);
>      if (!shdr_table) {
> -        return ;
> +        return;
>      }
>  
>      if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
>      err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
>      if (err < 0) {
>          pdu_complete(pdu, err);
> -        return ;
> +        return;
>      }
>      offset += err;
>  
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
>      }
>      if (!insn) {
>          pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> -        return ;
> +        return;
>      }
>      ch->stall = 0;
>      insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
>              (unsigned long long)val, (unsigned int)addr);
>  
>      if (addr > CAN_SJA_MEM_SIZE) {
> -        return ;
> +        return;
>      }
>  
>      if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>  
>      if ((cmt->cmstr & (1 << ch)) == 0) {
>          /* count disable, so not happened next event. */
> -        return ;
> +        return;
>      }
>      next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
>      next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
>      int i, event;
>  
>      if (tmr->tccr[ch] == 0) {
> -        return ;
> +        return;
>      }
>      if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
>          /* external clock mode */
>          /* event not happened */
> -        return ;
> +        return;
>      }
>      if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
>          /* cascading mode */
>          if (ch == 1) {
>              tmr->next[ch] = none;
> -            return ;
> +            return;
>          }
>          diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
>          diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
>                                      tmr->tcorb[ch]) & 0xff;
>      } else {
>          if (ch == 1) {
> -            return ;
> +            return;
>          }
>          tcnt = issue_event(tmr, ch, 16,
>                             concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
>          if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
>              error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
>                         " neither legacy nor transitional device");
> -            return ;
> +            return;
>          }
>          /*
>           * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
>          return;
>      }
>      if (tot - cnt == 0) {
> -        return ;
> +        return;
>      }
>      memset(base + cnt, -1, tot - cnt);
>  }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
>      uint32_t tmp;
>      tcg_debug_assert(sz < 3);
>      if (env->regs[3] == 0) {
> -        return ;
> +        return;
>      }
>      do {
>          tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
>      uint32_t tmp;
>      tcg_debug_assert(sz < 3);
>      if (env->regs[3] == 0) {
> -        return ;
> +        return;
>      }
>      do {
>          tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
>      VncJobQueue *q;
>  
>      if (vnc_worker_thread_running())
> -        return ;
> +        return;
>  
>      q = vnc_queue_init();
>      qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>  
>      rect = vnc_stat_rect(vd, x, y);
>      if (rect->updated) {
> -        return ;
> +        return;
>      }
>      rect->times[rect->idx] = *tv;
>      rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
> -- 
> 2.25.1
Re: [PATCH] treewide: Remove the unnecessary space before semicolon
Posted by Pavel Pisa 1 year, 6 months ago 
Hllo Bin Meng,

I ACK the change for SJA1000.

On Monday 24 of October 2022 09:28:02 Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
>
>  include/hw/elf_ops.h         | 2 +-
>  hw/9pfs/9p.c                 | 2 +-
>  hw/dma/pl330.c               | 2 +-

>  hw/net/can/can_sja1000.c     | 2 +-

Acked-by: Pave Pisa <pisa@cmp.felk.cvut.cz>

>  hw/timer/renesas_cmt.c       | 2 +-
>  hw/timer/renesas_tmr.c       | 8 ++++----
>  hw/virtio/virtio-pci.c       | 2 +-
>  target/riscv/vector_helper.c | 2 +-
>  target/rx/op_helper.c        | 4 ++--
>  ui/vnc-jobs.c                | 2 +-
>  ui/vnc.c                     | 2 +-
>  11 files changed, 15 insertions(+), 15 deletions(-)
>

> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr,
> uint64_t val, (unsigned long long)val, (unsigned int)addr);
>
>      if (addr > CAN_SJA_MEM_SIZE) {
> -        return ;
> +        return;
>      }
>
>      if (s->clock & 0x80) { /* PeliCAN Mode */

-- 

                Pavel Pisa
    phone:      +420 603531357
    e-mail:     pisa@cmp.felk.cvut.cz
    Department of Control Engineering FEE CVUT
    Karlovo namesti 13, 121 35, Prague 2
    university: http://control.fel.cvut.cz/
    personal:   http://cmp.felk.cvut.cz/~pisa
    projects:   https://www.openhub.net/accounts/ppisa
    CAN related:http://canbus.pages.fel.cvut.cz/
    RISC-V education: https://comparch.edu.cvut.cz/
    Open Technologies Research Education and Exchange Services
    https://gitlab.fel.cvut.cz/otrees/org/-/wikis/home

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.