From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0k-0002FB-3R for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqR0h-0006Aa-4D for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:46 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:56243 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0g-0006AR-Mn for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:43 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 2 Jan 2013 17:16:17 +0100 Message-Id: <1357143393-29832-15-git-send-email-benoit@irqsave.net> In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net> References: <1357143393-29832-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V4 14/30] qcow2-cache: Allow to choose table size at creation. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Benoit Canet --- block/qcow2-cache.c | 12 +++++++----- block/qcow2.c | 5 +++-- block/qcow2.h | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c index 2f3114e..83f2814 100644 --- a/block/qcow2-cache.c +++ b/block/qcow2-cache.c @@ -40,20 +40,22 @@ struct Qcow2Cache { struct Qcow2Cache* depends; int size; bool depends_on_flush; + int table_size; }; -Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables) +Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables, + int table_size) { - BDRVQcowState *s = bs->opaque; Qcow2Cache *c; int i; c = g_malloc0(sizeof(*c)); c->size = num_tables; c->entries = g_malloc0(sizeof(*c->entries) * num_tables); + c->table_size = table_size; for (i = 0; i < c->size; i++) { - c->entries[i].table = qemu_blockalign(bs, s->cluster_size); + c->entries[i].table = qemu_blockalign(bs, c->table_size); } return c; @@ -121,7 +123,7 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i) } ret = bdrv_pwrite(bs->file, c->entries[i].offset, c->entries[i].table, - s->cluster_size); + c->table_size); if (ret < 0) { return ret; } @@ -253,7 +255,7 @@ static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c, BLKDBG_EVENT(bs->file, BLKDBG_L2_LOAD); } - ret = bdrv_pread(bs->file, offset, c->entries[i].table, s->cluster_size); + ret = bdrv_pread(bs->file, offset, c->entries[i].table, c->table_size); if (ret < 0) { return ret; } diff --git a/block/qcow2.c b/block/qcow2.c index 9a7177b..499e939 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -450,8 +450,9 @@ static int qcow2_open(BlockDriverState *bs, int flags) } /* alloc L2 table/refcount block cache */ - s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE); - s->refcount_block_cache = qcow2_cache_create(bs, REFCOUNT_CACHE_SIZE); + s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE, s->cluster_size); + s->refcount_block_cache = qcow2_cache_create(bs, REFCOUNT_CACHE_SIZE, + s->cluster_size); s->cluster_cache = g_malloc(s->cluster_size); /* one more sector for decompressed data alignment */ diff --git a/block/qcow2.h b/block/qcow2.h index 9add0f1..4932750 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -440,7 +440,8 @@ void qcow2_free_snapshots(BlockDriverState *bs); int qcow2_read_snapshots(BlockDriverState *bs); /* qcow2-cache.c functions */ -Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables); +Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables, + int table_size); int qcow2_cache_destroy(BlockDriverState* bs, Qcow2Cache *c); void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table); -- 1.7.10.4