OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

page_cache: dup memory on insert

Browse Source 
The page cache frees all data on finish, on resize and
if there is collision on insert. So it should be the caches
responsibility to dup the data that is stored in the cache.

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Orit Wasserman <owasserm@redhat.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Lieven 2013-02-25 19:12:04 +02:00 committed by Juan Quintela
parent 32a1c08b60
commit ee0b44aa9d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch_init.c
View File

@ -293,8 +293,7 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data,
if (!cache_is_cached(XBZRLE.cache, current_addr)) { if (!cache_is_cached(XBZRLE.cache, current_addr)) {
if (!last_stage) { if (!last_stage) {
cache_insert(XBZRLE.cache, current_addr, cache_insert(XBZRLE.cache, current_addr, current_data);
g_memdup(current_data, TARGET_PAGE_SIZE));
} }
acct_info.xbzrle_cache_miss++; acct_info.xbzrle_cache_miss++;
return -1; return -1;

3
include/migration/page_cache.h
View File

@ -57,7 +57,8 @@ bool cache_is_cached(const PageCache *cache, uint64_t addr);
uint8_t *get_cached_data(const PageCache *cache, uint64_t addr); uint8_t *get_cached_data(const PageCache *cache, uint64_t addr);
/** /**
* cache_insert: insert the page into the cache. the previous value will be overwritten * cache_insert: insert the page into the cache. the page cache
* will dup the data on insert. the previous value will be overwritten
* *
* @cache pointer to the PageCache struct * @cache pointer to the PageCache struct
* @addr: page address * @addr: page address

2
page_cache.c
View File

@ -159,7 +159,7 @@ void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata)
cache->num_items++; cache->num_items++;
} }
it->it_data = pdata; it->it_data = g_memdup(pdata, cache->page_size);
it->it_age = ++cache->max_item_age; it->it_age = ++cache->max_item_age;
it->it_addr = addr; it->it_addr = addr;
} }