| 1 | The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150: | 1 | The following changes since commit 0cac736e73723850a99e5142e35d14d8f8efb232: |
|---|---|---|---|
| 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 'pull-riscv-to-apply-20220525' of github.com:alistair23/qemu into staging (2022-05-24 15:55:12 -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/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 29320530cf6684646b3a642fdbb5bc77ee8039de: |
| 10 | 10 | ||
| 11 | nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000) | 11 | docs: Correct the default thread-pool-size (2022-05-25 11:01:38 +0100) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Pull request | 14 | Pull request |
| 15 | 15 | ||
| 16 | No changelog-worthy entries, just small tweaks. | 16 | A small documentation fix. |
| 17 | 17 | ||
| 18 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
| 19 | 19 | ||
| 20 | Kees Cook (1): | 20 | Liu Yiding (1): |
| 21 | nvdimm: Add docs hint for Linux driver name | 21 | docs: Correct the default thread-pool-size |
| 22 | 22 | ||
| 23 | Li Qiang (1): | 23 | docs/tools/virtiofsd.rst | 2 +- |
| 24 | util: aio-posix: fix a typo | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 | |||
| 26 | docs/nvdimm.txt | 5 +++-- | ||
| 27 | util/aio-posix.c | 2 +- | ||
| 28 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 29 | 25 | ||
| 30 | -- | 26 | -- |
| 31 | 2.17.2 | 27 | 2.36.1 |
| 32 | |||
| 33 | diff view generated by jsdifflib |
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 |
| 1 | From: Kees Cook <keescook@chromium.org> | 1 | From: Liu Yiding <liuyd.fnst@fujitsu.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | I spent way too much time trying to figure out why the emulated NVDIMM | 3 | Refer to 26ec190964 virtiofsd: Do not use a thread pool by default |
| 4 | was missing under Linux. In an effort to help others who might be looking | ||
| 5 | for these kinds of things in the future, include a hint. | ||
| 6 | 4 | ||
| 7 | Signed-off-by: Kees Cook <keescook@chromium.org> | 5 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> |
| 8 | Message-id: 20181018201351.GA25286@beast | 6 | Acked-by: Vivek Goyal <vgoyal@redhat.com> |
| 7 | Message-id: 20220413042054.1484640-1-liuyd.fnst@fujitsu.com | ||
| 9 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 8 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 10 | --- | 9 | --- |
| 11 | docs/nvdimm.txt | 5 +++-- | 10 | docs/tools/virtiofsd.rst | 2 +- |
| 12 | 1 file changed, 3 insertions(+), 2 deletions(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | 12 | ||
| 14 | diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt | 13 | diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst |
| 15 | index XXXXXXX..XXXXXXX 100644 | 14 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/docs/nvdimm.txt | 15 | --- a/docs/tools/virtiofsd.rst |
| 17 | +++ b/docs/nvdimm.txt | 16 | +++ b/docs/tools/virtiofsd.rst |
| 18 | @@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object" | 17 | @@ -XXX,XX +XXX,XX @@ Options |
| 19 | and "-device" are provided. | 18 | .. option:: --thread-pool-size=NUM |
| 20 | 19 | ||
| 21 | For above command line options, if the guest OS has the proper NVDIMM | 20 | Restrict the number of worker threads per request queue to NUM. The default |
| 22 | -driver, it should be able to detect a NVDIMM device which is in the | 21 | - is 64. |
| 23 | -persistent memory mode and whose size is $NVDIMM_SIZE. | 22 | + is 0. |
| 24 | +driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to | 23 | |
| 25 | +detect a NVDIMM device which is in the persistent memory mode and whose | 24 | .. option:: --cache=none|auto|always |
| 26 | +size is $NVDIMM_SIZE. | ||
| 27 | |||
| 28 | Note: | ||
| 29 | 25 | ||
| 30 | -- | 26 | -- |
| 31 | 2.17.2 | 27 | 2.36.1 |
| 32 | |||
| 33 | diff view generated by jsdifflib |