[PULL 0/2] Block patches
[PULL v2 0/2] Block patches
1
The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
1
The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
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/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +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-06-24
8
8
9
for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
9
for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
10
10
11
iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
11
iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Block patches:
15
- Two iotest fixes
15
16
16
----------------------------------------------------------------
17
----------------------------------------------------------------
18
This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
19
iotest patches, because both caused iotest failures on some test
20
machines.
21
----------------------------------------------------------------
22
Philippe Mathieu-Daudé (1):
23
iotests: Fix 051 output after qdev_init_nofail() removal
17
24
18
Stefano Garzarella (2):
25
Vladimir Sementsov-Ogievskiy (1):
19
iothread: rename PollParamInfo to IOThreadParamInfo
26
iotests: don't test qcow2.py inside 291
20
iothread: use IOThreadParamInfo in iothread_[set|get]_param()
21
27
22
iothread.c | 28 +++++++++++++++-------------
28
tests/qemu-iotests/051.pc.out | 4 ++--
23
1 file changed, 15 insertions(+), 13 deletions(-)
29
tests/qemu-iotests/291 | 4 ----
30
tests/qemu-iotests/291.out | 33 ---------------------------------
31
3 files changed, 2 insertions(+), 39 deletions(-)
24
32
25
--
33
--
26
2.31.1
34
2.26.2
27
35
28
36
29
diff view generated by jsdifflib
[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
[PULL v2 1/2] iotests: Fix 051 output after qdev_init_nofail() removal
1
From: Stefano Garzarella <sgarzare@redhat.com>
1
From: Philippe Mathieu-Daudé <philmd@redhat.com>
2
2
3
Commit 0445409d74 ("iothread: generalize
3
Commit 96927c744 replaced qdev_init_nofail() call by
4
iothread_set_param/iothread_get_param") moved common code to set and
4
isa_realize_and_unref() which has a different error
5
get IOThread parameters in two new functions.
5
message. Update the test output accordingly.
6
6
7
These functions are called inside callbacks, so we don't need to use an
7
Gitlab CI error after merging b77b5b3dc7:
8
opaque pointer. Let's replace `void *opaque` parameter with
8
https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375
9
`IOThreadParamInfo *info`.
10
9
11
Suggested-by: Kevin Wolf <kwolf@redhat.com>
10
Reported-by: Thomas Huth <thuth@redhat.com>
12
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
11
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
13
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
12
Message-Id: <20200616154949.6586-1-philmd@redhat.com>
14
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
13
Reviewed-by: Thomas Huth <thuth@redhat.com>
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
14
Signed-off-by: Max Reitz <mreitz@redhat.com>
16
---
15
---
17
iothread.c | 18 ++++++++++--------
16
tests/qemu-iotests/051.pc.out | 4 ++--
18
1 file changed, 10 insertions(+), 8 deletions(-)
17
1 file changed, 2 insertions(+), 2 deletions(-)
19
18
20
diff --git a/iothread.c b/iothread.c
19
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
21
index XXXXXXX..XXXXXXX 100644
20
index XXXXXXX..XXXXXXX 100644
22
--- a/iothread.c
21
--- a/tests/qemu-iotests/051.pc.out
23
+++ b/iothread.c
22
+++ b/tests/qemu-iotests/051.pc.out
24
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
23
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
25
};
24
26
25
Testing: -drive if=ide
27
static void iothread_get_param(Object *obj, Visitor *v,
26
QEMU X.Y.Z monitor - type 'help' for more information
28
- const char *name, void *opaque, Error **errp)
27
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
29
+ const char *name, IOThreadParamInfo *info, Error **errp)
28
+(qemu) QEMU_PROG: Device needs media, but drive is empty
30
{
29
31
IOThread *iothread = IOTHREAD(obj);
30
Testing: -drive if=virtio
32
- IOThreadParamInfo *info = opaque;
31
QEMU X.Y.Z monitor - type 'help' for more information
33
int64_t *field = (void *)iothread + info->offset;
32
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
34
33
35
visit_type_int64(v, name, field, errp);
34
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
36
}
35
QEMU X.Y.Z monitor - type 'help' for more information
37
36
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
38
static bool iothread_set_param(Object *obj, Visitor *v,
37
+(qemu) QEMU_PROG: Block node is read-only
39
- const char *name, void *opaque, Error **errp)
38
40
+ const char *name, IOThreadParamInfo *info, Error **errp)
39
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
41
{
40
QEMU X.Y.Z monitor - type 'help' for more information
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
--
41
--
90
2.31.1
42
2.26.2
91
43
92
44
diff view generated by jsdifflib
[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
[PULL v2 2/2] iotests: don't test qcow2.py inside 291
1
From: Stefano Garzarella <sgarzare@redhat.com>
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
2
2
3
Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
3
820c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291
4
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
4
with external data file. Actually, 291 is bad place for qcow2.py
5
structure to handle it.
5
testing, better add a separate test.
6
6
7
Since it is not a parameter of the polling mechanism, we rename the
7
For now, drop qcow2.py testing from 291 to fix the regression.
8
structure to a more generic IOThreadParamInfo.
9
8
10
Suggested-by: Kevin Wolf <kwolf@redhat.com>
9
Fixes: 820c6bee534ec3b
11
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
10
Reported-by: Max Reitz <mreitz@redhat.com>
12
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
11
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
13
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
12
Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
14
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Reviewed-by: Eric Blake <eblake@redhat.com>
14
Signed-off-by: Max Reitz <mreitz@redhat.com>
15
---
15
---
16
iothread.c | 14 +++++++-------
16
tests/qemu-iotests/291 | 4 ----
17
1 file changed, 7 insertions(+), 7 deletions(-)
17
tests/qemu-iotests/291.out | 33 ---------------------------------
18
2 files changed, 37 deletions(-)
18
19
19
diff --git a/iothread.c b/iothread.c
20
diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
21
index XXXXXXX..XXXXXXX 100755
22
--- a/tests/qemu-iotests/291
23
+++ b/tests/qemu-iotests/291
24
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
25
$QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1
26
$QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2
27
$QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
28
-echo "Check resulting qcow2 header extensions:"
29
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
30
31
echo
32
echo "=== Bitmap preservation not possible to non-qcow2 ==="
33
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0
34
$QEMU_IMG bitmap --remove --image-opts \
35
driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp
36
_img_info --format-specific
37
-echo "Check resulting qcow2 header extensions:"
38
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
39
40
echo
41
echo "=== Check bitmap contents ==="
42
diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out
20
index XXXXXXX..XXXXXXX 100644
43
index XXXXXXX..XXXXXXX 100644
21
--- a/iothread.c
44
--- a/tests/qemu-iotests/291.out
22
+++ b/iothread.c
45
+++ b/tests/qemu-iotests/291.out
23
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
46
@@ -XXX,XX +XXX,XX @@ wrote 1048576/1048576 bytes at offset 1048576
24
typedef struct {
47
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
25
const char *name;
48
wrote 1048576/1048576 bytes at offset 2097152
26
ptrdiff_t offset; /* field's byte offset in IOThread struct */
49
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
27
-} PollParamInfo;
50
-Check resulting qcow2 header extensions:
28
+} IOThreadParamInfo;
51
-Header extension:
29
52
-magic 0xe2792aca (Backing format)
30
-static PollParamInfo poll_max_ns_info = {
53
-length 5
31
+static IOThreadParamInfo poll_max_ns_info = {
54
-data 'qcow2'
32
"poll-max-ns", offsetof(IOThread, poll_max_ns),
55
-
33
};
56
-Header extension:
34
-static PollParamInfo poll_grow_info = {
57
-magic 0x6803f857 (Feature table)
35
+static IOThreadParamInfo poll_grow_info = {
58
-length 336
36
"poll-grow", offsetof(IOThread, poll_grow),
59
-data <binary>
37
};
60
-
38
-static PollParamInfo poll_shrink_info = {
61
-Header extension:
39
+static IOThreadParamInfo poll_shrink_info = {
62
-magic 0x23852875 (Bitmaps)
40
"poll-shrink", offsetof(IOThread, poll_shrink),
63
-length 24
41
};
64
-nb_bitmaps 2
42
-static PollParamInfo aio_max_batch_info = {
65
-reserved32 0
43
+static IOThreadParamInfo aio_max_batch_info = {
66
-bitmap_directory_size 0x40
44
"aio-max-batch", offsetof(IOThread, aio_max_batch),
67
-bitmap_directory_offset 0x510000
45
};
68
-
46
69
47
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
70
=== Bitmap preservation not possible to non-qcow2 ===
48
const char *name, void *opaque, Error **errp)
71
49
{
72
@@ -XXX,XX +XXX,XX @@ Format specific information:
50
IOThread *iothread = IOTHREAD(obj);
73
granularity: 65536
51
- PollParamInfo *info = opaque;
74
refcount bits: 16
52
+ IOThreadParamInfo *info = opaque;
75
corrupt: false
53
int64_t *field = (void *)iothread + info->offset;
76
-Check resulting qcow2 header extensions:
54
77
-Header extension:
55
visit_type_int64(v, name, field, errp);
78
-magic 0x6803f857 (Feature table)
56
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
79
-length 336
57
const char *name, void *opaque, Error **errp)
80
-data <binary>
58
{
81
-
59
IOThread *iothread = IOTHREAD(obj);
82
-Header extension:
60
- PollParamInfo *info = opaque;
83
-magic 0x23852875 (Bitmaps)
61
+ IOThreadParamInfo *info = opaque;
84
-length 24
62
int64_t *field = (void *)iothread + info->offset;
85
-nb_bitmaps 3
63
int64_t value;
86
-reserved32 0
87
-bitmap_directory_size 0x60
88
-bitmap_directory_offset 0x520000
89
-
90
91
=== Check bitmap contents ===
64
92
65
--
93
--
66
2.31.1
94
2.26.2
67
95
68
96
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.