| 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit 2ab09bf2f9f55b9fb8d2de6eb2ba2a8570e268e2: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100) | 3 | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180612-pull-request' into staging (2018-06-12 15:34:34 +0100) |
| 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/codyprime/qemu-kvm-jtc.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: | 9 | for you to fetch changes up to b61acdecbf19c3c5a327baec1e8e4c06d0da68b7: |
| 10 | 10 | ||
| 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | block: Ignore generated job QAPI files (2018-06-13 10:51:49 -0400) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Gluster patch | 14 | Block patch for .gitignore |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Peter Maydell (1): | 17 | Eric Blake (1): |
| 18 | block/gluster.c: Handle qdict_array_entries() failure | 18 | block: Ignore generated job QAPI files |
| 19 | 19 | ||
| 20 | block/gluster.c | 3 +-- | 20 | .gitignore | 4 ++++ |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 21 | 1 file changed, 4 insertions(+) |
| 22 | 22 | ||
| 23 | -- | 23 | -- |
| 24 | 2.9.3 | 24 | 2.13.6 |
| 25 | 25 | ||
| 26 | 26 | diff view generated by jsdifflib |
| 1 | From: Peter Maydell <peter.maydell@linaro.org> | 1 | From: Eric Blake <eblake@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() | 3 | Commit bf42508f introduced new generated files; make sure they |
| 4 | could return a negative error code, which we were ignoring | 4 | don't get accidentally committed from an in-tree build. |
| 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 | 5 | ||
| 10 | (Spotted by Coverity, CID 1360960.) | 6 | Signed-off-by: Eric Blake <eblake@redhat.com> |
| 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> | 7 | Reviewed-by: Jeff Cody <jcody@redhat.com> |
| 15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org | 8 | Reviewed-by: Max Reitz <mreitz@redhat.com> |
| 9 | Message-id: 20180531212435.165261-1-eblake@redhat.com | ||
| 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> | 10 | Signed-off-by: Jeff Cody <jcody@redhat.com> |
| 17 | --- | 11 | --- |
| 18 | block/gluster.c | 3 +-- | 12 | .gitignore | 4 ++++ |
| 19 | 1 file changed, 1 insertion(+), 2 deletions(-) | 13 | 1 file changed, 4 insertions(+) |
| 20 | 14 | ||
| 21 | diff --git a/block/gluster.c b/block/gluster.c | 15 | diff --git a/.gitignore b/.gitignore |
| 22 | index XXXXXXX..XXXXXXX 100644 | 16 | index XXXXXXX..XXXXXXX 100644 |
| 23 | --- a/block/gluster.c | 17 | --- a/.gitignore |
| 24 | +++ b/block/gluster.c | 18 | +++ b/.gitignore |
| 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, | 19 | @@ -XXX,XX +XXX,XX @@ |
| 26 | Error *local_err = NULL; | 20 | /qapi/qapi-commands-common.[ch] |
| 27 | char *str = NULL; | 21 | /qapi/qapi-commands-crypto.[ch] |
| 28 | const char *ptr; | 22 | /qapi/qapi-commands-introspect.[ch] |
| 29 | - size_t num_servers; | 23 | +/qapi/qapi-commands-job.[ch] |
| 30 | - int i, type; | 24 | /qapi/qapi-commands-migration.[ch] |
| 31 | + int i, type, num_servers; | 25 | /qapi/qapi-commands-misc.[ch] |
| 32 | 26 | /qapi/qapi-commands-net.[ch] | |
| 33 | /* create opts info from runtime_json_opts list */ | 27 | @@ -XXX,XX +XXX,XX @@ |
| 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); | 28 | /qapi/qapi-events-common.[ch] |
| 29 | /qapi/qapi-events-crypto.[ch] | ||
| 30 | /qapi/qapi-events-introspect.[ch] | ||
| 31 | +/qapi/qapi-events-job.[ch] | ||
| 32 | /qapi/qapi-events-migration.[ch] | ||
| 33 | /qapi/qapi-events-misc.[ch] | ||
| 34 | /qapi/qapi-events-net.[ch] | ||
| 35 | @@ -XXX,XX +XXX,XX @@ | ||
| 36 | /qapi/qapi-types-common.[ch] | ||
| 37 | /qapi/qapi-types-crypto.[ch] | ||
| 38 | /qapi/qapi-types-introspect.[ch] | ||
| 39 | +/qapi/qapi-types-job.[ch] | ||
| 40 | /qapi/qapi-types-migration.[ch] | ||
| 41 | /qapi/qapi-types-misc.[ch] | ||
| 42 | /qapi/qapi-types-net.[ch] | ||
| 43 | @@ -XXX,XX +XXX,XX @@ | ||
| 44 | /qapi/qapi-visit-common.[ch] | ||
| 45 | /qapi/qapi-visit-crypto.[ch] | ||
| 46 | /qapi/qapi-visit-introspect.[ch] | ||
| 47 | +/qapi/qapi-visit-job.[ch] | ||
| 48 | /qapi/qapi-visit-migration.[ch] | ||
| 49 | /qapi/qapi-visit-misc.[ch] | ||
| 50 | /qapi/qapi-visit-net.[ch] | ||
| 35 | -- | 51 | -- |
| 36 | 2.9.3 | 52 | 2.13.6 |
| 37 | 53 | ||
| 38 | 54 | diff view generated by jsdifflib |