aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-12-03 10:35:31 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-12-22 17:45:12 +0200
commit097a50d0d861680da24897b6003f8eea2333577f (patch)
tree651c6bbcadaac6b87706a8aff1a2fd964f138620
parent5dc42c186d63b7b338594fc071cf290805dcc5a5 (diff)
downloadqemu-097a50d0d861680da24897b6003f8eea2333577f.zip
qemu-097a50d0d861680da24897b6003f8eea2333577f.tar.gz
qemu-097a50d0d861680da24897b6003f8eea2333577f.tar.bz2
mmap-alloc: tweak a comment on ppc64
The comment I put in mmap-alloc to document the ppc64 rules refers to the previous revision of the patch: we don't look at memory alignment anymore, we check the fs from which the fd is mapped, instead. It's also not clear what does "in this case" refer to, rearrange text to make it clearer. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--util/mmap-alloc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 54793a5..5cd7f71 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -50,10 +50,11 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
#if defined(__powerpc64__) && defined(__linux__)
/* On ppc64 mappings in the same segment (aka slice) must share the same
* page size. Since we will be re-allocating part of this segment
- * from the supplied fd, we should make sure to use the same page size,
- * unless we are using the system page size, in which case anonymous memory
- * is OK. Use align as a hint for the page size.
- * In this case, set MAP_NORESERVE to avoid allocating backing store memory.
+ * from the supplied fd, we should make sure to use the same page size, to
+ * this end we mmap the supplied fd. In this case, set MAP_NORESERVE to
+ * avoid allocating backing store memory.
+ * We do this unless we are using the system page size, in which case
+ * anonymous memory is OK.
*/
int anonfd = fd == -1 || qemu_fd_getpagesize(fd) == getpagesize() ? -1 : fd;
int flags = anonfd == -1 ? MAP_ANONYMOUS : MAP_NORESERVE;