Series comparison

 [Qemu-devel] [PULL 0/1] Block patches
-The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
+The following changes since commit b33afc415622e5eb26e0f14fd27eb86e32a5472e:
-  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
+  Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2' into staging (2017-11-03 10:08:34 +0000)
 are available in the git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  git://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
+for you to fetch changes up to ef9115dd7c82a196b18cac46784724bdebf01fbc:
-  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
+  aio-posix: drop QEMU_AIO_POLL_MAX_NS env var (2017-11-06 11:04:38 +0000)
 ----------------------------------------------------------------
-Gluster patch
 ----------------------------------------------------------------
-Peter Maydell (1):
+Stefan Hajnoczi (1):
-  block/gluster.c: Handle qdict_array_entries() failure
+  aio-posix: drop QEMU_AIO_POLL_MAX_NS env var
- block/gluster.c | 3 +--
+ util/aio-posix.c | 7 -------
-file changed, 1 insertion(+), 2 deletions(-)
+file changed, 7 deletions(-)
 --
-.9.3
+.13.6

-[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
+[Qemu-devel] [PULL 1/1] aio-posix: drop QEMU_AIO_POLL_MAX_NS env var
-From: Peter Maydell <peter.maydell@linaro.org>
+This hunk should not have been merged but I forgot to remove it.  Let's
 remove it before it slips into a QEMU release.
-In qemu_gluster_parse_json(), the call to qdict_array_entries()
+¯\_(ツ)_/¯
 could return a negative error code, which we were ignoring
 because we assigned the result to an unsigned variable.
 Fix this by using the 'int' type instead, which matches the
 return type of qdict_array_entries() and also the type
 we use for the loop enumeration variable 'i'.
-(Spotted by Coverity, CID 1360960.)
+Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 20171103154041.12617-1-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  util/aio-posix.c | 7 -------
 file changed, 7 deletions(-)
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+diff --git a/util/aio-posix.c b/util/aio-posix.c
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Jeff Cody <jcody@redhat.com>
 Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
  block/gluster.c | 3 +--
 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/block/gluster.c b/block/gluster.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
+--- a/util/aio-posix.c
-+++ b/block/gluster.c
++++ b/util/aio-posix.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
+@@ -XXX,XX +XXX,XX @@ bool aio_poll(AioContext *ctx, bool blocking)
-     Error *local_err = NULL;
-     char *str = NULL;
+ void aio_context_setup(AioContext *ctx)
-     const char *ptr;
+ {
--    size_t num_servers;
+-    /* TODO remove this in final patch submission */
--    int i, type;
+-    if (getenv("QEMU_AIO_POLL_MAX_NS")) {
-+    int i, type, num_servers;
+-        fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has "
+-                "been replaced with -object iothread,poll-max-ns=NUM\n");
-     /* create opts info from runtime_json_opts list */
+-        exit(1);
-     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
+-    }
 -
  #ifdef CONFIG_EPOLL_CREATE1
      assert(!ctx->epollfd);
      ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);
 --
-.9.3
+.13.6

From: Peter Maydell <peter.maydell@linaro.org>

In qemu_gluster_parse_json(), the call to qdict_array_entries()
could return a negative error code, which we were ignoring
because we assigned the result to an unsigned variable.
Fix this by using the 'int' type instead, which matches the
return type of qdict_array_entries() and also the type
we use for the loop enumeration variable 'i'.

(Spotted by Coverity, CID 1360960.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/gluster.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
     Error *local_err = NULL;
     char *str = NULL;
     const char *ptr;
-    size_t num_servers;
-    int i, type;
+    int i, type, num_servers;
 
     /* create opts info from runtime_json_opts list */
     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
-- 
2.9.3

This hunk should not have been merged but I forgot to remove it.  Let's
remove it before it slips into a QEMU release.

¯\_(ツ)_/¯

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20171103154041.12617-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/aio-posix.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/util/aio-posix.c b/util/aio-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -XXX,XX +XXX,XX @@ bool aio_poll(AioContext *ctx, bool blocking)
 
 void aio_context_setup(AioContext *ctx)
 {
-    /* TODO remove this in final patch submission */
-    if (getenv("QEMU_AIO_POLL_MAX_NS")) {
-        fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has "
-                "been replaced with -object iothread,poll-max-ns=NUM\n");
-        exit(1);
-    }
-
 #ifdef CONFIG_EPOLL_CREATE1
     assert(!ctx->epollfd);
     ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);
-- 
2.13.6