From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1o-0001u0-Ub for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf1n-0000Qd-Mf for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:28 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:46817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1n-0000NN-Gs for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:27 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:27 -0700 (PDT) From: Devin Nakamura Date: Fri, 29 Jul 2011 00:49:40 -0400 Message-Id: <1311914994-20482-11-git-send-email-devin122@gmail.com> In-Reply-To: <1311914994-20482-1-git-send-email-devin122@gmail.com> References: <1311914994-20482-1-git-send-email-devin122@gmail.com> Subject: [Qemu-devel] [RFC 10/24] qed: add qed_bdrv_map() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Devin Nakamura Conflicts: block_int.h Signed-off-by: Devin Nakamura --- block.c | 4 ++-- block.h | 4 ++-- block/qed.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 28b4418..dca3687 100644 --- a/block.c +++ b/block.c @@ -3112,8 +3112,8 @@ int bdrv_get_mapping(BlockDriverState *bs, uint64_t *guest_offset, contiguous_bytes); } -int bdrv_map(BlockDriverState *bs, uint64_t *guest_offset, - uint64_t *host_offset, uint64_t *contiguous_bytes) +int bdrv_map(BlockDriverState *bs, uint64_t guest_offset, + uint64_t host_offset, uint64_t contiguous_bytes) { BlockDriver *drv = bs->drv; if (!drv) { diff --git a/block.h b/block.h index 2426b62..e0580f0 100644 --- a/block.h +++ b/block.h @@ -261,8 +261,8 @@ int bdrv_open_conversion_target(BlockDriverState **bs, BlockDriverState *file, const char *target_fmt); int bdrv_get_mapping(BlockDriverState *bs, uint64_t *guest_offset, uint64_t *host_offset, uint64_t *contiguous_bytes); -int bdrv_map(BlockDriverState *bs, uint64_t *guest_offset, - uint64_t *host_offset, uint64_t *contiguous_bytes); +int bdrv_map(BlockDriverState *bs, uint64_t guest_offset, + uint64_t host_offset, uint64_t contiguous_bytes); int bdrv_copy_header(BlockDriverState *bs); typedef enum { diff --git a/block/qed.c b/block/qed.c index dadb7f8..daf82fd 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1482,6 +1482,52 @@ static int bdrv_qed_get_mapping(BlockDriverState *bs, uint64_t *guest_offset, return 0; } +static int bdrv_qed_map(BlockDriverState *bs, uint64_t guest_offset, + uint64_t host_offset, uint64_t contiguous_bytes) +{ + BDRVQEDState* s = bs->opaque; + if(guest_offset != qed_start_of_cluster(s, guest_offset)){ + return -EINVAL; + } + + if(contiguous_bytes % s->header.cluster_size != 0){ + return -EINVAL; + } + + while(contiguous_bytes > 0){ + uint64_t l1_index, l2_index, first_l2; + int ret; + QEDRequest req = {.l2_table = NULL}; + + + l1_index = qed_l1_index(s, guest_offset); + l2_index = qed_l2_index(s, guest_offset); + first_l2 = l2_index; + if(!s->l1_table->offsets[l1_index]){ + CachedL2Table * table = qed_new_l2_table(s); + s->l1_table->offsets[l1_index] = table->offset; + qed_write_l1_table_sync(s, l1_index, 1); + qed_commit_l2_cache_entry(&s->l2_cache, table); + } + + ret = qed_read_l2_table_sync(s, &req, s->l1_table->offsets[l1_index]); + if(ret){ + return ret; + } + + for(;l2_index < s->table_nelems && contiguous_bytes > 0; l2_index++){ + req.l2_table->table->offsets[l2_index] = host_offset; + host_offset += s->header.cluster_size; + contiguous_bytes -= s->header.cluster_size; + } + + ret = qed_write_l2_table_sync(s, &req, 0, s->table_nelems, true); + qed_unref_l2_cache_entry(req.l2_table); + + } + return 0; +} + static QEMUOptionParameter qed_create_options[] = { { .name = BLOCK_OPT_SIZE, @@ -1529,6 +1575,7 @@ static BlockDriver bdrv_qed = { .bdrv_change_backing_file = bdrv_qed_change_backing_file, .bdrv_check = bdrv_qed_check, .bdrv_get_mapping = bdrv_qed_get_mapping, + .bdrv_map = bdrv_qed_map, }; static void bdrv_qed_init(void) -- 1.7.6.rc1