Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

These patches would have gone through Thomas Huth but he is away on leave.

# gpg: Signature made Fri 06 Mar 2020 14:23:11 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  tests: Fix a bug with count variables
  qtest: fix fuzzer-related 80-char limit violations
  fuzz: fix style/typos in linker-script comments

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

4 files changed, 17 insertions, 9 deletions

diff --git a/qtest.c b/qtest.c
index 1af4e1b..5672b75 100644
--- a/qtest.c
+++ b/qtest.c
@@ -794,7 +794,8 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
     }
 }
 
-void qtest_server_set_send_handler(void (*send)(void*, const char*), void *opaque)
+void qtest_server_set_send_handler(void (*send)(void*, const char*),
+                                   void *opaque)
 {
     qtest_server_send = send;
     qtest_server_send_opaque = opaque;
diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
index b23a59f..e086bba 100644
--- a/tests/qtest/fuzz/fork_fuzz.ld
+++ b/tests/qtest/fuzz/fork_fuzz.ld
@@ -1,7 +1,8 @@
-/* We adjust linker script modification to place all of the stuff that needs to
- * persist across fuzzing runs into a contiguous seciton of memory. Then, it is
+/*
+ * We adjust linker script modification to place all of the stuff that needs to
+ * persist across fuzzing runs into a contiguous section of memory. Then, it is
  * easy to re-map the counter-related memory as shared.
-*/
+ */
 
 SECTIONS
 {
@@ -17,7 +18,8 @@ SECTIONS
   }
   .data.fuzz_ordered :
   {
-      /* Coverage counters. They're not necessary for fuzzing, but are useful
+      /*
+       * Coverage counters. They're not necessary for fuzzing, but are useful
        * for analyzing the fuzzing performance
        */
       __start___llvm_prf_cnts = .;
@@ -32,6 +34,8 @@ SECTIONS
       __FUZZ_COUNTERS_END = .;
   }
 }
-/* Dont overwrite the SECTIONS in the default linker script. Instead insert the
- * above into the default script */
+/*
+ * Don't overwrite the SECTIONS in the default linker script. Instead insert the
+ * above into the default script
+ */
 INSERT AFTER .data;
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index bbb1747..1a99277 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -120,7 +120,10 @@ static void walk_path(QOSGraphNode *orig_path, int len)
     QOSGraphNode *path;
     QOSGraphEdge *edge;
 
-    /* etype set to QEDGE_CONSUMED_BY so that machine can add to the command line */
+    /*
+     * etype set to QEDGE_CONSUMED_BY so that machine can add to the command
+     * line
+     */
     QOSEdgeType etype = QEDGE_CONSUMED_BY;
 
     /* twice QOS_PATH_MAX_ELEMENT_SIZE since each edge can have its arg */
diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
index 1442c0c..92be51e 100644
--- a/tests/test-rcu-list.c
+++ b/tests/test-rcu-list.c
@@ -235,7 +235,7 @@ static void *rcu_q_updater(void *arg)
             j++;
             if (target_el == j) {
                 struct list_element *new_el = g_new(struct list_element, 1);
-                n_nodes += n_nodes_local;
+                n_nodes_local++;
                 TEST_LIST_INSERT_AFTER_RCU(el, new_el, entry);
                 break;
             }