[Qemu-devel] [PULL 0/2] Block patches
[PULL v2 00/34] Block patches
1
The following changes since commit bb9bf94b3e8926553290bc9a7cb84315af422086:
1
The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:
2
2
3
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-12-11 19:18:58 +0000)
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/stefanha/qemu.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 e61809ed8ac3a2f68eb1cc231244f84eb06adacf:
9
for you to fetch changes up to a5d3cfa2dc775e5d99f013703b8508f1d989d588:
10
10
11
virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is initially -1 (2018-12-12 09:16:55 +0000)
11
iotests: Add tests for qcow2 images with extended L2 entries (2020-08-26 08:49:51 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Block patches:
15
15
- qcow2 subclusters (extended L2 entries)
16
Minor virtio-blk fixes.
17
16
18
----------------------------------------------------------------
17
----------------------------------------------------------------
18
v2:
19
- Fixed the shebang line in iotest 271
19
20
20
Dongli Zhang (2):
21
----------------------------------------------------------------
21
virtio-blk: rename iov to out_iov in virtio_blk_handle_request()
22
Alberto Garcia (34):
22
virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is
23
qcow2: Make Qcow2AioTask store the full host offset
23
initially -1
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
24
58
25
hw/block/virtio-blk.c | 10 +++++-----
59
docs/interop/qcow2.txt | 68 ++-
26
1 file changed, 5 insertions(+), 5 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
27
96
28
--
97
--
29
2.19.2
98
2.26.2
30
99
31
100
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] virtio-blk: rename iov to out_iov in virtio_blk_handle_request()
Deleted patch
1
From: Dongli Zhang <dongli.zhang@oracle.com>
2
1
3
In virtio_blk_handle_request(), in_iov is used for input header while iov
4
is used for output header. Rename iov to out_iov to pair output header's
5
name with in_iov to avoid confusing people when reading source code.
6
7
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
8
Message-id: 1541520556-8334-1-git-send-email-dongli.zhang@oracle.com
9
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
10
---
11
hw/block/virtio-blk.c | 8 ++++----
12
1 file changed, 4 insertions(+), 4 deletions(-)
13
14
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/hw/block/virtio-blk.c
17
+++ b/hw/block/virtio-blk.c
18
@@ -XXX,XX +XXX,XX @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
19
{
20
uint32_t type;
21
struct iovec *in_iov = req->elem.in_sg;
22
- struct iovec *iov = req->elem.out_sg;
23
+ struct iovec *out_iov = req->elem.out_sg;
24
unsigned in_num = req->elem.in_num;
25
unsigned out_num = req->elem.out_num;
26
VirtIOBlock *s = req->dev;
27
@@ -XXX,XX +XXX,XX @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
28
return -1;
29
}
30
31
- if (unlikely(iov_to_buf(iov, out_num, 0, &req->out,
32
+ if (unlikely(iov_to_buf(out_iov, out_num, 0, &req->out,
33
sizeof(req->out)) != sizeof(req->out))) {
34
virtio_error(vdev, "virtio-blk request outhdr too short");
35
return -1;
36
}
37
38
- iov_discard_front(&iov, &out_num, sizeof(req->out));
39
+ iov_discard_front(&out_iov, &out_num, sizeof(req->out));
40
41
if (in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) {
42
virtio_error(vdev, "virtio-blk request inhdr too short");
43
@@ -XXX,XX +XXX,XX @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
44
&req->out.sector);
45
46
if (is_write) {
47
- qemu_iovec_init_external(&req->qiov, iov, out_num);
48
+ qemu_iovec_init_external(&req->qiov, out_iov, out_num);
49
trace_virtio_blk_handle_write(vdev, req, req->sector_num,
50
req->qiov.size / BDRV_SECTOR_SIZE);
51
} else {
52
--
53
2.19.2
54
55
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/2] virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is initially -1
Deleted patch
1
From: Dongli Zhang <dongli.zhang@oracle.com>
2
1
3
The initial value of nalloc is -1, but not 1.
4
5
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
6
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
7
Message-id: 1541479952-32355-1-git-send-email-dongli.zhang@oracle.com
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
---
10
hw/block/virtio-blk.c | 2 +-
11
1 file changed, 1 insertion(+), 1 deletion(-)
12
13
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
14
index XXXXXXX..XXXXXXX 100644
15
--- a/hw/block/virtio-blk.c
16
+++ b/hw/block/virtio-blk.c
17
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_rw_complete(void *opaque, int ret)
18
trace_virtio_blk_rw_complete(vdev, req, ret);
19
20
if (req->qiov.nalloc != -1) {
21
- /* If nalloc is != 1 req->qiov is a local copy of the original
22
+ /* If nalloc is != -1 req->qiov is a local copy of the original
23
* external iovec. It was allocated in submit_requests to be
24
* able to merge requests. */
25
qemu_iovec_destroy(&req->qiov);
26
--
27
2.19.2
28
29
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.