[PULL 0/2] Block patches
[PULL v2 00/34] Block patches
1
The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
1
The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:
2
2
3
Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
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
https://gitlab.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 1cc7eada97914f090125e588497986f6f7900514:
9
for you to fetch changes up to a5d3cfa2dc775e5d99f013703b8508f1d989d588:
10
10
11
iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
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
- qcow2 subclusters (extended L2 entries)
15
16
16
----------------------------------------------------------------
17
----------------------------------------------------------------
18
v2:
19
- Fixed the shebang line in iotest 271
17
20
18
Stefano Garzarella (2):
21
----------------------------------------------------------------
19
iothread: rename PollParamInfo to IOThreadParamInfo
22
Alberto Garcia (34):
20
iothread: use IOThreadParamInfo in iothread_[set|get]_param()
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
21
58
22
iothread.c | 28 +++++++++++++++-------------
59
docs/interop/qcow2.txt | 68 ++-
23
1 file changed, 15 insertions(+), 13 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
24
96
25
--
97
--
26
2.31.1
98
2.26.2
27
99
28
100
29
diff view generated by jsdifflib
[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
Deleted patch
1
From: Stefano Garzarella <sgarzare@redhat.com>
2
1
3
Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
4
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
5
structure to handle it.
6
7
Since it is not a parameter of the polling mechanism, we rename the
8
structure to a more generic IOThreadParamInfo.
9
10
Suggested-by: Kevin Wolf <kwolf@redhat.com>
11
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
12
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
13
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
14
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
15
---
16
iothread.c | 14 +++++++-------
17
1 file changed, 7 insertions(+), 7 deletions(-)
18
19
diff --git a/iothread.c b/iothread.c
20
index XXXXXXX..XXXXXXX 100644
21
--- a/iothread.c
22
+++ b/iothread.c
23
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
24
typedef struct {
25
const char *name;
26
ptrdiff_t offset; /* field's byte offset in IOThread struct */
27
-} PollParamInfo;
28
+} IOThreadParamInfo;
29
30
-static PollParamInfo poll_max_ns_info = {
31
+static IOThreadParamInfo poll_max_ns_info = {
32
"poll-max-ns", offsetof(IOThread, poll_max_ns),
33
};
34
-static PollParamInfo poll_grow_info = {
35
+static IOThreadParamInfo poll_grow_info = {
36
"poll-grow", offsetof(IOThread, poll_grow),
37
};
38
-static PollParamInfo poll_shrink_info = {
39
+static IOThreadParamInfo poll_shrink_info = {
40
"poll-shrink", offsetof(IOThread, poll_shrink),
41
};
42
-static PollParamInfo aio_max_batch_info = {
43
+static IOThreadParamInfo aio_max_batch_info = {
44
"aio-max-batch", offsetof(IOThread, aio_max_batch),
45
};
46
47
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
48
const char *name, void *opaque, Error **errp)
49
{
50
IOThread *iothread = IOTHREAD(obj);
51
- PollParamInfo *info = opaque;
52
+ IOThreadParamInfo *info = opaque;
53
int64_t *field = (void *)iothread + info->offset;
54
55
visit_type_int64(v, name, field, errp);
56
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
57
const char *name, void *opaque, Error **errp)
58
{
59
IOThread *iothread = IOTHREAD(obj);
60
- PollParamInfo *info = opaque;
61
+ IOThreadParamInfo *info = opaque;
62
int64_t *field = (void *)iothread + info->offset;
63
int64_t value;
64
65
--
66
2.31.1
67
68
diff view generated by jsdifflib
[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
Deleted patch
1
From: Stefano Garzarella <sgarzare@redhat.com>
2
1
3
Commit 0445409d74 ("iothread: generalize
4
iothread_set_param/iothread_get_param") moved common code to set and
5
get IOThread parameters in two new functions.
6
7
These functions are called inside callbacks, so we don't need to use an
8
opaque pointer. Let's replace `void *opaque` parameter with
9
`IOThreadParamInfo *info`.
10
11
Suggested-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
13
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
14
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
16
---
17
iothread.c | 18 ++++++++++--------
18
1 file changed, 10 insertions(+), 8 deletions(-)
19
20
diff --git a/iothread.c b/iothread.c
21
index XXXXXXX..XXXXXXX 100644
22
--- a/iothread.c
23
+++ b/iothread.c
24
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
25
};
26
27
static void iothread_get_param(Object *obj, Visitor *v,
28
- const char *name, void *opaque, Error **errp)
29
+ const char *name, IOThreadParamInfo *info, Error **errp)
30
{
31
IOThread *iothread = IOTHREAD(obj);
32
- IOThreadParamInfo *info = opaque;
33
int64_t *field = (void *)iothread + info->offset;
34
35
visit_type_int64(v, name, field, errp);
36
}
37
38
static bool iothread_set_param(Object *obj, Visitor *v,
39
- const char *name, void *opaque, Error **errp)
40
+ const char *name, IOThreadParamInfo *info, Error **errp)
41
{
42
IOThread *iothread = IOTHREAD(obj);
43
- IOThreadParamInfo *info = opaque;
44
int64_t *field = (void *)iothread + info->offset;
45
int64_t value;
46
47
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
48
static void iothread_get_poll_param(Object *obj, Visitor *v,
49
const char *name, void *opaque, Error **errp)
50
{
51
+ IOThreadParamInfo *info = opaque;
52
53
- iothread_get_param(obj, v, name, opaque, errp);
54
+ iothread_get_param(obj, v, name, info, errp);
55
}
56
57
static void iothread_set_poll_param(Object *obj, Visitor *v,
58
const char *name, void *opaque, Error **errp)
59
{
60
IOThread *iothread = IOTHREAD(obj);
61
+ IOThreadParamInfo *info = opaque;
62
63
- if (!iothread_set_param(obj, v, name, opaque, errp)) {
64
+ if (!iothread_set_param(obj, v, name, info, errp)) {
65
return;
66
}
67
68
@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
69
static void iothread_get_aio_param(Object *obj, Visitor *v,
70
const char *name, void *opaque, Error **errp)
71
{
72
+ IOThreadParamInfo *info = opaque;
73
74
- iothread_get_param(obj, v, name, opaque, errp);
75
+ iothread_get_param(obj, v, name, info, errp);
76
}
77
78
static void iothread_set_aio_param(Object *obj, Visitor *v,
79
const char *name, void *opaque, Error **errp)
80
{
81
IOThread *iothread = IOTHREAD(obj);
82
+ IOThreadParamInfo *info = opaque;
83
84
- if (!iothread_set_param(obj, v, name, opaque, errp)) {
85
+ if (!iothread_set_param(obj, v, name, info, errp)) {
86
return;
87
}
88
89
--
90
2.31.1
91
92
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.