[PULL 0/1] Block patches
[PULL 0/2] Block patches
1
The following changes since commit 6338c30111d596d955e6bc933a82184a0b910c43:
1
The following changes since commit ac5f7bf8e208cd7893dbb1a9520559e569a4677c:
2
2
3
Merge tag 'm68k-for-7.2-pull-request' of https://github.com/vivier/qemu-m68k into staging (2022-09-21 13:12:36 -0400)
3
Merge tag 'migration-20230424-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-04-24 15:00:39 +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://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to f16d15c9276bd8f501f861c39cbd4adc812d0c1d:
9
for you to fetch changes up to 9d672e290475001fcecdcc9dc79ad088ff89d17f:
10
10
11
virtiofsd: use g_date_time_get_microsecond to get subsecond (2022-09-22 13:13:47 -0400)
11
tracetool: use relative paths for '#line' preprocessor directives (2023-04-24 13:53:44 -0400)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request (v2)
15
16
I dropped the zoned storage patches that had CI failures. This pull request
17
only contains fixes now.
15
18
16
----------------------------------------------------------------
19
----------------------------------------------------------------
17
20
18
Yusuke Okada (1):
21
Philippe Mathieu-Daudé (1):
19
virtiofsd: use g_date_time_get_microsecond to get subsecond
22
block/dmg: Declare a type definition for DMG uncompress function
20
23
21
tools/virtiofsd/passthrough_ll.c | 7 +++++--
24
Thomas De Schampheleire (1):
22
1 file changed, 5 insertions(+), 2 deletions(-)
25
tracetool: use relative paths for '#line' preprocessor directives
26
27
block/dmg.h | 8 ++++----
28
block/dmg.c | 7 ++-----
29
scripts/tracetool/backend/ftrace.py | 4 +++-
30
scripts/tracetool/backend/log.py | 4 +++-
31
scripts/tracetool/backend/syslog.py | 4 +++-
32
5 files changed, 15 insertions(+), 12 deletions(-)
23
33
24
--
34
--
25
2.37.3
35
2.39.2
36
37
diff view generated by jsdifflib
[PULL 1/1] virtiofsd: use g_date_time_get_microsecond to get subsecond
[PULL 1/2] block/dmg: Declare a type definition for DMG uncompress function
1
From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
1
From: Philippe Mathieu-Daudé <philmd@linaro.org>
2
2
3
The "%f" specifier in g_date_time_format() is only available in glib
3
Introduce the BdrvDmgUncompressFunc type defintion. To emphasis
4
2.65.2 or later. If combined with older glib, the function returns null
4
dmg_uncompress_bz2 and dmg_uncompress_lzfse are pointer to functions,
5
and the timestamp displayed as "(null)".
5
declare them using this new typedef.
6
6
7
For backward compatibility, g_date_time_get_microsecond should be used
7
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
8
to retrieve subsecond.
8
Message-id: 20230320152610.32052-1-philmd@linaro.org
9
10
In this patch the g_date_time_format() leaves subsecond field as "%06d"
11
and let next snprintf to format with g_date_time_get_microsecond.
12
13
Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
14
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
15
Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
16
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
17
---
10
---
18
tools/virtiofsd/passthrough_ll.c | 7 +++++--
11
block/dmg.h | 8 ++++----
19
1 file changed, 5 insertions(+), 2 deletions(-)
12
block/dmg.c | 7 ++-----
13
2 files changed, 6 insertions(+), 9 deletions(-)
20
14
21
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
15
diff --git a/block/dmg.h b/block/dmg.h
22
index XXXXXXX..XXXXXXX 100644
16
index XXXXXXX..XXXXXXX 100644
23
--- a/tools/virtiofsd/passthrough_ll.c
17
--- a/block/dmg.h
24
+++ b/tools/virtiofsd/passthrough_ll.c
18
+++ b/block/dmg.h
25
@@ -XXX,XX +XXX,XX @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
19
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVDMGState {
26
static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
20
z_stream zstream;
27
{
21
} BDRVDMGState;
28
g_autofree char *localfmt = NULL;
22
29
+ char buf[64];
23
-extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
30
24
- char *next_out, unsigned int avail_out);
31
if (current_log_level < level) {
25
+typedef int BdrvDmgUncompressFunc(char *next_in, unsigned int avail_in,
32
return;
26
+ char *next_out, unsigned int avail_out);
33
@@ -XXX,XX +XXX,XX @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
27
34
fmt);
28
-extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
35
} else {
29
- char *next_out, unsigned int avail_out);
36
g_autoptr(GDateTime) now = g_date_time_new_now_utc();
30
+extern BdrvDmgUncompressFunc *dmg_uncompress_bz2;
37
- g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
31
+extern BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
38
+ g_autofree char *nowstr = g_date_time_format(now,
32
39
+ "%Y-%m-%d %H:%M:%S.%%06d%z");
33
#endif
40
+ snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
34
diff --git a/block/dmg.c b/block/dmg.c
41
localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
35
index XXXXXXX..XXXXXXX 100644
42
- nowstr, syscall(__NR_gettid), fmt);
36
--- a/block/dmg.c
43
+ buf, syscall(__NR_gettid), fmt);
37
+++ b/block/dmg.c
44
}
38
@@ -XXX,XX +XXX,XX @@
45
fmt = localfmt;
39
#include "qemu/memalign.h"
46
}
40
#include "dmg.h"
41
42
-int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
43
- char *next_out, unsigned int avail_out);
44
-
45
-int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
46
- char *next_out, unsigned int avail_out);
47
+BdrvDmgUncompressFunc *dmg_uncompress_bz2;
48
+BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
49
50
enum {
51
/* Limit chunk sizes to prevent unreasonable amounts of memory being used
47
--
52
--
48
2.37.3
53
2.39.2
54
55
diff view generated by jsdifflib
New patch
[PULL 2/2] tracetool: use relative paths for '#line' preprocessor directives
1
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
1
2
3
The event filename is an absolute path. Convert it to a relative path when
4
writing '#line' directives, to preserve reproducibility of the generated
5
output when different base paths are used.
6
7
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
Message-Id: <20230406080045.21696-1-thomas.de_schampheleire@nokia.com>
10
---
11
scripts/tracetool/backend/ftrace.py | 4 +++-
12
scripts/tracetool/backend/log.py | 4 +++-
13
scripts/tracetool/backend/syslog.py | 4 +++-
14
3 files changed, 9 insertions(+), 3 deletions(-)
15
16
diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
17
index XXXXXXX..XXXXXXX 100644
18
--- a/scripts/tracetool/backend/ftrace.py
19
+++ b/scripts/tracetool/backend/ftrace.py
20
@@ -XXX,XX +XXX,XX @@
21
__email__ = "stefanha@redhat.com"
22
23
24
+import os.path
25
+
26
from tracetool import out
27
28
29
@@ -XXX,XX +XXX,XX @@ def generate_h(event, group):
30
args=event.args,
31
event_id="TRACE_" + event.name.upper(),
32
event_lineno=event.lineno,
33
- event_filename=event.filename,
34
+ event_filename=os.path.relpath(event.filename),
35
fmt=event.fmt.rstrip("\n"),
36
argnames=argnames)
37
38
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
39
index XXXXXXX..XXXXXXX 100644
40
--- a/scripts/tracetool/backend/log.py
41
+++ b/scripts/tracetool/backend/log.py
42
@@ -XXX,XX +XXX,XX @@
43
__email__ = "stefanha@redhat.com"
44
45
46
+import os.path
47
+
48
from tracetool import out
49
50
51
@@ -XXX,XX +XXX,XX @@ def generate_h(event, group):
52
' }',
53
cond=cond,
54
event_lineno=event.lineno,
55
- event_filename=event.filename,
56
+ event_filename=os.path.relpath(event.filename),
57
name=event.name,
58
fmt=event.fmt.rstrip("\n"),
59
argnames=argnames)
60
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
61
index XXXXXXX..XXXXXXX 100644
62
--- a/scripts/tracetool/backend/syslog.py
63
+++ b/scripts/tracetool/backend/syslog.py
64
@@ -XXX,XX +XXX,XX @@
65
__email__ = "stefanha@redhat.com"
66
67
68
+import os.path
69
+
70
from tracetool import out
71
72
73
@@ -XXX,XX +XXX,XX @@ def generate_h(event, group):
74
' }',
75
cond=cond,
76
event_lineno=event.lineno,
77
- event_filename=event.filename,
78
+ event_filename=os.path.relpath(event.filename),
79
name=event.name,
80
fmt=event.fmt.rstrip("\n"),
81
argnames=argnames)
82
--
83
2.39.2
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.