Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 06:43:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull request

Browse Source 
No changelog-worthy entries, just small tweaks.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJb1xFqAAoJEJykq7OBq3PItXQH/03yXfZzBaq/+MoiEcv2ufHr
 PC7/pwQJeETEzP4ogT9Nvo8h6GlDev7iPhCSjgIzamPNbjqFiaV0HNkcEzsM/ZGP
 f1O9v6468DBVUPcdySGnXDdxKQh6uS+wL6WNeBxnL/ZHNDqOmxULifYmJso6ibeN
 CDGdSSUt9J20SbWhY7Irw0tHykkl5KfHe4yQu1rSAPTkFuct5RBUZQkiuzsKXubJ
 VChp8Eho74rzuNHtVWvfAqC79FRAFdSTtNVd9kGK8NbuXXq2tLUxD+7Bl42yAMNh
 jchVL/UcOhZsiF829rgH8jUvqJ++YIQLygvO2+6g9MJGBwJarTCpes+l/Yt8bDE=
 =qIgO
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-10-29 17:03:27 +00:00
commit 62b658db1d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/nvdimm.txt
View File

@ -49,8 +49,9 @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
and "-device" are provided. and "-device" are provided.
For above command line options, if the guest OS has the proper NVDIMM 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 driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
persistent memory mode and whose size is $NVDIMM_SIZE. detect a NVDIMM device which is in the persistent memory mode and whose
size is $NVDIMM_SIZE.
Note: Note:

2
util/aio-posix.c
View File

@ -40,7 +40,7 @@ struct AioHandler
#ifdef CONFIG_EPOLL_CREATE1 #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 #define EPOLL_ENABLE_THRESHOLD 64
static void aio_epoll_disable(AioContext *ctx) static void aio_epoll_disable(AioContext *ctx)