Commit d0834eb5 authored by Markus Armbruster's avatar Markus Armbruster Committed by Dr. David Alan Gilbert
Browse files

xbzrle: Drop unused cache_resize() 



Unused since commit fd8cec XBZRLE: Fix qemu crash when resize the
xbzrle cache.

Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1501148776-16890-2-git-send-email-armbru@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent c232bf58

migration/page_cache.c

+0 −56
Original line number Diff line number Diff line
@@ -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;

}

migration/page_cache.h

+0 −11
Original line number Diff line number Diff line
@@ -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