Commit 62b658db authored Oct 29, 2018 by Peter Maydell

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging



Pull request

No changelog-worthy entries, just small tweaks.

# gpg: Signature made Mon 29 Oct 2018 13:55:54 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  nvdimm: Add docs hint for Linux driver name
  util: aio-posix: fix a typo

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents db706913 bd54b110

docs/nvdimm.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -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:

util/aio-posix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)