aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/cutils.c38
-rw-r--r--util/oslib-posix.c18
-rw-r--r--util/oslib-win32.c10
3 files changed, 28 insertions, 38 deletions
diff --git a/util/cutils.c b/util/cutils.c
index a01a3a7..c0775bb 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -160,44 +160,6 @@ int qemu_fdatasync(int fd)
#endif
}
-/**
- * Sync changes made to the memory mapped file back to the backing
- * storage. For POSIX compliant systems this will fallback
- * to regular msync call. Otherwise it will trigger whole file sync
- * (including the metadata case there is no support to skip that otherwise)
- *
- * @addr - start of the memory area to be synced
- * @length - length of the are to be synced
- * @fd - file descriptor for the file to be synced
- * (mandatory only for POSIX non-compliant systems)
- */
-int qemu_msync(void *addr, size_t length, int fd)
-{
-#ifdef CONFIG_POSIX
- size_t align_mask = ~(qemu_real_host_page_size() - 1);
-
- /**
- * There are no strict reqs as per the length of mapping
- * to be synced. Still the length needs to follow the address
- * alignment changes. Additionally - round the size to the multiple
- * of PAGE_SIZE
- */
- length += ((uintptr_t)addr & (qemu_real_host_page_size() - 1));
- length = (length + ~align_mask) & align_mask;
-
- addr = (void *)((uintptr_t)addr & align_mask);
-
- return msync(addr, length, MS_SYNC);
-#else /* CONFIG_POSIX */
- /**
- * Perform the sync based on the file descriptor
- * The sync range will most probably be wider than the one
- * requested - but it will still get the job done
- */
- return qemu_fdatasync(fd);
-#endif /* CONFIG_POSIX */
-}
-
static int64_t suffix_mul(char suffix, int64_t unit)
{
switch (qemu_toupper(suffix)) {
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index c471c5b..161f112 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -950,3 +950,21 @@ int fcntl_setfl(int fd, int flag)
}
return 0;
}
+
+int qemu_msync(void *addr, size_t length, int fd)
+{
+ size_t align_mask = ~(qemu_real_host_page_size() - 1);
+
+ /**
+ * There are no strict reqs as per the length of mapping
+ * to be synced. Still the length needs to follow the address
+ * alignment changes. Additionally - round the size to the multiple
+ * of PAGE_SIZE
+ */
+ length += ((uintptr_t)addr & (qemu_real_host_page_size() - 1));
+ length = (length + ~align_mask) & align_mask;
+
+ addr = (void *)((uintptr_t)addr & align_mask);
+
+ return msync(addr, length, MS_SYNC);
+}
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index f38b069..1e05c31 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -596,3 +596,13 @@ size_t qemu_get_host_physmem(void)
}
return 0;
}
+
+int qemu_msync(void *addr, size_t length, int fd)
+{
+ /**
+ * Perform the sync based on the file descriptor
+ * The sync range will most probably be wider than the one
+ * requested - but it will still get the job done
+ */
+ return qemu_fdatasync(fd);
+}