| 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1: |
|---|---|---|---|
| 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/cschoenebeck/tags/pull-9p-20200812' into staging (2020-08-24 16:39:53 +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 | https://github.com/XanClic/qemu.git tags/pull-block-2020-08-26 |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: | 9 | for you to fetch changes up to a5d3cfa2dc775e5d99f013703b8508f1d989d588: |
| 10 | 10 | ||
| 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | iotests: Add tests for qcow2 images with extended L2 entries (2020-08-26 08:49:51 +0200) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Gluster patch | 14 | Block patches: |
| 15 | - qcow2 subclusters (extended L2 entries) | ||
| 16 | |||
| 15 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
| 18 | v2: | ||
| 19 | - Fixed the shebang line in iotest 271 | ||
| 16 | 20 | ||
| 17 | Peter Maydell (1): | 21 | ---------------------------------------------------------------- |
| 18 | block/gluster.c: Handle qdict_array_entries() failure | 22 | Alberto Garcia (34): |
| 23 | qcow2: Make Qcow2AioTask store the full host offset | ||
| 24 | qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset() | ||
| 25 | qcow2: Add calculate_l2_meta() | ||
| 26 | qcow2: Split cluster_needs_cow() out of count_cow_clusters() | ||
| 27 | qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() | ||
| 28 | qcow2: Add get_l2_entry() and set_l2_entry() | ||
| 29 | qcow2: Document the Extended L2 Entries feature | ||
| 30 | qcow2: Add dummy has_subclusters() function | ||
| 31 | qcow2: Add subcluster-related fields to BDRVQcow2State | ||
| 32 | qcow2: Add offset_to_sc_index() | ||
| 33 | qcow2: Add offset_into_subcluster() and size_to_subclusters() | ||
| 34 | qcow2: Add l2_entry_size() | ||
| 35 | qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() | ||
| 36 | qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type() | ||
| 37 | qcow2: Add qcow2_get_subcluster_range_type() | ||
| 38 | qcow2: Add qcow2_cluster_is_allocated() | ||
| 39 | qcow2: Add cluster type parameter to qcow2_get_host_offset() | ||
| 40 | qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_* | ||
| 41 | qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC | ||
| 42 | qcow2: Add subcluster support to calculate_l2_meta() | ||
| 43 | qcow2: Add subcluster support to qcow2_get_host_offset() | ||
| 44 | qcow2: Add subcluster support to zero_in_l2_slice() | ||
| 45 | qcow2: Add subcluster support to discard_in_l2_slice() | ||
| 46 | qcow2: Add subcluster support to check_refcounts_l2() | ||
| 47 | qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() | ||
| 48 | qcow2: Clear the L2 bitmap when allocating a compressed cluster | ||
| 49 | qcow2: Add subcluster support to handle_alloc_space() | ||
| 50 | qcow2: Add subcluster support to qcow2_co_pwrite_zeroes() | ||
| 51 | qcow2: Add subcluster support to qcow2_measure() | ||
| 52 | qcow2: Add prealloc field to QCowL2Meta | ||
| 53 | qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit | ||
| 54 | qcow2: Allow preallocation and backing files if extended_l2 is set | ||
| 55 | qcow2: Assert that expand_zero_clusters_in_l1() does not support | ||
| 56 | subclusters | ||
| 57 | iotests: Add tests for qcow2 images with extended L2 entries | ||
| 19 | 58 | ||
| 20 | block/gluster.c | 3 +-- | 59 | docs/interop/qcow2.txt | 68 ++- |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 60 | docs/qcow2-cache.txt | 19 +- |
| 61 | qapi/block-core.json | 7 + | ||
| 62 | block/qcow2.h | 211 ++++++- | ||
| 63 | include/block/block_int.h | 1 + | ||
| 64 | block/qcow2-cluster.c | 906 +++++++++++++++++++++---------- | ||
| 65 | block/qcow2-refcount.c | 47 +- | ||
| 66 | block/qcow2.c | 302 +++++++---- | ||
| 67 | block/trace-events | 2 +- | ||
| 68 | tests/qemu-iotests/031.out | 8 +- | ||
| 69 | tests/qemu-iotests/036.out | 4 +- | ||
| 70 | tests/qemu-iotests/049.out | 102 ++-- | ||
| 71 | tests/qemu-iotests/060.out | 3 +- | ||
| 72 | tests/qemu-iotests/061 | 6 + | ||
| 73 | tests/qemu-iotests/061.out | 25 +- | ||
| 74 | tests/qemu-iotests/065 | 12 +- | ||
| 75 | tests/qemu-iotests/082.out | 39 +- | ||
| 76 | tests/qemu-iotests/085.out | 38 +- | ||
| 77 | tests/qemu-iotests/144.out | 4 +- | ||
| 78 | tests/qemu-iotests/182.out | 2 +- | ||
| 79 | tests/qemu-iotests/185.out | 8 +- | ||
| 80 | tests/qemu-iotests/198 | 2 + | ||
| 81 | tests/qemu-iotests/206.out | 6 +- | ||
| 82 | tests/qemu-iotests/242.out | 5 + | ||
| 83 | tests/qemu-iotests/255.out | 8 +- | ||
| 84 | tests/qemu-iotests/271 | 901 ++++++++++++++++++++++++++++++ | ||
| 85 | tests/qemu-iotests/271.out | 726 +++++++++++++++++++++++++ | ||
| 86 | tests/qemu-iotests/274.out | 49 +- | ||
| 87 | tests/qemu-iotests/280.out | 2 +- | ||
| 88 | tests/qemu-iotests/291.out | 2 + | ||
| 89 | tests/qemu-iotests/302.out | 1 + | ||
| 90 | tests/qemu-iotests/303.out | 4 +- | ||
| 91 | tests/qemu-iotests/common.filter | 1 + | ||
| 92 | tests/qemu-iotests/group | 1 + | ||
| 93 | 34 files changed, 2952 insertions(+), 570 deletions(-) | ||
| 94 | create mode 100755 tests/qemu-iotests/271 | ||
| 95 | create mode 100644 tests/qemu-iotests/271.out | ||
| 22 | 96 | ||
| 23 | -- | 97 | -- |
| 24 | 2.9.3 | 98 | 2.26.2 |
| 25 | 99 | ||
| 26 | 100 | 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 |