| 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit dc65a5bdc9fa543690a775b50d4ffbeb22c56d6d: |
|---|---|---|---|
| 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/dgibson/tags/ppc-for-5.0-20200108' into staging (2020-01-10 16:15:04 +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 | https://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 2558cb8dd4150512bc8ae6d505cdcd10d0cc46bb: |
| 10 | 10 | ||
| 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | linux-aio: increasing MAX_EVENTS to a larger hardcoded value (2020-01-13 16:41:45 +0000) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Gluster patch | 14 | Pull request |
| 15 | |||
| 15 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
| 16 | 17 | ||
| 17 | Peter Maydell (1): | 18 | Wangyong (1): |
| 18 | block/gluster.c: Handle qdict_array_entries() failure | 19 | linux-aio: increasing MAX_EVENTS to a larger hardcoded value |
| 19 | 20 | ||
| 20 | block/gluster.c | 3 +-- | 21 | block/linux-aio.c | 2 +- |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 22 | 23 | ||
| 23 | -- | 24 | -- |
| 24 | 2.9.3 | 25 | 2.24.1 |
| 25 | 26 | ||
| 26 | 27 | diff view generated by jsdifflib |
| 1 | From: Peter Maydell <peter.maydell@linaro.org> | 1 | From: Wangyong <wang.yongD@h3c.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() | 3 | Since commit 6040aedddb5f474a9c2304b6a432a652d82b3d3c "virtio-blk: |
| 4 | could return a negative error code, which we were ignoring | 4 | make queue size configurable",if the user set the queue size to |
| 5 | because we assigned the result to an unsigned variable. | 5 | more than 128 ,it will not take effect. That's because linux aio's |
| 6 | Fix this by using the 'int' type instead, which matches the | 6 | maximum outstanding requests at a time is always less than or equal |
| 7 | return type of qdict_array_entries() and also the type | 7 | to 128. |
| 8 | we use for the loop enumeration variable 'i'. | ||
| 9 | 8 | ||
| 10 | (Spotted by Coverity, CID 1360960.) | 9 | This patch simply increase MAX_EVENTS to a larger hardcoded value of |
| 10 | 1024 as a shortterm fix. | ||
| 11 | 11 | ||
| 12 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | 12 | Signed-off-by: wangyong <wang.yongD@h3c.com> |
| 13 | Reviewed-by: Eric Blake <eblake@redhat.com> | 13 | Message-id: faa5781afd354a96a0be152b288f636f@h3c.com |
| 14 | Reviewed-by: Jeff Cody <jcody@redhat.com> | 14 | Message-Id: <faa5781afd354a96a0be152b288f636f@h3c.com> |
| 15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org | 15 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> | ||
| 17 | --- | 16 | --- |
| 18 | block/gluster.c | 3 +-- | 17 | block/linux-aio.c | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 2 deletions(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | 19 | ||
| 21 | diff --git a/block/gluster.c b/block/gluster.c | 20 | diff --git a/block/linux-aio.c b/block/linux-aio.c |
| 22 | index XXXXXXX..XXXXXXX 100644 | 21 | index XXXXXXX..XXXXXXX 100644 |
| 23 | --- a/block/gluster.c | 22 | --- a/block/linux-aio.c |
| 24 | +++ b/block/gluster.c | 23 | +++ b/block/linux-aio.c |
| 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, | 24 | @@ -XXX,XX +XXX,XX @@ |
| 26 | Error *local_err = NULL; | 25 | * than this we will get EAGAIN from io_submit which is communicated to |
| 27 | char *str = NULL; | 26 | * the guest as an I/O error. |
| 28 | const char *ptr; | 27 | */ |
| 29 | - size_t num_servers; | 28 | -#define MAX_EVENTS 128 |
| 30 | - int i, type; | 29 | +#define MAX_EVENTS 1024 |
| 31 | + int i, type, num_servers; | 30 | |
| 32 | 31 | struct qemu_laiocb { | |
| 33 | /* create opts info from runtime_json_opts list */ | 32 | Coroutine *co; |
| 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); | ||
| 35 | -- | 33 | -- |
| 36 | 2.9.3 | 34 | 2.24.1 |
| 37 | 35 | ||
| 38 | 36 | diff view generated by jsdifflib |