[Qemu-devel] [PULL for-2.12 0/1] Block patches
[PULL 0/2] Block patches
1
The following changes since commit fd69ad866b62ca8ed4337ffee83b6d82a4e99282:
1
The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
2
2
3
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2018-04-04 14:00:07 +0100)
3
Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
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://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to bfb15b4becf2c9cf484bc3bf893a37c8f3c15cb3:
9
for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
10
10
11
block/rbd: remove processed options from qdict (2018-04-04 12:05:13 -0400)
11
iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Regression fix for 2.12
14
Pull request
15
15
----------------------------------------------------------------
16
----------------------------------------------------------------
16
17
17
Jeff Cody (1):
18
Stefano Garzarella (2):
18
block/rbd: remove processed options from qdict
19
iothread: rename PollParamInfo to IOThreadParamInfo
20
iothread: use IOThreadParamInfo in iothread_[set|get]_param()
19
21
20
block/rbd.c | 7 +++++++
22
iothread.c | 28 +++++++++++++++-------------
21
1 file changed, 7 insertions(+)
23
1 file changed, 15 insertions(+), 13 deletions(-)
22
24
23
--
25
--
24
2.13.6
26
2.31.1
25
27
26
28
29
diff view generated by jsdifflib
New patch
[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
1
From: Stefano Garzarella <sgarzare@redhat.com>
1
2
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
[Qemu-devel] [PULL for-2.12 1/1] block/rbd: remove processed options from qdict
[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
1
Commit 4bfb274 added some QAPIfication of option parsing in
1
From: Stefano Garzarella <sgarzare@redhat.com>
2
qemu_rbd_open(). We need to remove all the options we processed,
3
otherwise in bdrv_open_inherit() we will think the remaining options are
4
invalid.
5
2
6
(This needs to go in 2.12 to avoid a regression that prevents rbd
3
Commit 0445409d74 ("iothread: generalize
7
from being opened.)
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`.
8
10
9
Suggested-by: Kevin Wolf <kwolf@redhat.com>
11
Suggested-by: Kevin Wolf <kwolf@redhat.com>
10
Signed-off-by: Jeff Cody <jcody@redhat.com>
12
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
11
Reviewed-by: Kevin Wolf <kwolf@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>
12
---
16
---
13
block/rbd.c | 7 +++++++
17
iothread.c | 18 ++++++++++--------
14
1 file changed, 7 insertions(+)
18
1 file changed, 10 insertions(+), 8 deletions(-)
15
19
16
diff --git a/block/rbd.c b/block/rbd.c
20
diff --git a/iothread.c b/iothread.c
17
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
18
--- a/block/rbd.c
22
--- a/iothread.c
19
+++ b/block/rbd.c
23
+++ b/iothread.c
20
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
24
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
21
BlockdevOptionsRbd *opts = NULL;
25
};
22
Visitor *v;
26
23
QObject *crumpled = NULL;
27
static void iothread_get_param(Object *obj, Visitor *v,
24
+ const QDictEntry *e;
28
- const char *name, void *opaque, Error **errp)
25
Error *local_err = NULL;
29
+ const char *name, IOThreadParamInfo *info, Error **errp)
26
const char *filename;
30
{
27
char *keypairs, *secretid;
31
IOThread *iothread = IOTHREAD(obj);
28
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
32
- IOThreadParamInfo *info = opaque;
29
goto out;
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;
30
}
66
}
31
67
32
+ /* Remove the processed options from the QDict (the visitor processes
68
@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
33
+ * _all_ options in the QDict) */
69
static void iothread_get_aio_param(Object *obj, Visitor *v,
34
+ while ((e = qdict_first(options))) {
70
const char *name, void *opaque, Error **errp)
35
+ qdict_del(options, e->key);
71
{
36
+ }
72
+ IOThreadParamInfo *info = opaque;
37
+
73
38
r = qemu_rbd_connect(&s->cluster, &s->io_ctx, opts,
74
- iothread_get_param(obj, v, name, opaque, errp);
39
!(flags & BDRV_O_NOCACHE), keypairs, secretid, errp);
75
+ iothread_get_param(obj, v, name, info, errp);
40
if (r < 0) {
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
41
--
89
--
42
2.13.6
90
2.31.1
43
91
44
92
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.