| 1 | The following changes since commit eb06c9e2d3c8f026a206e8402b0ffa201060ec8e: | 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-03-27 17:34:50 +0100) | 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 | git://github.com/stefanha/qemu.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 dc62da88b5d17477227a3563a6ad466129d416d6: | 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: |
| 10 | 10 | ||
| 11 | parallels: wrong call to bdrv_truncate (2017-03-28 11:06:00 +0100) | 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | 14 | Gluster patch | |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Denis V. Lunev (1): | 17 | Peter Maydell (1): |
| 18 | parallels: wrong call to bdrv_truncate | 18 | block/gluster.c: Handle qdict_array_entries() failure |
| 19 | 19 | ||
| 20 | block/parallels.c | 3 ++- | 20 | block/gluster.c | 3 +-- |
| 21 | 1 file changed, 2 insertions(+), 1 deletion(-) | 21 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 22 | 22 | ||
| 23 | -- | 23 | -- |
| 24 | 2.9.3 | 24 | 2.9.3 |
| 25 | 25 | ||
| 26 | 26 | diff view generated by jsdifflib |
| 1 | From: "Denis V. Lunev" <den@openvz.org> | 1 | From: Peter Maydell <peter.maydell@linaro.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Parallels driver should not call bdrv_truncate if the image was opened | 3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() |
| 4 | in the read-only mode. Without the patch | 4 | could return a negative error code, which we were ignoring |
| 5 | qemu-img check harddisk.hds | 5 | because we assigned the result to an unsigned variable. |
| 6 | asserts with | 6 | Fix this by using the 'int' type instead, which matches the |
| 7 | bdrv_truncate: Assertion `child->perm & BLK_PERM_RESIZE' failed. | 7 | return type of qdict_array_entries() and also the type |
| 8 | we use for the loop enumeration variable 'i'. | ||
| 8 | 9 | ||
| 9 | Parameters used on the write path are not needed if the image is opened | 10 | (Spotted by Coverity, CID 1360960.) |
| 10 | in the read-only mode. | ||
| 11 | 11 | ||
| 12 | Signed-off-by: Denis V. Lunev <den@openvz.org> | 12 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> |
| 13 | Reported-by: Edgar Kaziahmedov <edos@virtuozzo.mipt.ru> | 13 | Reviewed-by: Eric Blake <eblake@redhat.com> |
| 14 | Message-id: 1490625488-7980-1-git-send-email-den@openvz.org | 14 | Reviewed-by: Jeff Cody <jcody@redhat.com> |
| 15 | CC: Stefan Hajnoczi <stefanha@redhat.com> | 15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org |
| 16 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> |
| 17 | --- | 17 | --- |
| 18 | block/parallels.c | 3 ++- | 18 | block/gluster.c | 3 +-- |
| 19 | 1 file changed, 2 insertions(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 20 | 20 | ||
| 21 | diff --git a/block/parallels.c b/block/parallels.c | 21 | diff --git a/block/gluster.c b/block/gluster.c |
| 22 | index XXXXXXX..XXXXXXX 100644 | 22 | index XXXXXXX..XXXXXXX 100644 |
| 23 | --- a/block/parallels.c | 23 | --- a/block/gluster.c |
| 24 | +++ b/block/parallels.c | 24 | +++ b/block/gluster.c |
| 25 | @@ -XXX,XX +XXX,XX @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, | 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, |
| 26 | if (local_err != NULL) { | 26 | Error *local_err = NULL; |
| 27 | goto fail_options; | 27 | char *str = NULL; |
| 28 | } | 28 | const char *ptr; |
| 29 | - if (!bdrv_has_zero_init(bs->file->bs) || | 29 | - size_t num_servers; |
| 30 | + | 30 | - int i, type; |
| 31 | + if (!(flags & BDRV_O_RESIZE) || !bdrv_has_zero_init(bs->file->bs) || | 31 | + int i, type, num_servers; |
| 32 | bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs)) != 0) { | 32 | |
| 33 | s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE; | 33 | /* create opts info from runtime_json_opts list */ |
| 34 | } | 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); |
| 35 | -- | 35 | -- |
| 36 | 2.9.3 | 36 | 2.9.3 |
| 37 | 37 | ||
| 38 | 38 | diff view generated by jsdifflib |