aboutsummaryrefslogtreecommitdiff
path: root/page_cache.c
diff options
context:
space:
mode:
authorOrit Wasserman <owasserm@redhat.com>2014-01-30 20:08:38 +0200
committerJuan Quintela <quintela@redhat.com>2014-02-04 16:50:37 +0100
commit89db9987c07977bdb78d5d4b41d65e7acb9a5a2c (patch)
tree0da66555ff71ef4486679a0493d2ee632c4d6bcc /page_cache.c
parenta17b2fd3580d1da96e806c8b58e61255e8c57577 (diff)
downloadqemu-arm-89db9987c07977bdb78d5d4b41d65e7acb9a5a2c.tar.gz
Don't abort on memory allocation error
It is better to fail migration in case of failure to allocate new cache item Signed-off-by: Orit Wasserman <owasserm@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'page_cache.c')
-rw-r--r--page_cache.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/page_cache.c b/page_cache.c
index 62a53f8c89..3ef6ee7ad2 100644
--- a/page_cache.c
+++ b/page_cache.c
@@ -150,7 +150,7 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t addr)
return cache_get_by_addr(cache, addr)->it_data;
}
-void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata)
+int cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata)
{
CacheItem *it = NULL;
@@ -161,16 +161,22 @@ void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata)
/* actual update of entry */
it = cache_get_by_addr(cache, addr);
- /* free old cached data if any */
- g_free(it->it_data);
-
+ /* allocate page */
if (!it->it_data) {
+ it->it_data = g_try_malloc(cache->page_size);
+ if (!it->it_data) {
+ DPRINTF("Error allocating page\n");
+ return -1;
+ }
cache->num_items++;
}
- it->it_data = g_memdup(pdata, cache->page_size);
+ memcpy(it->it_data, pdata, cache->page_size);
+
it->it_age = ++cache->max_item_age;
it->it_addr = addr;
+
+ return 0;
}
int64_t cache_resize(PageCache *cache, int64_t new_num_pages)