[Qemu-devel] [PULL 0/2] Block patches

[Qemu-devel] [PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:

  Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)

are available in the Git repository at:

  git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:

  nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)

----------------------------------------------------------------
Pull request

No changelog-worthy entries, just small tweaks.

----------------------------------------------------------------

Kees Cook (1):
  nvdimm: Add docs hint for Linux driver name

Li Qiang (1):
  util: aio-posix: fix a typo

 docs/nvdimm.txt  | 5 +++--
 util/aio-posix.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.17.2

[Qemu-devel] [PULL 1/2] util: aio-posix: fix a typo

[Stefan Hajnoczi]

From: Li Qiang <liq3ea@gmail.com>

Cc: qemu-trivial@nongnu.org
Signed-off-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 1538964972-3223-1-git-send-email-liq3ea@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/aio-posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/aio-posix.c b/util/aio-posix.c
index 621b3025d8..51c41ed3c9 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -40,7 +40,7 @@ struct AioHandler
 
 #ifdef CONFIG_EPOLL_CREATE1
 
-/* The fd number threashold to switch to epoll */
+/* The fd number threshold to switch to epoll */
 #define EPOLL_ENABLE_THRESHOLD 64
 
 static void aio_epoll_disable(AioContext *ctx)
-- 
2.17.2

[Qemu-devel] [PULL 2/2] nvdimm: Add docs hint for Linux driver name

[Stefan Hajnoczi]

From: Kees Cook <keescook@chromium.org>

I spent way too much time trying to figure out why the emulated NVDIMM
was missing under Linux. In an effort to help others who might be looking
for these kinds of things in the future, include a hint.

Signed-off-by: Kees Cook <keescook@chromium.org>
Message-id: 20181018201351.GA25286@beast
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/nvdimm.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
index 5f158a6170..7231c2d78f 100644
--- a/docs/nvdimm.txt
+++ b/docs/nvdimm.txt
@@ -49,8 +49,9 @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
 and "-device" are provided.
 
 For above command line options, if the guest OS has the proper NVDIMM
-driver, it should be able to detect a NVDIMM device which is in the
-persistent memory mode and whose size is $NVDIMM_SIZE.
+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
+detect a NVDIMM device which is in the persistent memory mode and whose
+size is $NVDIMM_SIZE.
 
 Note:
 
-- 
2.17.2

Re: [Qemu-devel] [PULL 0/2] Block patches

[Peter Maydell]

On 29 October 2018 at 13:56, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
>
>   Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:
>
>   nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> No changelog-worthy entries, just small tweaks.
>
> ----------------------------------------------------------------
>

Applied, thanks.

-- PMM