[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/9] exec: split qemu_ram_alloc_from_file()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH 3/9] exec: split qemu_ram_alloc_from_file() |
Date: |
Tue, 12 Apr 2016 13:55:23 +0200 |
From: Marc-André Lureau <address@hidden>
Add qemu_ram_alloc_from_fd(), which can be use to allocate ramblock from
fd only.
Signed-off-by: Marc-André Lureau <address@hidden>
---
exec.c | 45 ++++++++++++++++++++++++++++++---------------
include/exec/ram_addr.h | 3 +++
2 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/exec.c b/exec.c
index 422ea3e..8675b5e 100644
--- a/exec.c
+++ b/exec.c
@@ -1646,14 +1646,12 @@ static void ram_block_add(RAMBlock *new_block, Error
**errp)
}
#ifdef __linux__
-RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
- bool share, const char *mem_path,
- Error **errp)
+RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
+ bool share, int fd,
+ Error **errp)
{
RAMBlock *new_block;
Error *local_err = NULL;
- int fd;
- bool created;
if (xen_enabled()) {
error_setg(errp, "-mem-path not supported with Xen");
@@ -1677,11 +1675,6 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size,
MemoryRegion *mr,
return NULL;
}
- fd = file_ram_open(mem_path, memory_region_name(mr), &created, errp);
- if (fd < 0) {
- return NULL;
- }
-
size = HOST_PAGE_ALIGN(size);
new_block = g_malloc0(sizeof(*new_block));
new_block->mr = mr;
@@ -1690,11 +1683,6 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size,
MemoryRegion *mr,
new_block->flags = share ? RAM_SHARED : 0;
new_block->host = file_ram_alloc(new_block, size, fd, errp);
if (!new_block->host) {
- if (created) {
- unlink(mem_path);
- }
- close(fd);
- g_free(new_block);
return NULL;
}
@@ -1705,6 +1693,33 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size,
MemoryRegion *mr,
return NULL;
}
return new_block;
+
+}
+
+
+RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
+ bool share, const char *mem_path,
+ Error **errp)
+{
+ int fd;
+ bool created;
+ RAMBlock *block;
+
+ fd = file_ram_open(mem_path, memory_region_name(mr), &created, errp);
+ if (fd < 0) {
+ return NULL;
+ }
+
+ block = qemu_ram_alloc_from_fd(size, mr, share, fd, errp);
+ if (!block) {
+ if (created) {
+ unlink(mem_path);
+ }
+ close(fd);
+ return NULL;
+ }
+
+ return block;
}
#endif
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 5adf7a4..153f1b2 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -97,6 +97,9 @@ void qemu_mutex_unlock_ramlist(void);
RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
bool share, const char *mem_path,
Error **errp);
+RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
+ bool share, int fd,
+ Error **errp);
RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
MemoryRegion *mr, Error **errp);
RAMBlock *qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp);
--
2.5.5
- [Qemu-devel] [PATCH 0/9] RFC: add memfd memory backend, marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 1/9] exec: check kvm mmu notifiers earlier, marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 2/9] exec: split file_ram_alloc(), marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 3/9] exec: split qemu_ram_alloc_from_file(),
marcandre . lureau <=
- [Qemu-devel] [PATCH 5/9] RFC: ivshmem: use ram_from_fd(), marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 4/9] Add memory_region_init_ram_from_fd(), marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 6/9] exec: remove qemu_set_ram_fd(), marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 7/9] memfd: split qemu_memfd_alloc(), marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 8/9] Add memfd based hostmem, marcandre . lureau, 2016/04/12
- [Qemu-devel] [PATCH 9/9] tests: use memfd in vhost-user-test, marcandre . lureau, 2016/04/12