[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/16] qemu_ram_free: Implement it
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH v3 14/16] qemu_ram_free: Implement it |
Date: |
Fri, 02 Jul 2010 11:13:17 -0600 |
User-agent: |
StGIT/0.14.3 |
Now that we can support a ram_addr_t space with holes, we can implement
qemu_ram_free().
Signed-off-by: Alex Williamson <address@hidden>
---
cpu-all.h | 3 +++
exec.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/cpu-all.h b/cpu-all.h
index 5d8342b..224ca40 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -867,6 +867,9 @@ typedef struct RAMBlock {
ram_addr_t length;
char idstr[256];
QLIST_ENTRY(RAMBlock) next;
+#if defined(__linux__) && !defined(TARGET_S390X)
+ int fd;
+#endif
} RAMBlock;
typedef struct RAMList {
diff --git a/exec.c b/exec.c
index fd47d5b..b9a1471 100644
--- a/exec.c
+++ b/exec.c
@@ -2701,7 +2701,9 @@ static long gethugepagesize(const char *path)
return fs.f_bsize;
}
-static void *file_ram_alloc(ram_addr_t memory, const char *path)
+static void *file_ram_alloc(RAMBlock *block,
+ ram_addr_t memory,
+ const char *path)
{
char *filename;
void *area;
@@ -2764,12 +2766,39 @@ static void *file_ram_alloc(ram_addr_t memory, const
char *path)
close(fd);
return (NULL);
}
+ block->fd = fd;
return area;
}
#endif
static ram_addr_t find_ram_offset(ram_addr_t size)
{
+ RAMBlock *block, *next_block;
+ ram_addr_t offset, mingap = ULONG_MAX;
+
+ if (QLIST_EMPTY(&ram_list.blocks))
+ return 0;
+
+ QLIST_FOREACH(block, &ram_list.blocks, next) {
+ ram_addr_t end, next = ULONG_MAX;
+
+ end = block->offset + block->length;
+
+ QLIST_FOREACH(next_block, &ram_list.blocks, next) {
+ if (next_block->offset >= end) {
+ next = MIN(next, next_block->offset);
+ }
+ }
+ if (next - end >= size && next - end < mingap) {
+ offset = end;
+ mingap = next - end;
+ }
+ }
+ return offset;
+}
+
+static ram_addr_t last_ram_offset(void)
+{
RAMBlock *block;
ram_addr_t last = 0;
@@ -2812,7 +2841,7 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char
*name, ram_addr_t size)
if (mem_path) {
#if defined (__linux__) && !defined(TARGET_S390X)
- new_block->host = file_ram_alloc(size, mem_path);
+ new_block->host = file_ram_alloc(new_block, size, mem_path);
if (!new_block->host) {
new_block->host = qemu_vmalloc(size);
#ifdef MADV_MERGEABLE
@@ -2842,7 +2871,7 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char
*name, ram_addr_t size)
QLIST_INSERT_HEAD(&ram_list.blocks, new_block, next);
ram_list.phys_dirty = qemu_realloc(ram_list.phys_dirty,
- (new_block->offset + size) >> TARGET_PAGE_BITS);
+ last_ram_offset() >> TARGET_PAGE_BITS);
memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS),
0xff, size >> TARGET_PAGE_BITS);
@@ -2854,7 +2883,32 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char
*name, ram_addr_t size)
void qemu_ram_free(ram_addr_t addr)
{
- /* TODO: implement this. */
+ RAMBlock *block;
+
+ QLIST_FOREACH(block, &ram_list.blocks, next) {
+ if (addr == block->offset) {
+ QLIST_REMOVE(block, next);
+ if (mem_path) {
+#if defined (__linux__) && !defined(TARGET_S390X)
+ if (block->fd) {
+ munmap(block->host, block->length);
+ close(block->fd);
+ } else {
+ qemu_vfree(block->host);
+ }
+#endif
+ } else {
+#if defined(TARGET_S390X) && defined(CONFIG_KVM)
+ munmap(block->host, block->length);
+#else
+ qemu_vfree(block->host);
+#endif
+ }
+ qemu_free(block);
+ return;
+ }
+ }
+
}
/* Return a host pointer to ram allocated with qemu_ram_alloc.
- [Qemu-devel] [PATCH v3 03/16] qdev: Add a get_dev_path() function to BusInfo, (continued)
- [Qemu-devel] [PATCH v3 03/16] qdev: Add a get_dev_path() function to BusInfo, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 04/16] pci: Implement BusInfo.get_dev_path(), Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 06/16] savevm: Make use of DeviceState, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 05/16] savevm: Add DeviceState param, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 07/16] eepro100: Add a dev field to eeprom new/free functions, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 08/16] virtio-net: Incorporate a DeviceState pointer and let savevm track instances, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 09/16] qemu_ram_alloc: Add DeviceState and name parameters, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 10/16] ramblocks: Make use of DeviceState pointer and BusInfo.get_dev_path, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 11/16] savevm: Migrate RAM based on name/offset, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 12/16] savevm: Use RAM blocks for basis of migration, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 14/16] qemu_ram_free: Implement it,
Alex Williamson <=
- [Qemu-devel] [PATCH v3 13/16] savevm: Create a new continue flag to avoid resending block name, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 15/16] pci: Free the space allocated for the option rom on removal, Alex Williamson, 2010/07/02
- [Qemu-devel] [PATCH v3 16/16] ramblocks: No more being lazy about duplicate names, Alex Williamson, 2010/07/02