{"id":810761,"url":"http://patchwork.ozlabs.org/api/patches/810761/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906184133.25524-3-dgilbert@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906184133.25524-3-dgilbert@redhat.com>","list_archive_url":null,"date":"2017-09-06T18:41:27","name":"[PULL,2/8] xbzrle: Drop unused cache_resize()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"966c75e4e72b7a06a97163c8c6f027e8b6dbdef8","submitter":{"id":48102,"url":"http://patchwork.ozlabs.org/api/people/48102/?format=json","name":"Dr. David Alan Gilbert","email":"dgilbert@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906184133.25524-3-dgilbert@redhat.com/mbox/","series":[{"id":1865,"url":"http://patchwork.ozlabs.org/api/series/1865/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1865","date":"2017-09-06T18:41:26","name":"[PULL,1/8] migration: Report when bdrv_inactivate_all fails","version":1,"mbox":"http://patchwork.ozlabs.org/series/1865/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810761/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810761/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=dgilbert@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnXWX1jX6z9t2W\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu,  7 Sep 2017 04:42:32 +1000 (AEST)","from localhost ([::1]:37466 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dpfHS-000323-7M\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 14:42:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57661)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <dgilbert@redhat.com>) id 1dpfGm-00030C-J3\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:41:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <dgilbert@redhat.com>) id 1dpfGh-0001eM-VW\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:41:48 -0400","from mx1.redhat.com ([209.132.183.28]:45694)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <dgilbert@redhat.com>) id 1dpfGh-0001cc-NA\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:41:43 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id A894FC049E31\n\tfor <qemu-devel@nongnu.org>; Wed,  6 Sep 2017 18:41:42 +0000 (UTC)","from dgilbert-t530.redhat.com (ovpn-117-207.ams2.redhat.com\n\t[10.36.117.207])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7F5B861F21;\n\tWed,  6 Sep 2017 18:41:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A894FC049E31","From":"\"Dr. David Alan Gilbert (git)\" <dgilbert@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Wed,  6 Sep 2017 19:41:27 +0100","Message-Id":"<20170906184133.25524-3-dgilbert@redhat.com>","In-Reply-To":"<20170906184133.25524-1-dgilbert@redhat.com>","References":"<20170906184133.25524-1-dgilbert@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 06 Sep 2017 18:41:42 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 2/8] xbzrle: Drop unused cache_resize()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"kwolf@redhat.com, armbru@redhat.com, peterx@redhat.com,\n\tquintela@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Markus Armbruster <armbru@redhat.com>\n\nUnused since commit fd8cec XBZRLE: Fix qemu crash when resize the\nxbzrle cache.\n\nCc: Juan Quintela <quintela@redhat.com>\nCc: \"Dr. David Alan Gilbert\" <dgilbert@redhat.com>\nReviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>\nReviewed-by: Eric Blake <eblake@redhat.com>\nReviewed-by: Amit Shah <amit.shah@redhat.com>\nReviewed-by: Juan Quintela <quintela@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <1501148776-16890-2-git-send-email-armbru@redhat.com>\nSigned-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>\n---\n migration/page_cache.c | 56 --------------------------------------------------\n migration/page_cache.h | 11 ----------\n 2 files changed, 67 deletions(-)","diff":"diff --git a/migration/page_cache.c b/migration/page_cache.c\nindex 5f8578736e..ba984c4858 100644\n--- a/migration/page_cache.c\n+++ b/migration/page_cache.c\n@@ -178,59 +178,3 @@ int cache_insert(PageCache *cache, uint64_t addr, const uint8_t *pdata,\n \n     return 0;\n }\n-\n-int64_t cache_resize(PageCache *cache, int64_t new_num_pages)\n-{\n-    PageCache *new_cache;\n-    int64_t i;\n-\n-    CacheItem *old_it, *new_it;\n-\n-    g_assert(cache);\n-\n-    /* cache was not inited */\n-    if (cache->page_cache == NULL) {\n-        return -1;\n-    }\n-\n-    /* same size */\n-    if (pow2floor(new_num_pages) == cache->max_num_items) {\n-        return cache->max_num_items;\n-    }\n-\n-    new_cache = cache_init(new_num_pages, cache->page_size);\n-    if (!(new_cache)) {\n-        DPRINTF(\"Error creating new cache\\n\");\n-        return -1;\n-    }\n-\n-    /* move all data from old cache */\n-    for (i = 0; i < cache->max_num_items; i++) {\n-        old_it = &cache->page_cache[i];\n-        if (old_it->it_addr != -1) {\n-            /* check for collision, if there is, keep MRU page */\n-            new_it = cache_get_by_addr(new_cache, old_it->it_addr);\n-            if (new_it->it_data && new_it->it_age >= old_it->it_age) {\n-                /* keep the MRU page */\n-                g_free(old_it->it_data);\n-            } else {\n-                if (!new_it->it_data) {\n-                    new_cache->num_items++;\n-                }\n-                g_free(new_it->it_data);\n-                new_it->it_data = old_it->it_data;\n-                new_it->it_age = old_it->it_age;\n-                new_it->it_addr = old_it->it_addr;\n-            }\n-        }\n-    }\n-\n-    g_free(cache->page_cache);\n-    cache->page_cache = new_cache->page_cache;\n-    cache->max_num_items = new_cache->max_num_items;\n-    cache->num_items = new_cache->num_items;\n-\n-    g_free(new_cache);\n-\n-    return cache->max_num_items;\n-}\ndiff --git a/migration/page_cache.h b/migration/page_cache.h\nindex 10ed53274c..4fadd0c501 100644\n--- a/migration/page_cache.h\n+++ b/migration/page_cache.h\n@@ -72,15 +72,4 @@ uint8_t *get_cached_data(const PageCache *cache, uint64_t addr);\n int cache_insert(PageCache *cache, uint64_t addr, const uint8_t *pdata,\n                  uint64_t current_age);\n \n-/**\n- * cache_resize: resize the page cache. In case of size reduction the extra\n- * pages will be freed\n- *\n- * Returns -1 on error new cache size on success\n- *\n- * @cache pointer to the PageCache struct\n- * @num_pages: new page cache size (in pages)\n- */\n-int64_t cache_resize(PageCache *cache, int64_t num_pages);\n-\n #endif\n","prefixes":["PULL","2/8"]}