diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 17:03:27 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 17:03:27 +0000 |
| commit | 62b658db1df7c6fa574caae038144f24bf6ca495 (patch) | |
| tree | 92e8a5ce05330fc1b259eda555e76329c50a24f1 | |
| parent | db7069133e2aab279efa999b7de3d241bb219acf (diff) | |
| parent | bd54b11062c4baa7d2e4efadcf71b8cfd55311fd (diff) | |
| download | qemu-62b658db1df7c6fa574caae038144f24bf6ca495.zip qemu-62b658db1df7c6fa574caae038144f24bf6ca495.tar.gz qemu-62b658db1df7c6fa574caae038144f24bf6ca495.tar.bz2 | |
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>
| -rw-r--r-- | docs/nvdimm.txt | 5 | ||||
| -rw-r--r-- | util/aio-posix.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt index 5f158a6..7231c2d 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: diff --git a/util/aio-posix.c b/util/aio-posix.c index 621b302..51c41ed 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) |