1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150: |
---|---|---|---|
2 | 2 | ||
3 | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100) | 3 | Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100) |
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 | git://github.com/stefanha/qemu.git tags/block-pull-request |
8 | 8 | ||
9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: | 9 | for you to fetch changes up to bd54b11062c4baa7d2e4efadcf71b8cfd55311fd: |
10 | 10 | ||
11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000) |
12 | 12 | ||
13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
14 | Gluster patch | 14 | Pull request |
15 | |||
16 | No changelog entries necessary, just small tweaks. | ||
17 | |||
15 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
16 | 19 | ||
17 | Peter Maydell (1): | 20 | Kees Cook (1): |
18 | block/gluster.c: Handle qdict_array_entries() failure | 21 | nvdimm: Add docs hint for Linux driver name |
19 | 22 | ||
20 | block/gluster.c | 3 +-- | 23 | Li Qiang (1): |
21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 24 | util: aio-posix: fix a typo |
25 | |||
26 | docs/nvdimm.txt | 5 +++-- | ||
27 | util/aio-posix.c | 2 +- | ||
28 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
22 | 29 | ||
23 | -- | 30 | -- |
24 | 2.9.3 | 31 | 2.17.2 |
25 | 32 | ||
26 | 33 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Li Qiang <liq3ea@gmail.com> | ||
1 | 2 | ||
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: Peter Maydell <peter.maydell@linaro.org> | 1 | From: Kees Cook <keescook@chromium.org> |
---|---|---|---|
2 | 2 | ||
3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() | 3 | I spent way too much time trying to figure out why the emulated NVDIMM |
4 | could return a negative error code, which we were ignoring | 4 | was missing under Linux. In an effort to help others who might be looking |
5 | because we assigned the result to an unsigned variable. | 5 | for these kinds of things in the future, include a hint. |
6 | Fix this by using the 'int' type instead, which matches the | ||
7 | return type of qdict_array_entries() and also the type | ||
8 | we use for the loop enumeration variable 'i'. | ||
9 | 6 | ||
10 | (Spotted by Coverity, CID 1360960.) | 7 | Signed-off-by: Kees Cook <keescook@chromium.org> |
8 | Message-id: 20181018201351.GA25286@beast | ||
9 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
10 | --- | ||
11 | docs/nvdimm.txt | 5 +++-- | ||
12 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
11 | 13 | ||
12 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | 14 | diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt |
13 | Reviewed-by: Eric Blake <eblake@redhat.com> | ||
14 | Reviewed-by: Jeff Cody <jcody@redhat.com> | ||
15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org | ||
16 | Signed-off-by: Jeff Cody <jcody@redhat.com> | ||
17 | --- | ||
18 | block/gluster.c | 3 +-- | ||
19 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/block/gluster.c b/block/gluster.c | ||
22 | index XXXXXXX..XXXXXXX 100644 | 15 | index XXXXXXX..XXXXXXX 100644 |
23 | --- a/block/gluster.c | 16 | --- a/docs/nvdimm.txt |
24 | +++ b/block/gluster.c | 17 | +++ b/docs/nvdimm.txt |
25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, | 18 | @@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object" |
26 | Error *local_err = NULL; | 19 | and "-device" are provided. |
27 | char *str = NULL; | 20 | |
28 | const char *ptr; | 21 | For above command line options, if the guest OS has the proper NVDIMM |
29 | - size_t num_servers; | 22 | -driver, it should be able to detect a NVDIMM device which is in the |
30 | - int i, type; | 23 | -persistent memory mode and whose size is $NVDIMM_SIZE. |
31 | + int i, type, num_servers; | 24 | +driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to |
32 | 25 | +detect a NVDIMM device which is in the persistent memory mode and whose | |
33 | /* create opts info from runtime_json_opts list */ | 26 | +size is $NVDIMM_SIZE. |
34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); | 27 | |
28 | Note: | ||
29 | |||
35 | -- | 30 | -- |
36 | 2.9.3 | 31 | 2.17.2 |
37 | 32 | ||
38 | 33 | diff view generated by jsdifflib |