[Qemu-devel] [RFC 10/24] qed: add qed_bdrv_map()

[Devin Nakamura <devin122@gmail.com>]

Conflicts:

	block_int.h

Signed-off-by: Devin Nakamura <devin122@gmail.com>
---
 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