| 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100) | 3 | Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000) |
| 4 | 4 | ||
| 5 | are available in the git repository at: | 5 | are available in the git repository at: |
| 6 | 6 | ||
| 7 | git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request | 7 | git://github.com/stefanha/qemu.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: | 9 | for you to fetch changes up to 161d53bbed2be4c4336c098185de3afb13cc6bd5: |
| 10 | 10 | ||
| 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | util/async: use atomic_mb_set in qemu_bh_cancel (2017-11-08 09:24:41 +0000) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Gluster patch | 14 | |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Peter Maydell (1): | 17 | Sergio Lopez (1): |
| 18 | block/gluster.c: Handle qdict_array_entries() failure | 18 | util/async: use atomic_mb_set in qemu_bh_cancel |
| 19 | 19 | ||
| 20 | block/gluster.c | 3 +-- | 20 | Stefan Hajnoczi (1): |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 21 | tests-aio-multithread: fix /aio/multi/schedule race condition |
| 22 | |||
| 23 | tests/test-aio-multithread.c | 5 ++--- | ||
| 24 | util/async.c | 2 +- | ||
| 25 | 2 files changed, 3 insertions(+), 4 deletions(-) | ||
| 22 | 26 | ||
| 23 | -- | 27 | -- |
| 24 | 2.9.3 | 28 | 2.13.6 |
| 25 | 29 | ||
| 26 | 30 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Peter Maydell <peter.maydell@linaro.org> | ||
| 2 | 1 | ||
| 3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() | ||
| 4 | could return a negative error code, which we were ignoring | ||
| 5 | because we assigned the result to an unsigned variable. | ||
| 6 | Fix this by using the 'int' type instead, which matches the | ||
| 7 | return type of qdict_array_entries() and also the type | ||
| 8 | we use for the loop enumeration variable 'i'. | ||
| 9 | |||
| 10 | (Spotted by Coverity, CID 1360960.) | ||
| 11 | |||
| 12 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
| 13 | Reviewed-by: Eric Blake <eblake@redhat.com> | ||
| 14 | Reviewed-by: Jeff Cody <jcody@redhat.com> | ||
| 15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org | ||
| 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> | ||
| 17 | --- | ||
| 18 | block/gluster.c | 3 +-- | ||
| 19 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/block/gluster.c b/block/gluster.c | ||
| 22 | index XXXXXXX..XXXXXXX 100644 | ||
| 23 | --- a/block/gluster.c | ||
| 24 | +++ b/block/gluster.c | ||
| 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, | ||
| 26 | Error *local_err = NULL; | ||
| 27 | char *str = NULL; | ||
| 28 | const char *ptr; | ||
| 29 | - size_t num_servers; | ||
| 30 | - int i, type; | ||
| 31 | + int i, type, num_servers; | ||
| 32 | |||
| 33 | /* create opts info from runtime_json_opts list */ | ||
| 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); | ||
| 35 | -- | ||
| 36 | 2.9.3 | ||
| 37 | |||
| 38 | diff view generated by jsdifflib |