[Qemu-devel] [PULL 0/1] Block patches

[Qemu-devel] [PULL 0/1] Block patches

[Jeff Cody]

The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:

  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)

are available in the git repository at:

  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:

  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)

----------------------------------------------------------------
Gluster patch
----------------------------------------------------------------

Peter Maydell (1):
  block/gluster.c: Handle qdict_array_entries() failure

 block/gluster.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure

[Jeff Cody]

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 031596a..addceed 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -493,8 +493,7 @@ 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

Re: [Qemu-devel] [PULL 0/1] Block patches

[Peter Maydell]

On 9 June 2017 at 13:43, Jeff Cody <jcody@redhat.com> wrote:
> The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
>
>   arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
>
> are available in the git repository at:
>
>   git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
>
>   block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
>
> ----------------------------------------------------------------
> Gluster patch
> ----------------------------------------------------------------

Applied, thanks.

-- PMM