From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, jcody@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 13/20] oslib: add a wrapper for mmap/munmap
Date: Wed, 12 Dec 2012 14:46:32 +0100 [thread overview]
Message-ID: <1355319999-30627-14-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1355319999-30627-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
osdep.h | 10 ++++++++++
oslib-posix.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
oslib-win32.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+)
diff --git a/osdep.h b/osdep.h
index 87d3b9c..fb7f72c 100644
--- a/osdep.h
+++ b/osdep.h
@@ -134,6 +134,16 @@ void qemu_vfree(void *ptr);
#endif
+typedef struct QEMUMmapArea {
+ int fd;
+ void *mem;
+ size_t size;
+} QEMUMmapArea;
+
+int qemu_mmap_alloc(QEMUMmapArea *mm, const char *path, size_t size);
+int qemu_mmap_flush(QEMUMmapArea *mm);
+void qemu_mmap_free(QEMUMmapArea *mm);
+
int qemu_madvise(void *addr, size_t len, int advice);
int qemu_open(const char *name, int flags, ...);
diff --git a/oslib-posix.c b/oslib-posix.c
index 9db9c3d..f230f61 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -61,6 +61,7 @@ static int running_on_valgrind = -1;
#ifdef CONFIG_LINUX
#include <sys/syscall.h>
#endif
+#include <sys/mman.h>
int qemu_get_thread_id(void)
{
@@ -226,3 +227,49 @@ int qemu_utimens(const char *path, const struct timespec *times)
return utimes(path, &tv[0]);
}
+
+int qemu_mmap_alloc(QEMUMmapArea *mm, const char *path, size_t size)
+{
+ int fd = -1;
+ char *mem = NULL;
+ int save_errno;
+
+ fd = qemu_open(path, O_RDWR | O_CREAT, 0666);
+ if (fd < 0) {
+ goto fail;
+ }
+
+ if (ftruncate(fd, size) < 0) {
+ goto fail;
+ }
+
+ mem = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ if (!mem) {
+ goto fail;
+ }
+
+ mm->fd = fd;
+ mm->mem = mem;
+ mm->size = size;
+ return 0;
+
+fail:
+ save_errno = errno;
+ if (fd >= 0) {
+ close(fd);
+ unlink(path);
+ }
+ return -save_errno;
+}
+
+int qemu_mmap_flush(QEMUMmapArea *mm)
+{
+ int rc = msync(mm->mem, mm->size, MS_SYNC);
+ return rc < 0 ? -errno : 0;
+}
+
+void qemu_mmap_free(QEMUMmapArea *mm)
+{
+ munmap(mm->mem, mm->size);
+ close(mm->fd);
+}
diff --git a/oslib-win32.c b/oslib-win32.c
index 51b33e8..3885a31 100644
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -150,3 +150,62 @@ int qemu_get_thread_id(void)
{
return GetCurrentThreadId();
}
+
+int qemu_mmap_alloc(QEMUMmapArea *mm, const char *path, size_t size)
+{
+ int fd = -1;
+ char *mem = NULL;
+
+ HANDLE hFile, hMapping;
+ int save_errno;
+
+ fd = qemu_open(path, O_RDWR | O_CREAT, 0666);
+ if (fd < 0) {
+ goto fail;
+ }
+
+ hFile = (HANDLE)_get_osfhandle(fd);
+ if (ftruncate(fd, size) < 0) {
+ goto fail;
+ }
+
+ hMapping = CreateFileMapping(hFile, NULL, PAGE_EXECUTE_READWRITE,
+ 0, 0, NULL);
+ if (!hMapping) {
+ goto fail;
+ }
+
+ mem = MapViewOfFileEx(hMapping, FILE_MAP_WRITE, 0, 0, size, NULL);
+ CloseHandle(hMapping);
+ if (mem) {
+ goto fail;
+ }
+
+ mm->fd = fd;
+ mm->mem = mem;
+ mm->size = size;
+ return 0;
+
+fail:
+ save_errno = errno;
+ if (fd >= 0) {
+ close(fd);
+ unlink(path);
+ }
+ return -save_errno;
+}
+
+int qemu_mmap_flush(QEMUMmapArea *mm)
+{
+ int rc;
+
+ FlushViewOfFile(mm->mem, mm->size);
+ rc = qemu_fdatasync(mm->fd);
+ return rc < 0 ? -errno : 0;
+}
+
+void qemu_mmap_free(QEMUMmapArea *mm)
+{
+ UnmapViewOfFile(mm->mem);
+ close(mm->fd);
+}
--
1.8.0.1
next prev parent reply other threads:[~2012-12-12 13:47 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 13:46 [Qemu-devel] [PATCH 00/20] Block device mirroring enhancements, 12-12-12 edition Paolo Bonzini
2012-12-12 13:46 ` [Qemu-devel] [PATCH 01/20] host-utils: add ffsl Paolo Bonzini
2012-12-12 23:41 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 02/20] add hierarchical bitmap data type and test cases Paolo Bonzini
2012-12-14 0:04 ` Eric Blake
2013-01-11 18:27 ` Stefan Hajnoczi
2012-12-12 13:46 ` [Qemu-devel] [PATCH 03/20] block: implement dirty bitmap using HBitmap Paolo Bonzini
2012-12-14 0:27 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 04/20] block: make round_to_clusters public Paolo Bonzini
2012-12-14 20:13 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 05/20] mirror: perform COW if the cluster size is bigger than the granularity Paolo Bonzini
2012-12-14 20:21 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 06/20] block: return count of dirty sectors, not chunks Paolo Bonzini
2012-12-14 20:49 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 07/20] block: allow customizing the granularity of the dirty bitmap Paolo Bonzini
2012-12-14 21:27 ` Eric Blake
2012-12-15 9:11 ` Paolo Bonzini
2012-12-12 13:46 ` [Qemu-devel] [PATCH 08/20] mirror: allow customizing the granularity Paolo Bonzini
2012-12-14 22:01 ` Eric Blake
2013-01-14 11:28 ` Stefan Hajnoczi
2012-12-12 13:46 ` [Qemu-devel] [PATCH 09/20] mirror: switch mirror_iteration to AIO Paolo Bonzini
2012-12-14 22:11 ` Eric Blake
2012-12-15 9:09 ` Paolo Bonzini
2012-12-15 13:05 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 10/20] mirror: add buf-size argument to drive-mirror Paolo Bonzini
2012-12-14 22:22 ` Eric Blake
2012-12-15 9:09 ` Paolo Bonzini
2013-01-14 11:41 ` Stefan Hajnoczi
2012-12-12 13:46 ` [Qemu-devel] [PATCH 11/20] mirror: support more than one in-flight AIO operation Paolo Bonzini
2012-12-14 22:32 ` Eric Blake
2013-01-14 12:56 ` Stefan Hajnoczi
2013-01-14 13:28 ` Paolo Bonzini
2012-12-12 13:46 ` [Qemu-devel] [PATCH 12/20] mirror: support arbitrarily-sized iterations Paolo Bonzini
2012-12-14 22:39 ` Eric Blake
2012-12-12 13:46 ` Paolo Bonzini [this message]
2012-12-14 22:54 ` [Qemu-devel] [PATCH 13/20] oslib: add a wrapper for mmap/munmap Eric Blake
2012-12-15 9:06 ` Paolo Bonzini
2012-12-12 13:46 ` [Qemu-devel] [PATCH 14/20] hbitmap: add hbitmap_alloc_with_data and hbitmap_required_size Paolo Bonzini
2012-12-17 17:14 ` Eric Blake
2012-12-17 17:18 ` Paolo Bonzini
2012-12-12 13:46 ` [Qemu-devel] [PATCH 15/20] hbitmap: add hbitmap_copy Paolo Bonzini
2012-12-17 18:25 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 16/20] block: split bdrv_enable_dirty_tracking and bdrv_disable_dirty_tracking Paolo Bonzini
2012-12-20 18:26 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 17/20] block: support a persistent dirty bitmap Paolo Bonzini
2012-12-20 23:03 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 18/20] mirror: add support for " Paolo Bonzini
2012-12-20 23:49 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 19/20] block: choose the default dirty bitmap granularity in bdrv_enable_dirty_tracking Paolo Bonzini
2012-12-20 23:53 ` Eric Blake
2012-12-12 13:46 ` [Qemu-devel] [PATCH 20/20] monitor: add commands to start/stop dirty bitmap Paolo Bonzini
2012-12-21 18:30 ` Eric Blake
2013-01-14 13:02 ` [Qemu-devel] [PATCH 00/20] Block device mirroring enhancements, 12-12-12 edition Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355319999-30627-14-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).