[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/8] xbzrle: Drop unused cache_resize()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 2/8] xbzrle: Drop unused cache_resize() |
Date: |
Wed, 6 Sep 2017 19:41:27 +0100 |
From: Markus Armbruster <address@hidden>
Unused since commit fd8cec XBZRLE: Fix qemu crash when resize the
xbzrle cache.
Cc: Juan Quintela <address@hidden>
Cc: "Dr. David Alan Gilbert" <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/page_cache.c | 56 --------------------------------------------------
migration/page_cache.h | 11 ----------
2 files changed, 67 deletions(-)
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 5f8578736e..ba984c4858 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -178,59 +178,3 @@ int cache_insert(PageCache *cache, uint64_t addr, const
uint8_t *pdata,
return 0;
}
-
-int64_t cache_resize(PageCache *cache, int64_t new_num_pages)
-{
- PageCache *new_cache;
- int64_t i;
-
- CacheItem *old_it, *new_it;
-
- g_assert(cache);
-
- /* cache was not inited */
- if (cache->page_cache == NULL) {
- return -1;
- }
-
- /* same size */
- if (pow2floor(new_num_pages) == cache->max_num_items) {
- return cache->max_num_items;
- }
-
- new_cache = cache_init(new_num_pages, cache->page_size);
- if (!(new_cache)) {
- DPRINTF("Error creating new cache\n");
- return -1;
- }
-
- /* move all data from old cache */
- for (i = 0; i < cache->max_num_items; i++) {
- old_it = &cache->page_cache[i];
- if (old_it->it_addr != -1) {
- /* check for collision, if there is, keep MRU page */
- new_it = cache_get_by_addr(new_cache, old_it->it_addr);
- if (new_it->it_data && new_it->it_age >= old_it->it_age) {
- /* keep the MRU page */
- g_free(old_it->it_data);
- } else {
- if (!new_it->it_data) {
- new_cache->num_items++;
- }
- g_free(new_it->it_data);
- new_it->it_data = old_it->it_data;
- new_it->it_age = old_it->it_age;
- new_it->it_addr = old_it->it_addr;
- }
- }
- }
-
- g_free(cache->page_cache);
- cache->page_cache = new_cache->page_cache;
- cache->max_num_items = new_cache->max_num_items;
- cache->num_items = new_cache->num_items;
-
- g_free(new_cache);
-
- return cache->max_num_items;
-}
diff --git a/migration/page_cache.h b/migration/page_cache.h
index 10ed53274c..4fadd0c501 100644
--- a/migration/page_cache.h
+++ b/migration/page_cache.h
@@ -72,15 +72,4 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t
addr);
int cache_insert(PageCache *cache, uint64_t addr, const uint8_t *pdata,
uint64_t current_age);
-/**
- * cache_resize: resize the page cache. In case of size reduction the extra
- * pages will be freed
- *
- * Returns -1 on error new cache size on success
- *
- * @cache pointer to the PageCache struct
- * @num_pages: new page cache size (in pages)
- */
-int64_t cache_resize(PageCache *cache, int64_t num_pages);
-
#endif
--
2.13.5
- [Qemu-devel] [PULL 0/8] migration queue, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 1/8] migration: Report when bdrv_inactivate_all fails, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 3/8] host-utils: Proactively fix pow2floor(), switch to unsigned, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 4/8] host-utils: Simplify pow2ceil(), Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 2/8] xbzrle: Drop unused cache_resize(),
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 5/8] runstate/migrate: Two more transitions, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 7/8] snapshot/tests: Try loadvm twice, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 6/8] migration: Reset rather than destroy main_thread_load_event, Dr. David Alan Gilbert (git), 2017/09/06
- [Qemu-devel] [PULL 8/8] migration: dump str in migrate_set_state trace, Dr. David Alan Gilbert (git), 2017/09/06
- Re: [Qemu-devel] [PULL 0/8] migration queue, Peter Maydell, 2017/09/07