[Qemu-devel] [PULL 0/1] Block patches
[PULL 0/2] Block patches
1
The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:
1
The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
2
2
3
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +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
https://github.com/stefanha/qemu.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 6c11dda922915aaaa032db4462294e8df45f7441:
9
for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
10
10
11
build: use $(DESTDIR)x instead of $(DESTDIR)/x (2019-06-28 14:12:14 +0100)
11
iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
No user-visible changes.
17
18
----------------------------------------------------------------
16
----------------------------------------------------------------
19
17
20
Stefan Hajnoczi (1):
18
Stefano Garzarella (2):
21
build: use $(DESTDIR)x instead of $(DESTDIR)/x
19
iothread: rename PollParamInfo to IOThreadParamInfo
20
iothread: use IOThreadParamInfo in iothread_[set|get]_param()
22
21
23
Makefile | 16 ++++++++--------
22
iothread.c | 28 +++++++++++++++-------------
24
1 file changed, 8 insertions(+), 8 deletions(-)
23
1 file changed, 15 insertions(+), 13 deletions(-)
25
24
26
--
25
--
27
2.21.0
26
2.31.1
28
27
29
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 1/1] build: use $(DESTDIR)x instead of $(DESTDIR)/x
[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
1
The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
1
From: Stefano Garzarella <sgarzare@redhat.com>
2
mostly follows that. There are just a few instances of
3
$(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
4
2
5
[1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
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
6
7
Cc: Daniel P. Berrange <berrange@redhat.com>
7
These functions are called inside callbacks, so we don't need to use an
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
8
opaque pointer. Let's replace `void *opaque` parameter with
9
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
9
`IOThreadParamInfo *info`.
10
Message-id: 20190521145318.12787-1-stefanha@redhat.com
10
11
Message-Id: <20190521145318.12787-1-stefanha@redhat.com>
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
12
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
---
16
---
14
Makefile | 16 ++++++++--------
17
iothread.c | 18 ++++++++++--------
15
1 file changed, 8 insertions(+), 8 deletions(-)
18
1 file changed, 10 insertions(+), 8 deletions(-)
16
19
17
diff --git a/Makefile b/Makefile
20
diff --git a/iothread.c b/iothread.c
18
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
19
--- a/Makefile
22
--- a/iothread.c
20
+++ b/Makefile
23
+++ b/iothread.c
21
@@ -XXX,XX +XXX,XX @@ ifneq ($(DESCS),)
24
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
22
    done
25
};
23
endif
26
24
    for s in $(ICON_SIZES); do \
27
static void iothread_get_param(Object *obj, Visitor *v,
25
-        mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \
28
- const char *name, void *opaque, Error **errp)
26
+        mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
29
+ const char *name, IOThreadParamInfo *info, Error **errp)
27
        $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
30
{
28
-            "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
31
IOThread *iothread = IOTHREAD(obj);
29
+            "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
32
- IOThreadParamInfo *info = opaque;
30
    done; \
33
int64_t *field = (void *)iothread + info->offset;
31
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \
34
32
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \
35
visit_type_int64(v, name, field, errp);
33
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
36
}
34
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
37
35
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
38
static bool iothread_set_param(Object *obj, Visitor *v,
36
+        "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
39
- const char *name, void *opaque, Error **errp)
37
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \
40
+ const char *name, IOThreadParamInfo *info, Error **errp)
38
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
41
{
39
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
42
IOThread *iothread = IOTHREAD(obj);
40
-    mkdir -p "$(DESTDIR)/$(qemu_desktopdir)"
43
- IOThreadParamInfo *info = opaque;
41
+        "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
44
int64_t *field = (void *)iothread + info->offset;
42
+    mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
45
int64_t value;
43
    $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
46
44
-        "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop"
47
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
45
+        "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
48
static void iothread_get_poll_param(Object *obj, Visitor *v,
46
ifdef CONFIG_GTK
49
const char *name, void *opaque, Error **errp)
47
    $(MAKE) -C po $@
50
{
48
endif
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
49
--
89
--
50
2.21.0
90
2.31.1
51
91
52
92
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.