[PATCH RESEND 00/13] trivial: Detect and remove superfluous semicolons in C code

[PATCH RESEND 00/13] trivial: Detect and remove superfluous semicolons in C code

[Philippe Mathieu-Daudé]

Luc noticed a superfluous trailing semicolon:
https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg04593.html

Prevent that by modifying checkpatch.pl and clean the codebase.

Philippe Mathieu-Daudé (13):
  scripts/checkpatch.pl: Detect superfluous semicolon in C code
  audio/alsaaudio: Remove superfluous semicolons
  block: Remove superfluous semicolons
  block/io_uring: Remove superfluous semicolon
  hw/arm/xlnx-versal: Remove superfluous semicolon
  hw/m68k/next-cube: Remove superfluous semicolon
  hw/scsi/esp: Remove superfluous semicolon
  hw/vfio/display: Remove superfluous semicolon
  migration/multifd: Remove superfluous semicolon
  ui/input-barrier: Remove superfluous semicolon
  target/i386/whpx: Remove superfluous semicolon
  tests/qtest/libqos/qgraph: Remove superfluous semicolons
  contrib/rdmacm-mux: Remove superfluous semicolon

 audio/alsaaudio.c           | 4 ++--
 block.c                     | 4 ++--
 block/io_uring.c            | 2 +-
 contrib/rdmacm-mux/main.c   | 2 +-
 hw/arm/xlnx-versal-virt.c   | 2 +-
 hw/m68k/next-cube.c         | 2 +-
 hw/scsi/esp.c               | 2 +-
 hw/vfio/display.c           | 2 +-
 migration/multifd.c         | 2 +-
 target/i386/whpx-all.c      | 2 +-
 tests/qtest/libqos/qgraph.c | 4 ++--
 ui/input-barrier.c          | 2 +-
 scripts/checkpatch.pl       | 5 +++++
 13 files changed, 20 insertions(+), 15 deletions(-)

-- 
2.21.1

[PATCH RESEND 01/13] scripts/checkpatch.pl: Detect superfluous semicolon in C code

[Philippe Mathieu-Daudé]

Display error when a commit contains superfluous semicolon:

  $ git show 6663a0a3376 | scripts/checkpatch.pl -q -
  ERROR: superfluous trailing semicolon
  #276: FILE: block/io_uring.c:186:
  +                ret = -ENOSPC;;
  total: 1 errors, 1 warnings, 485 lines checked

Reported-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/checkpatch.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ce43a306f8..11512a8a09 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1830,6 +1830,11 @@ sub process {
 			ERROR("suspicious ; after while (0)\n" . $herecurr);
 		}
 
+# Check superfluous trailing ';'
+		if ($line =~ /;;$/) {
+			ERROR("superfluous trailing semicolon\n" . $herecurr);
+		}
+
 # Check relative indent for conditionals and blocks.
 		if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
 			my ($s, $c) = ($stat, $cond);
-- 
2.21.1

[PATCH RESEND 02/13] audio/alsaaudio: Remove superfluous semicolons

[Philippe Mathieu-Daudé]

Fixes: 286a5d201e4
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: "Kővágó, Zoltán" <DirtY.iCE.hu@gmail.com>
---
 audio/alsaaudio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index a23a5a0b60..a8e62542f9 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -819,7 +819,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
             switch (nread) {
             case 0:
                 trace_alsa_read_zero(len);
-                return pos;;
+                return pos;
 
             case -EPIPE:
                 if (alsa_recover(alsa->handle)) {
@@ -835,7 +835,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
             default:
                 alsa_logerr(nread, "Failed to read %zu frames to %p\n",
                             len, dst);
-                return pos;;
+                return pos;
             }
         }
 
-- 
2.21.1

[PATCH RESEND 03/13] block: Remove superfluous semicolons

[Philippe Mathieu-Daudé]

Fixes: 132ada80c4a
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 block.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block.c b/block.c
index 9c810534d6..9db0b973fe 100644
--- a/block.c
+++ b/block.c
@@ -2435,13 +2435,13 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
     if (bdrv_get_aio_context(child_bs) != ctx) {
         ret = bdrv_try_set_aio_context(child_bs, ctx, &local_err);
         if (ret < 0 && child_role->can_set_aio_ctx) {
-            GSList *ignore = g_slist_prepend(NULL, child);;
+            GSList *ignore = g_slist_prepend(NULL, child);
             ctx = bdrv_get_aio_context(child_bs);
             if (child_role->can_set_aio_ctx(child, ctx, &ignore, NULL)) {
                 error_free(local_err);
                 ret = 0;
                 g_slist_free(ignore);
-                ignore = g_slist_prepend(NULL, child);;
+                ignore = g_slist_prepend(NULL, child);
                 child_role->set_aio_ctx(child, ctx, &ignore);
             }
             g_slist_free(ignore);
-- 
2.21.1

[PATCH RESEND 04/13] block/io_uring: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 6663a0a3376
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefano Garzarella <sgarzare@redhat.com>
---
 block/io_uring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/io_uring.c b/block/io_uring.c
index 56892fd1ab..a3142ca989 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -187,7 +187,7 @@ static void luring_process_completions(LuringState *s)
                     ret = 0;
                 }
             } else {
-                ret = -ENOSPC;;
+                ret = -ENOSPC;
             }
         }
 end:
-- 
2.21.1

[PATCH RESEND 05/13] hw/arm/xlnx-versal: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 6f16da53ffe
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/arm/xlnx-versal-virt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 462493c467..0d2e3bdda1 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -350,7 +350,7 @@ static void create_virtio_regions(VersalVirt *s)
     int i;
 
     for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
-        char *name = g_strdup_printf("virtio%d", i);;
+        char *name = g_strdup_printf("virtio%d", i);
         hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size;
         int irq = VERSAL_RSVD_IRQ_FIRST + i;
         MemoryRegion *mr;
-- 
2.21.1

[PATCH RESEND 06/13] hw/m68k/next-cube: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 956a78118bf
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/m68k/next-cube.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index e5343348d0..350c6fec78 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -734,7 +734,7 @@ void next_irq(void *opaque, int number, int level)
     switch (number) {
     /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */
     case NEXT_FD_I:
-        shift = 7;;
+        shift = 7;
         break;
     case NEXT_KBD_I:
         shift = 3;
-- 
2.21.1

[PATCH RESEND 07/13] hw/scsi/esp: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 74d71ea16bc
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/esp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index f8fc30cccb..405f8b7cbc 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -293,7 +293,7 @@ static void handle_satn_stop(ESPState *s)
         s->dma_cb = handle_satn_stop;
         return;
     }
-    s->pdma_cb = satn_stop_pdma_cb;;
+    s->pdma_cb = satn_stop_pdma_cb;
     s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf));
     if (s->cmdlen) {
         trace_esp_handle_satn_stop(s->cmdlen);
-- 
2.21.1

[PATCH RESEND 08/13] hw/vfio/display: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 8b818e059bf
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vfio/display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index a5a608c5b2..f4977c66e1 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -287,7 +287,7 @@ static void vfio_display_dmabuf_update(void *opaque)
     VFIOPCIDevice *vdev = opaque;
     VFIODisplay *dpy = vdev->dpy;
     VFIODMABuf *primary, *cursor;
-    bool free_bufs = false, new_cursor = false;;
+    bool free_bufs = false, new_cursor = false;
 
     primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY);
     if (primary == NULL) {
-- 
2.21.1

[PATCH RESEND 09/13] migration/multifd: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: d32ca5ad798
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 migration/multifd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/multifd.c b/migration/multifd.c
index b3e8ae9bcc..cfaba1369e 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -305,7 +305,7 @@ static int multifd_send_pages(QEMUFile *f)
                 + p->packet_len;
     qemu_file_update_transfer(f, transferred);
     ram_counters.multifd_bytes += transferred;
-    ram_counters.transferred += transferred;;
+    ram_counters.transferred += transferred;
     qemu_mutex_unlock(&p->mutex);
     qemu_sem_post(&p->sem);
 
-- 
2.21.1

[PATCH RESEND 10/13] ui/input-barrier: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 6105683da35
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Laurent Vivier <laurent@vivier.eu>
---
 ui/input-barrier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/input-barrier.c b/ui/input-barrier.c
index fe35049b83..527c75e130 100644
--- a/ui/input-barrier.c
+++ b/ui/input-barrier.c
@@ -455,7 +455,7 @@ static gboolean writecmd(InputBarrier *ib, struct barrierMsg *msg)
         break;
     default:
         write_cmd(p, barrierCmdEUnknown, avail);
-        break;;
+        break;
     }
 
     len = MAX_HELLO_LENGTH - avail - sizeof(int);
-- 
2.21.1

[PATCH RESEND 11/13] target/i386/whpx: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: 812d49f2a3e
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Justin Terry (VM) <juterry@microsoft.com>
---
 target/i386/whpx-all.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index 3ed2aa1892..35601b8176 100644
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -511,7 +511,7 @@ static void whpx_get_registers(CPUState *cpu)
     /* WHvX64RegisterPat - Skipped */
 
     assert(whpx_register_names[idx] == WHvX64RegisterSysenterCs);
-    env->sysenter_cs = vcxt.values[idx++].Reg64;;
+    env->sysenter_cs = vcxt.values[idx++].Reg64;
     assert(whpx_register_names[idx] == WHvX64RegisterSysenterEip);
     env->sysenter_eip = vcxt.values[idx++].Reg64;
     assert(whpx_register_names[idx] == WHvX64RegisterSysenterEsp);
-- 
2.21.1

[PATCH RESEND 12/13] tests/qtest/libqos/qgraph: Remove superfluous semicolons

[Philippe Mathieu-Daudé]

Fixes: fc281c80202
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
---
 tests/qtest/libqos/qgraph.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c
index 7a7ae2a19e..ca01de0743 100644
--- a/tests/qtest/libqos/qgraph.c
+++ b/tests/qtest/libqos/qgraph.c
@@ -474,7 +474,7 @@ QOSEdgeType qos_graph_edge_get_type(QOSGraphEdge *edge)
     if (!edge) {
         return -1;
     }
-    return edge->type;;
+    return edge->type;
 }
 
 char *qos_graph_edge_get_dest(QOSGraphEdge *edge)
@@ -590,7 +590,7 @@ void qos_add_test(const char *name, const char *interface,
                   QOSTestFunc test_func, QOSGraphTestOptions *opts)
 {
     QOSGraphNode *node;
-    char *test_name = g_strdup_printf("%s-tests/%s", interface, name);;
+    char *test_name = g_strdup_printf("%s-tests/%s", interface, name);
     QOSGraphTestOptions def_opts = { };
 
     if (!opts) {
-- 
2.21.1

[PATCH RESEND 13/13] contrib/rdmacm-mux: Remove superfluous semicolon

[Philippe Mathieu-Daudé]

Fixes: a5d2f6f8773
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
---
 contrib/rdmacm-mux/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c
index de53048f06..bd82abbad3 100644
--- a/contrib/rdmacm-mux/main.c
+++ b/contrib/rdmacm-mux/main.c
@@ -490,7 +490,7 @@ static int read_and_process(int fd)
 
 static int accept_all(void)
 {
-    int fd, rc = 0;;
+    int fd, rc = 0;
 
     pthread_rwlock_wrlock(&server.lock);
 
-- 
2.21.1

Re: [PATCH RESEND 01/13] scripts/checkpatch.pl: Detect superfluous semicolon in C code

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Display error when a commit contains superfluous semicolon:
> 
>   $ git show 6663a0a3376 | scripts/checkpatch.pl -q -
>   ERROR: superfluous trailing semicolon
>   #276: FILE: block/io_uring.c:186:
>   +                ret = -ENOSPC;;
>   total: 1 errors, 1 warnings, 485 lines checked
> 
> Reported-by: Luc Michel <luc.michel@greensocs.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  scripts/checkpatch.pl | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index ce43a306f8..11512a8a09 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -1830,6 +1830,11 @@ sub process {
>  			ERROR("suspicious ; after while (0)\n" . $herecurr);
>  		}
>  
> +# Check superfluous trailing ';'
> +		if ($line =~ /;;$/) {
> +			ERROR("superfluous trailing semicolon\n" . $herecurr);
> +		}
> +
>  # Check relative indent for conditionals and blocks.
>  		if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
>  			my ($s, $c) = ($stat, $cond);
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 02/13] audio/alsaaudio: Remove superfluous semicolons

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 286a5d201e4
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: "Kővágó, Zoltán" <DirtY.iCE.hu@gmail.com>
> ---
>  audio/alsaaudio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
> index a23a5a0b60..a8e62542f9 100644
> --- a/audio/alsaaudio.c
> +++ b/audio/alsaaudio.c
> @@ -819,7 +819,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
>              switch (nread) {
>              case 0:
>                  trace_alsa_read_zero(len);
> -                return pos;;
> +                return pos;
>  
>              case -EPIPE:
>                  if (alsa_recover(alsa->handle)) {
> @@ -835,7 +835,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)
>              default:
>                  alsa_logerr(nread, "Failed to read %zu frames to %p\n",
>                              len, dst);
> -                return pos;;
> +                return pos;
>              }
>          }
>  
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 03/13] block: Remove superfluous semicolons

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 132ada80c4a
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  block.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/block.c b/block.c
> index 9c810534d6..9db0b973fe 100644
> --- a/block.c
> +++ b/block.c
> @@ -2435,13 +2435,13 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
>      if (bdrv_get_aio_context(child_bs) != ctx) {
>          ret = bdrv_try_set_aio_context(child_bs, ctx, &local_err);
>          if (ret < 0 && child_role->can_set_aio_ctx) {
> -            GSList *ignore = g_slist_prepend(NULL, child);;
> +            GSList *ignore = g_slist_prepend(NULL, child);
>              ctx = bdrv_get_aio_context(child_bs);
>              if (child_role->can_set_aio_ctx(child, ctx, &ignore, NULL)) {
>                  error_free(local_err);
>                  ret = 0;
>                  g_slist_free(ignore);
> -                ignore = g_slist_prepend(NULL, child);;
> +                ignore = g_slist_prepend(NULL, child);
>                  child_role->set_aio_ctx(child, ctx, &ignore);
>              }
>              g_slist_free(ignore);
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 04/13] block/io_uring: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 6663a0a3376
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  block/io_uring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 56892fd1ab..a3142ca989 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -187,7 +187,7 @@ static void luring_process_completions(LuringState *s)
>                      ret = 0;
>                  }
>              } else {
> -                ret = -ENOSPC;;
> +                ret = -ENOSPC;
>              }
>          }
>  end:
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 05/13] hw/arm/xlnx-versal: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 6f16da53ffe
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  hw/arm/xlnx-versal-virt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> index 462493c467..0d2e3bdda1 100644
> --- a/hw/arm/xlnx-versal-virt.c
> +++ b/hw/arm/xlnx-versal-virt.c
> @@ -350,7 +350,7 @@ static void create_virtio_regions(VersalVirt *s)
>      int i;
>  
>      for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
> -        char *name = g_strdup_printf("virtio%d", i);;
> +        char *name = g_strdup_printf("virtio%d", i);
>          hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size;
>          int irq = VERSAL_RSVD_IRQ_FIRST + i;
>          MemoryRegion *mr;
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 06/13] hw/m68k/next-cube: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 956a78118bf
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  hw/m68k/next-cube.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
> index e5343348d0..350c6fec78 100644
> --- a/hw/m68k/next-cube.c
> +++ b/hw/m68k/next-cube.c
> @@ -734,7 +734,7 @@ void next_irq(void *opaque, int number, int level)
>      switch (number) {
>      /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */
>      case NEXT_FD_I:
> -        shift = 7;;
> +        shift = 7;
>          break;
>      case NEXT_KBD_I:
>          shift = 3;
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 04/13] block/io_uring: Remove superfluous semicolon

[Kevin Wolf]

Am 18.02.2020 um 10:43 hat Philippe Mathieu-Daudé geschrieben:
> Fixes: 6663a0a3376
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks, applied patches 3 and 4 to the block branch.

Kevin

Re: [PATCH RESEND 04/13] block/io_uring: Remove superfluous semicolon

[Stefano Garzarella]

On Tue, Feb 18, 2020 at 10:43:53AM +0100, Philippe Mathieu-Daudé wrote:
> Fixes: 6663a0a3376
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Stefano Garzarella <sgarzare@redhat.com>
> ---
>  block/io_uring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Thanks,
Stefano

> 
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 56892fd1ab..a3142ca989 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -187,7 +187,7 @@ static void luring_process_completions(LuringState *s)
>                      ret = 0;
>                  }
>              } else {
> -                ret = -ENOSPC;;
> +                ret = -ENOSPC;
>              }
>          }
>  end:
> -- 
> 2.21.1
> 

Re: [PATCH RESEND 07/13] hw/scsi/esp: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 74d71ea16bc
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Laurent Vivier <laurent@vivier.eu>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/scsi/esp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
> index f8fc30cccb..405f8b7cbc 100644
> --- a/hw/scsi/esp.c
> +++ b/hw/scsi/esp.c
> @@ -293,7 +293,7 @@ static void handle_satn_stop(ESPState *s)
>          s->dma_cb = handle_satn_stop;
>          return;
>      }
> -    s->pdma_cb = satn_stop_pdma_cb;;
> +    s->pdma_cb = satn_stop_pdma_cb;
>      s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf));
>      if (s->cmdlen) {
>          trace_esp_handle_satn_stop(s->cmdlen);
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 08/13] hw/vfio/display: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 8b818e059bf
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/vfio/display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/vfio/display.c b/hw/vfio/display.c
> index a5a608c5b2..f4977c66e1 100644
> --- a/hw/vfio/display.c
> +++ b/hw/vfio/display.c
> @@ -287,7 +287,7 @@ static void vfio_display_dmabuf_update(void *opaque)
>      VFIOPCIDevice *vdev = opaque;
>      VFIODisplay *dpy = vdev->dpy;
>      VFIODMABuf *primary, *cursor;
> -    bool free_bufs = false, new_cursor = false;;
> +    bool free_bufs = false, new_cursor = false;
>  
>      primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY);
>      if (primary == NULL) {
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 09/13] migration/multifd: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: d32ca5ad798
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/multifd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/multifd.c b/migration/multifd.c
> index b3e8ae9bcc..cfaba1369e 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -305,7 +305,7 @@ static int multifd_send_pages(QEMUFile *f)
>                  + p->packet_len;
>      qemu_file_update_transfer(f, transferred);
>      ram_counters.multifd_bytes += transferred;
> -    ram_counters.transferred += transferred;;
> +    ram_counters.transferred += transferred;
>      qemu_mutex_unlock(&p->mutex);
>      qemu_sem_post(&p->sem);
>  
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 10/13] ui/input-barrier: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 6105683da35
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  ui/input-barrier.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ui/input-barrier.c b/ui/input-barrier.c
> index fe35049b83..527c75e130 100644
> --- a/ui/input-barrier.c
> +++ b/ui/input-barrier.c
> @@ -455,7 +455,7 @@ static gboolean writecmd(InputBarrier *ib, struct barrierMsg *msg)
>          break;
>      default:
>          write_cmd(p, barrierCmdEUnknown, avail);
> -        break;;
> +        break;
>      }
>  
>      len = MAX_HELLO_LENGTH - avail - sizeof(int);
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 11/13] target/i386/whpx: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: 812d49f2a3e
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Justin Terry (VM) <juterry@microsoft.com>
> ---
>  target/i386/whpx-all.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
> index 3ed2aa1892..35601b8176 100644
> --- a/target/i386/whpx-all.c
> +++ b/target/i386/whpx-all.c
> @@ -511,7 +511,7 @@ static void whpx_get_registers(CPUState *cpu)
>      /* WHvX64RegisterPat - Skipped */
>  
>      assert(whpx_register_names[idx] == WHvX64RegisterSysenterCs);
> -    env->sysenter_cs = vcxt.values[idx++].Reg64;;
> +    env->sysenter_cs = vcxt.values[idx++].Reg64;
>      assert(whpx_register_names[idx] == WHvX64RegisterSysenterEip);
>      env->sysenter_eip = vcxt.values[idx++].Reg64;
>      assert(whpx_register_names[idx] == WHvX64RegisterSysenterEsp);
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 12/13] tests/qtest/libqos/qgraph: Remove superfluous semicolons

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: fc281c80202
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
> ---
>  tests/qtest/libqos/qgraph.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/libqos/qgraph.c b/tests/qtest/libqos/qgraph.c
> index 7a7ae2a19e..ca01de0743 100644
> --- a/tests/qtest/libqos/qgraph.c
> +++ b/tests/qtest/libqos/qgraph.c
> @@ -474,7 +474,7 @@ QOSEdgeType qos_graph_edge_get_type(QOSGraphEdge *edge)
>      if (!edge) {
>          return -1;
>      }
> -    return edge->type;;
> +    return edge->type;
>  }
>  
>  char *qos_graph_edge_get_dest(QOSGraphEdge *edge)
> @@ -590,7 +590,7 @@ void qos_add_test(const char *name, const char *interface,
>                    QOSTestFunc test_func, QOSGraphTestOptions *opts)
>  {
>      QOSGraphNode *node;
> -    char *test_name = g_strdup_printf("%s-tests/%s", interface, name);;
> +    char *test_name = g_strdup_printf("%s-tests/%s", interface, name);
>      QOSGraphTestOptions def_opts = { };
>  
>      if (!opts) {
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 13/13] contrib/rdmacm-mux: Remove superfluous semicolon

[Dr. David Alan Gilbert]

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Fixes: a5d2f6f8773
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
> Cc: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
> ---
>  contrib/rdmacm-mux/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c
> index de53048f06..bd82abbad3 100644
> --- a/contrib/rdmacm-mux/main.c
> +++ b/contrib/rdmacm-mux/main.c
> @@ -490,7 +490,7 @@ static int read_and_process(int fd)
>  
>  static int accept_all(void)
>  {
> -    int fd, rc = 0;;
> +    int fd, rc = 0;
>  
>      pthread_rwlock_wrlock(&server.lock);
>  
> -- 
> 2.21.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH RESEND 01/13] scripts/checkpatch.pl: Detect superfluous semicolon in C code

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Display error when a commit contains superfluous semicolon:
>
>   $ git show 6663a0a3376 | scripts/checkpatch.pl -q -
>   ERROR: superfluous trailing semicolon
>   #276: FILE: block/io_uring.c:186:
>   +                ret = -ENOSPC;;
>   total: 1 errors, 1 warnings, 485 lines checked
>
> Reported-by: Luc Michel <luc.michel@greensocs.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 02/13] audio/alsaaudio: Remove superfluous semicolons

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 286a5d201e4
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 09/13] migration/multifd: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: d32ca5ad798
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 13/13] contrib/rdmacm-mux: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: a5d2f6f8773
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 03/13] block: Remove superfluous semicolons

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 132ada80c4a
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 04/13] block/io_uring: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 6663a0a3376
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 05/13] hw/arm/xlnx-versal: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 6f16da53ffe
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 06/13] hw/m68k/next-cube: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 956a78118bf
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 07/13] hw/scsi/esp: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 74d71ea16bc
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 08/13] hw/vfio/display: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 8b818e059bf
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 09/13] migration/multifd: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: d32ca5ad798
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

I forgot, queued on migration branch.

Re: [PATCH RESEND 10/13] ui/input-barrier: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 6105683da35
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 11/13] target/i386/whpx: Remove superfluous semicolon

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: 812d49f2a3e
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 12/13] tests/qtest/libqos/qgraph: Remove superfluous semicolons

[Juan Quintela]

Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Fixes: fc281c80202
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH RESEND 01/13] scripts/checkpatch.pl: Detect superfluous semicolon in C code

[Luc Michel]

On 2/18/20 10:43 AM, Philippe Mathieu-Daudé wrote:
> Display error when a commit contains superfluous semicolon:
> 
>   $ git show 6663a0a3376 | scripts/checkpatch.pl -q -
>   ERROR: superfluous trailing semicolon
>   #276: FILE: block/io_uring.c:186:
>   +                ret = -ENOSPC;;
>   total: 1 errors, 1 warnings, 485 lines checked
> 
> Reported-by: Luc Michel <luc.michel@greensocs.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Luc Michel <luc.michel@greensocs.com>

> ---
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  scripts/checkpatch.pl | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index ce43a306f8..11512a8a09 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -1830,6 +1830,11 @@ sub process {
>  			ERROR("suspicious ; after while (0)\n" . $herecurr);
>  		}
>  
> +# Check superfluous trailing ';'
> +		if ($line =~ /;;$/) {
> +			ERROR("superfluous trailing semicolon\n" . $herecurr);
> +		}
> +
>  # Check relative indent for conditionals and blocks.
>  		if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
>  			my ($s, $c) = ($stat, $cond);
> 

Re: [PATCH RESEND 00/13] trivial: Detect and remove superfluous semicolons in C code

[Paolo Bonzini]

On 18/02/20 10:43, Philippe Mathieu-Daudé wrote:
> Luc noticed a superfluous trailing semicolon:
> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg04593.html
> 
> Prevent that by modifying checkpatch.pl and clean the codebase.
> 
> Philippe Mathieu-Daudé (13):
>   scripts/checkpatch.pl: Detect superfluous semicolon in C code
>   audio/alsaaudio: Remove superfluous semicolons
>   block: Remove superfluous semicolons
>   block/io_uring: Remove superfluous semicolon
>   hw/arm/xlnx-versal: Remove superfluous semicolon
>   hw/m68k/next-cube: Remove superfluous semicolon
>   hw/scsi/esp: Remove superfluous semicolon
>   hw/vfio/display: Remove superfluous semicolon
>   migration/multifd: Remove superfluous semicolon
>   ui/input-barrier: Remove superfluous semicolon
>   target/i386/whpx: Remove superfluous semicolon
>   tests/qtest/libqos/qgraph: Remove superfluous semicolons
>   contrib/rdmacm-mux: Remove superfluous semicolon
> 
>  audio/alsaaudio.c           | 4 ++--
>  block.c                     | 4 ++--
>  block/io_uring.c            | 2 +-
>  contrib/rdmacm-mux/main.c   | 2 +-
>  hw/arm/xlnx-versal-virt.c   | 2 +-
>  hw/m68k/next-cube.c         | 2 +-
>  hw/scsi/esp.c               | 2 +-
>  hw/vfio/display.c           | 2 +-
>  migration/multifd.c         | 2 +-
>  target/i386/whpx-all.c      | 2 +-
>  tests/qtest/libqos/qgraph.c | 4 ++--
>  ui/input-barrier.c          | 2 +-
>  scripts/checkpatch.pl       | 5 +++++
>  13 files changed, 20 insertions(+), 15 deletions(-)
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Laurent, can you queue this in qemu-trivial?

Re: [PATCH RESEND 00/13] trivial: Detect and remove superfluous semicolons in C code

[Laurent Vivier]

On 18/02/2020 18:04, Paolo Bonzini wrote:
> On 18/02/20 10:43, Philippe Mathieu-Daudé wrote:
>> Luc noticed a superfluous trailing semicolon:
>> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg04593.html
>>
>> Prevent that by modifying checkpatch.pl and clean the codebase.
>>
>> Philippe Mathieu-Daudé (13):
>>   scripts/checkpatch.pl: Detect superfluous semicolon in C code
>>   audio/alsaaudio: Remove superfluous semicolons
>>   block: Remove superfluous semicolons
>>   block/io_uring: Remove superfluous semicolon
>>   hw/arm/xlnx-versal: Remove superfluous semicolon
>>   hw/m68k/next-cube: Remove superfluous semicolon
>>   hw/scsi/esp: Remove superfluous semicolon
>>   hw/vfio/display: Remove superfluous semicolon
>>   migration/multifd: Remove superfluous semicolon
>>   ui/input-barrier: Remove superfluous semicolon
>>   target/i386/whpx: Remove superfluous semicolon
>>   tests/qtest/libqos/qgraph: Remove superfluous semicolons
>>   contrib/rdmacm-mux: Remove superfluous semicolon
>>
>>  audio/alsaaudio.c           | 4 ++--
>>  block.c                     | 4 ++--
>>  block/io_uring.c            | 2 +-
>>  contrib/rdmacm-mux/main.c   | 2 +-
>>  hw/arm/xlnx-versal-virt.c   | 2 +-
>>  hw/m68k/next-cube.c         | 2 +-
>>  hw/scsi/esp.c               | 2 +-
>>  hw/vfio/display.c           | 2 +-
>>  migration/multifd.c         | 2 +-
>>  target/i386/whpx-all.c      | 2 +-
>>  tests/qtest/libqos/qgraph.c | 4 ++--
>>  ui/input-barrier.c          | 2 +-
>>  scripts/checkpatch.pl       | 5 +++++
>>  13 files changed, 20 insertions(+), 15 deletions(-)
>>
> 
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Laurent, can you queue this in qemu-trivial?
> 
Yes, I will.

Thanks,
Laurent

Re: [PATCH RESEND 00/13] trivial: Detect and remove superfluous semicolons in C code

[Laurent Vivier]

Le 18/02/2020 à 18:04, Paolo Bonzini a écrit :
> On 18/02/20 10:43, Philippe Mathieu-Daudé wrote:
>> Luc noticed a superfluous trailing semicolon:
>> https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg04593.html
>>
>> Prevent that by modifying checkpatch.pl and clean the codebase.
>>
>> Philippe Mathieu-Daudé (13):
>>   scripts/checkpatch.pl: Detect superfluous semicolon in C code
>>   audio/alsaaudio: Remove superfluous semicolons
>>   block: Remove superfluous semicolons
>>   block/io_uring: Remove superfluous semicolon
>>   hw/arm/xlnx-versal: Remove superfluous semicolon
>>   hw/m68k/next-cube: Remove superfluous semicolon
>>   hw/scsi/esp: Remove superfluous semicolon
>>   hw/vfio/display: Remove superfluous semicolon
>>   migration/multifd: Remove superfluous semicolon
>>   ui/input-barrier: Remove superfluous semicolon
>>   target/i386/whpx: Remove superfluous semicolon
>>   tests/qtest/libqos/qgraph: Remove superfluous semicolons
>>   contrib/rdmacm-mux: Remove superfluous semicolon
>>
>>  audio/alsaaudio.c           | 4 ++--
>>  block.c                     | 4 ++--
>>  block/io_uring.c            | 2 +-
>>  contrib/rdmacm-mux/main.c   | 2 +-
>>  hw/arm/xlnx-versal-virt.c   | 2 +-
>>  hw/m68k/next-cube.c         | 2 +-
>>  hw/scsi/esp.c               | 2 +-
>>  hw/vfio/display.c           | 2 +-
>>  migration/multifd.c         | 2 +-
>>  target/i386/whpx-all.c      | 2 +-
>>  tests/qtest/libqos/qgraph.c | 4 ++--
>>  ui/input-barrier.c          | 2 +-
>>  scripts/checkpatch.pl       | 5 +++++
>>  13 files changed, 20 insertions(+), 15 deletions(-)
>>
> 
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> Laurent, can you queue this in qemu-trivial?
> 

Queued, except patches 3, 4 (taken by Kevin) and 9 (by Juan)

Thanks,
Laurent

RE: [EXTERNAL] Re: [PATCH RESEND 11/13] target/i386/whpx: Remove superfluous semicolon

[Justin Terry (SF)]

+Sunil Muthuswamy <sunilmut@microsoft.com>

LGTM. Thanks!

Reviewed-by: Justin Terry (VM) <juterry@microsoft.com>

> -----Original Message-----
> From: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Sent: Tuesday, February 18, 2020 2:00 AM
> To: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: qemu-devel@nongnu.org; Max Reitz <mreitz@redhat.com>; Kevin Wolf
> <kwolf@redhat.com>; Thomas Huth <thuth@redhat.com>; Fam Zheng
> <fam@euphon.net>; Eduardo Habkost <ehabkost@redhat.com>; Alex
> Williamson <alex.williamson@redhat.com>; Marcel Apfelbaum
> <marcel.apfelbaum@gmail.com>; Richard Henderson <rth@twiddle.net>;
> Julia Suvorova <jusual@redhat.com>; Thomas Huth <huth@tuxfamily.org>;
> Edgar E. Iglesias <edgar.iglesias@gmail.com>; Aarushi Mehta
> <mehta.aaru20@gmail.com>; qemu-trivial@nongnu.org; Stefan Hajnoczi
> <stefanha@redhat.com>; Alistair Francis <alistair@alistair23.me>; Gerd
> Hoffmann <kraxel@redhat.com>; Luc Michel <luc.michel@greensocs.com>;
> Laurent Vivier <lvivier@redhat.com>; Juan Quintela
> <quintela@redhat.com>; Michael Tokarev <mjt@tls.msk.ru>; Laurent Vivier
> <laurent@vivier.eu>; Paolo Bonzini <pbonzini@redhat.com>; Yuval Shaia
> <yuval.shaia.ml@gmail.com>; qemu-arm@nongnu.org; Peter Maydell
> <peter.maydell@linaro.org>; qemu-block@nongnu.org; Justin Terry (SF)
> <juterry@microsoft.com>
> Subject: [EXTERNAL] Re: [PATCH RESEND 11/13] target/i386/whpx: Remove
> superfluous semicolon
> 
> * Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> > Fixes: 812d49f2a3e
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> > ---
> > Cc: Justin Terry (VM) <juterry@microsoft.com>
> > ---
> >  target/i386/whpx-all.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index
> > 3ed2aa1892..35601b8176 100644
> > --- a/target/i386/whpx-all.c
> > +++ b/target/i386/whpx-all.c
> > @@ -511,7 +511,7 @@ static void whpx_get_registers(CPUState *cpu)
> >      /* WHvX64RegisterPat - Skipped */
> >
> >      assert(whpx_register_names[idx] == WHvX64RegisterSysenterCs);
> > -    env->sysenter_cs = vcxt.values[idx++].Reg64;;
> > +    env->sysenter_cs = vcxt.values[idx++].Reg64;
> >      assert(whpx_register_names[idx] == WHvX64RegisterSysenterEip);
> >      env->sysenter_eip = vcxt.values[idx++].Reg64;
> >      assert(whpx_register_names[idx] == WHvX64RegisterSysenterEsp);
> > --
> > 2.21.1
> >
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK