| 1 | The following changes since commit 8f2d7c341184a95d05476ea3c45dbae2b9ddbe51: | 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-02-27-1' into staging (2017-02-27 15:33:21 +0000) | 3 | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100) |
| 4 | 4 | ||
| 5 | are available in the git repository at: | 5 | are available in the git repository at: |
| 6 | 6 | ||
| 7 | https://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 51654aa52a94612edfaf76dcb51c0a0b7821c90d: | 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: |
| 10 | 10 | ||
| 11 | iscsi: add missing colons to the qapi docs (2017-02-27 23:33:41 -0500) | 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Block patches for 2.9 | 14 | Gluster patch |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Jeff Cody (1): | 17 | Peter Maydell (1): |
| 18 | iscsi: add missing colons to the qapi docs | 18 | block/gluster.c: Handle qdict_array_entries() failure |
| 19 | 19 | ||
| 20 | John Snow (1): | 20 | block/gluster.c | 3 +-- |
| 21 | block/mirror: fix broken sparseness detection | 21 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 22 | |||
| 23 | block/mirror.c | 2 +- | ||
| 24 | qapi/block-core.json | 18 +++++++++--------- | ||
| 25 | 2 files changed, 10 insertions(+), 10 deletions(-) | ||
| 26 | 22 | ||
| 27 | -- | 23 | -- |
| 28 | 2.9.3 | 24 | 2.9.3 |
| 29 | 25 | ||
| 30 | 26 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: John Snow <jsnow@redhat.com> | ||
| 2 | 1 | ||
| 3 | int64_t is in all likelihood the actual scalar type we want. | ||
| 4 | Yep, really. | ||
| 5 | |||
| 6 | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1219541 | ||
| 7 | |||
| 8 | Signed-off-by: John Snow <jsnow@redhat.com> | ||
| 9 | Reviewed-by: Jeff Cody <jcody@redhat.com> | ||
| 10 | Signed-off-by: Jeff Cody <jcody@redhat.com> | ||
| 11 | --- | ||
| 12 | block/mirror.c | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/block/mirror.c b/block/mirror.c | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | ||
| 17 | --- a/block/mirror.c | ||
| 18 | +++ b/block/mirror.c | ||
| 19 | @@ -XXX,XX +XXX,XX @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) | ||
| 20 | nb_chunks * sectors_per_chunk); | ||
| 21 | bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks); | ||
| 22 | while (nb_chunks > 0 && sector_num < end) { | ||
| 23 | - int ret; | ||
| 24 | + int64_t ret; | ||
| 25 | int io_sectors, io_sectors_acct; | ||
| 26 | BlockDriverState *file; | ||
| 27 | enum MirrorMethod { | ||
| 28 | -- | ||
| 29 | 2.9.3 | ||
| 30 | |||
| 31 | diff view generated by jsdifflib |
| 1 | The missing colons make the iscsi part of the documentation not render | 1 | From: Peter Maydell <peter.maydell@linaro.org> |
|---|---|---|---|
| 2 | quite as nicely, so add those in. | ||
| 3 | 2 | ||
| 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 | ||
| 4 | Signed-off-by: Jeff Cody <jcody@redhat.com> | 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> |
| 5 | --- | 17 | --- |
| 6 | qapi/block-core.json | 18 +++++++++--------- | 18 | block/gluster.c | 3 +-- |
| 7 | 1 file changed, 9 insertions(+), 9 deletions(-) | 19 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 8 | 20 | ||
| 9 | diff --git a/qapi/block-core.json b/qapi/block-core.json | 21 | diff --git a/block/gluster.c b/block/gluster.c |
| 10 | index XXXXXXX..XXXXXXX 100644 | 22 | index XXXXXXX..XXXXXXX 100644 |
| 11 | --- a/qapi/block-core.json | 23 | --- a/block/gluster.c |
| 12 | +++ b/qapi/block-core.json | 24 | +++ b/block/gluster.c |
| 13 | @@ -XXX,XX +XXX,XX @@ | 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, |
| 14 | ## | 26 | Error *local_err = NULL; |
| 15 | # @BlockdevOptionsIscsi: | 27 | char *str = NULL; |
| 16 | # | 28 | const char *ptr; |
| 17 | -# @transport The iscsi transport type | 29 | - size_t num_servers; |
| 18 | +# @transport: The iscsi transport type | 30 | - int i, type; |
| 19 | # | 31 | + int i, type, num_servers; |
| 20 | -# @portal The address of the iscsi portal | 32 | |
| 21 | +# @portal: The address of the iscsi portal | 33 | /* create opts info from runtime_json_opts list */ |
| 22 | # | 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); |
| 23 | -# @target The target iqn name | ||
| 24 | +# @target: The target iqn name | ||
| 25 | # | ||
| 26 | -# @lun #optional LUN to connect to. Defaults to 0. | ||
| 27 | +# @lun: #optional LUN to connect to. Defaults to 0. | ||
| 28 | # | ||
| 29 | -# @user #optional User name to log in with. If omitted, no CHAP | ||
| 30 | +# @user: #optional User name to log in with. If omitted, no CHAP | ||
| 31 | # authentication is performed. | ||
| 32 | # | ||
| 33 | -# @password-secret #optional The ID of a QCryptoSecret object providing | ||
| 34 | +# @password-secret: #optional The ID of a QCryptoSecret object providing | ||
| 35 | # the password for the login. This option is required if | ||
| 36 | # @user is specified. | ||
| 37 | # | ||
| 38 | -# @initiator-name #optional The iqn name we want to identify to the target | ||
| 39 | +# @initiator-name: #optional The iqn name we want to identify to the target | ||
| 40 | # as. If this option is not specified, an initiator name is | ||
| 41 | # generated automatically. | ||
| 42 | # | ||
| 43 | -# @header-digest #optional The desired header digest. Defaults to | ||
| 44 | +# @header-digest: #optional The desired header digest. Defaults to | ||
| 45 | # none-crc32c. | ||
| 46 | # | ||
| 47 | -# @timeout #optional Timeout in seconds after which a request will | ||
| 48 | +# @timeout: #optional Timeout in seconds after which a request will | ||
| 49 | # timeout. 0 means no timeout and is the default. | ||
| 50 | # | ||
| 51 | # Driver specific block device options for iscsi | ||
| 52 | -- | 35 | -- |
| 53 | 2.9.3 | 36 | 2.9.3 |
| 54 | 37 | ||
| 55 | 38 | diff view generated by jsdifflib |