[Qemu-devel] [PULL 0/2] Block patches
[PULL 0/1] Block patches
1
The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
1
The following changes since commit 6338c30111d596d955e6bc933a82184a0b910c43:
2
2
3
Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)
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)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
git://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 bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:
9
for you to fetch changes up to f16d15c9276bd8f501f861c39cbd4adc812d0c1d:
10
10
11
nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)
11
virtiofsd: use g_date_time_get_microsecond to get subsecond (2022-09-22 13:13:47 -0400)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
No changelog-worthy entries, just small tweaks.
17
18
----------------------------------------------------------------
16
----------------------------------------------------------------
19
17
20
Kees Cook (1):
18
Yusuke Okada (1):
21
nvdimm: Add docs hint for Linux driver name
19
virtiofsd: use g_date_time_get_microsecond to get subsecond
22
20
23
Li Qiang (1):
21
tools/virtiofsd/passthrough_ll.c | 7 +++++--
24
util: aio-posix: fix a typo
22
1 file changed, 5 insertions(+), 2 deletions(-)
25
26
docs/nvdimm.txt | 5 +++--
27
util/aio-posix.c | 2 +-
28
2 files changed, 4 insertions(+), 3 deletions(-)
29
23
30
--
24
--
31
2.17.2
25
2.37.3
32
33
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] util: aio-posix: fix a typo
Deleted patch
1
From: Li Qiang <liq3ea@gmail.com>
2
1
3
Cc: qemu-trivial@nongnu.org
4
Signed-off-by: Li Qiang <liq3ea@gmail.com>
5
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
6
Reviewed-by: Fam Zheng <famz@redhat.com>
7
Message-id: 1538964972-3223-1-git-send-email-liq3ea@gmail.com
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
---
10
util/aio-posix.c | 2 +-
11
1 file changed, 1 insertion(+), 1 deletion(-)
12
13
diff --git a/util/aio-posix.c b/util/aio-posix.c
14
index XXXXXXX..XXXXXXX 100644
15
--- a/util/aio-posix.c
16
+++ b/util/aio-posix.c
17
@@ -XXX,XX +XXX,XX @@ struct AioHandler
18
19
#ifdef CONFIG_EPOLL_CREATE1
20
21
-/* The fd number threashold to switch to epoll */
22
+/* The fd number threshold to switch to epoll */
23
#define EPOLL_ENABLE_THRESHOLD 64
24
25
static void aio_epoll_disable(AioContext *ctx)
26
--
27
2.17.2
28
29
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/2] nvdimm: Add docs hint for Linux driver name
[PULL 1/1] virtiofsd: use g_date_time_get_microsecond to get subsecond
1
From: Kees Cook <keescook@chromium.org>
1
From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
2
2
3
I spent way too much time trying to figure out why the emulated NVDIMM
3
The "%f" specifier in g_date_time_format() is only available in glib
4
was missing under Linux. In an effort to help others who might be looking
4
2.65.2 or later. If combined with older glib, the function returns null
5
for these kinds of things in the future, include a hint.
5
and the timestamp displayed as "(null)".
6
6
7
Signed-off-by: Kees Cook <keescook@chromium.org>
7
For backward compatibility, g_date_time_get_microsecond should be used
8
Message-id: 20181018201351.GA25286@beast
8
to retrieve subsecond.
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
9
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
16
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
10
---
17
---
11
docs/nvdimm.txt | 5 +++--
18
tools/virtiofsd/passthrough_ll.c | 7 +++++--
12
1 file changed, 3 insertions(+), 2 deletions(-)
19
1 file changed, 5 insertions(+), 2 deletions(-)
13
20
14
diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
21
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
15
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
16
--- a/docs/nvdimm.txt
23
--- a/tools/virtiofsd/passthrough_ll.c
17
+++ b/docs/nvdimm.txt
24
+++ b/tools/virtiofsd/passthrough_ll.c
18
@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
25
@@ -XXX,XX +XXX,XX @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
19
and "-device" are provided.
26
static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
20
27
{
21
For above command line options, if the guest OS has the proper NVDIMM
28
g_autofree char *localfmt = NULL;
22
-driver, it should be able to detect a NVDIMM device which is in the
29
+ char buf[64];
23
-persistent memory mode and whose size is $NVDIMM_SIZE.
30
24
+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
31
if (current_log_level < level) {
25
+detect a NVDIMM device which is in the persistent memory mode and whose
32
return;
26
+size is $NVDIMM_SIZE.
33
@@ -XXX,XX +XXX,XX @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
27
34
fmt);
28
Note:
35
} else {
29
36
g_autoptr(GDateTime) now = g_date_time_new_now_utc();
37
- g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
38
+ g_autofree char *nowstr = g_date_time_format(now,
39
+ "%Y-%m-%d %H:%M:%S.%%06d%z");
40
+ snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
41
localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
42
- nowstr, syscall(__NR_gettid), fmt);
43
+ buf, syscall(__NR_gettid), fmt);
44
}
45
fmt = localfmt;
46
}
30
--
47
--
31
2.17.2
48
2.37.3
32
33
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.