[PULL 0/3] Block patches

[PULL 0/3] Block patches

[Stefan Hajnoczi]

The following changes since commit ef9f8fcbec6276414921dcd042575129a6331a2d:

  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-03-04-2' into staging (2020-03-05 19:39:47 +0000)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 1f40ace7b5634f93801c8474b9eb77fe2e00289c:

  tests: Fix a bug with count variables (2020-03-06 10:35:15 +0000)

----------------------------------------------------------------
Pull request

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

----------------------------------------------------------------

Alexander Bulekov (2):
  fuzz: fix style/typos in linker-script comments
  qtest: fix fuzzer-related 80-char limit violations

Tianjia Zhang (1):
  tests: Fix a bug with count variables

 qtest.c                       |  3 ++-
 tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
 tests/qtest/fuzz/qos_fuzz.c   |  5 ++++-
 tests/test-rcu-list.c         |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

-- 
2.24.1

[PULL 1/3] fuzz: fix style/typos in linker-script comments

[Stefan Hajnoczi]

From: Alexander Bulekov <alxndr@bu.edu>

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200227031439.31386-2-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
index b23a59f194..e086bba873 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;
-- 
2.24.1

[PULL 2/3] qtest: fix fuzzer-related 80-char limit violations

[Stefan Hajnoczi]

From: Alexander Bulekov <alxndr@bu.edu>

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200227031439.31386-3-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qtest.c                     | 3 ++-
 tests/qtest/fuzz/qos_fuzz.c | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qtest.c b/qtest.c
index 1af4e1b08d..5672b75c35 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/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index bbb17470ff..1a99277d60 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 */
-- 
2.24.1

[PULL 3/3] tests: Fix a bug with count variables

[Stefan Hajnoczi]

From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>

The counting code here should use the local variable n_nodes_local.
Otherwise, the variable n_nodes is counting incorrectly, causing the
counting logic of the code to be wrong.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Link: https://lore.kernel.org/r/20200207115433.118254-1-tianjia.zhang@linux.alibaba.com
Message-Id: <20200207115433.118254-1-tianjia.zhang@linux.alibaba.com>
---
 tests/test-rcu-list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
index 1442c0c982..92be51ec50 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;
             }
-- 
2.24.1

Re: [PULL 0/3] Block patches

[Peter Maydell]

On Fri, 6 Mar 2020 at 14:23, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit ef9f8fcbec6276414921dcd042575129a6331a2d:
>
>   Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-03-04-2' into staging (2020-03-05 19:39:47 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 1f40ace7b5634f93801c8474b9eb77fe2e00289c:
>
>   tests: Fix a bug with count variables (2020-03-06 10:35:15 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> These patches would have gone through Thomas Huth but he is away on leave.
>
> ----------------------------------------------------------------



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM