[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] ivshmem: use ram_from_fd()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 5/9] ivshmem: use ram_from_fd() |
Date: |
Wed, 11 Jan 2017 12:33:43 +0100 |
Instead of having its own mmap handling code, reuse the code from
exec.c.
Note: memory_region_init_ram_from_fd() adds some restrictions
(check for xen, kvm sync-mmu, etc) and changes (such as size
alignment). This may actually be more correct.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/misc/ivshmem.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index abeaf3da08..49db6a27aa 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -491,9 +491,9 @@ static void setup_interrupt(IVShmemState *s, int vector,
Error **errp)
static void process_msg_shmem(IVShmemState *s, int fd, Error **errp)
{
+ Error *local_err = NULL;
struct stat buf;
size_t size;
- void *ptr;
if (s->ivshmem_bar2) {
error_setg(errp, "server sent unexpected shared memory message");
@@ -522,15 +522,13 @@ static void process_msg_shmem(IVShmemState *s, int fd,
Error **errp)
}
/* mmap the region and map into the BAR2 */
- ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
- if (ptr == MAP_FAILED) {
- error_setg_errno(errp, errno, "Failed to mmap shared memory");
- close(fd);
+ memory_region_init_ram_from_fd(&s->server_bar2, OBJECT(s),
+ "ivshmem.bar2", size, true, fd, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
- memory_region_init_ram_ptr(&s->server_bar2, OBJECT(s),
- "ivshmem.bar2", size, ptr);
- memory_region_set_fd(&s->server_bar2, fd);
+
s->ivshmem_bar2 = &s->server_bar2;
}
--
2.11.0
- [Qemu-devel] [PATCH v2 0/9] Add memfd memory backend, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 2/9] exec: split file_ram_alloc(), Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 1/9] exec: check kvm mmu notifiers earlier, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 3/9] exec: split qemu_ram_alloc_from_file(), Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 5/9] ivshmem: use ram_from_fd(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 6/9] memory: remove memory_region_set_fd, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 4/9] Add memory_region_init_ram_from_fd(), Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 7/9] memfd: split qemu_memfd_alloc(), Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 9/9] tests: use memfd in vhost-user-test, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH v2 8/9] Add memfd based hostmem, Marc-André Lureau, 2017/01/11