Signed-off-by: Devin Nakamura
---
block/qed.c | 29 +
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 93827db..4cde2fd 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1512,6 +1512,34 @@ static int
Signed-off-by: Devin Nakamura
---
block/qed.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 624e261..16320f5 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1444,6 +1444,18 @@ static int bdrv_qed_check(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block/qed.c | 29 +
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 93827db..4cde2fd 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1512,6 +1512,34 @@ static int
Signed-off-by: Devin Nakamura
---
block/qed.c | 47 +++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 4cde2fd..341cf9d 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1540,6 +1540,52 @@ static int
Signed-off-by: Devin Nakamura
---
block/qed.c | 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 341cf9d..caecdff 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1586,6 +1586,20 @@ static int bdrv_qed_map(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block/qed.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 624e261..16320f5 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1444,6 +1444,18 @@ static int bdrv_qed_check(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block/qed.c | 57 +
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 16320f5..93827db 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1456,6 +1456,62
Signed-off-by: Devin Nakamura
---
block/qed-cluster.c | 33 +
block/qed.h |4
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/block/qed-cluster.c b/block/qed-cluster.c
index f64b2af..6e68ba7 100644
--- a/block/qed-cluster.c
This patch series adds support for block conversion to the qed driver.
This depends on my precivious block conversion api series
Devin Nakamura (6):
qed: add qed_find_cluster_sync()
qed: add bdrv_qed_get_conversion_options()
qed: add open_conversion_target()
qed: add qed_bdrv_get_mapping
On Tue, Aug 23, 2011 at 12:27 AM, Devin Nakamura wrote:
> This patch series introduces the api to support block conversion.
>
> Devin Nakamura (7):
> block: add block conversion api
> block: make bdrv_open_common more ready to be called by
> bdrv_open_conversion_ta
Works fine for me
On Thu, Aug 25, 2011 at 5:33 AM, Stefan Hajnoczi
wrote:
> On Tue, Aug 23, 2011 at 02:38:00PM +0200, Kevin Wolf wrote:
>> Am 16.08.2011 01:16, schrieb Devin Nakamura:
>> > Signed-off-by: Devin Nakamura
>> > ---
>> > block/qed.c | 2 ++
Signed-off-by: Devin Nakamura
---
block.c | 26 ++
block.h |5 +
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index a3ea039..5ca396b 100644
--- a/block.c
+++ b/block.c
@@ -3282,6 +3282,32 @@ out:
return ret;
}
+int
Signed-off-by: Devin Nakamura
---
block.c | 15 +++
block.h |2 ++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 5ca396b..ed62c4a 100644
--- a/block.c
+++ b/block.c
@@ -3320,3 +3320,18 @@ int bdrv_get_conversion_options
Signed-off-by: Devin Nakamura
---
block.c | 14 ++
block.h |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index ed62c4a..aff1d34 100644
--- a/block.c
+++ b/block.c
@@ -3335,3 +3335,17 @@ int bdrv_get_mapping(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block.c | 13 +
block.h |2 ++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index ac5a103..a3ea039 100644
--- a/block.c
+++ b/block.c
@@ -3281,3 +3281,16 @@ out:
return ret;
}
+
+int
Signed-off-by: Devin Nakamura
---
block.c | 41 +
block.h |2 ++
2 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index aff1d34..76bd2e9 100644
--- a/block.c
+++ b/block.c
@@ -3349,3 +3349,44 @@ int bdrv_map
add functions to block driver interface to support inplace image conversion
Signed-off-by: Devin Nakamura
---
block.h |3 ++
block_int.h | 82 +++
2 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/block.h b/block.h
Signed-off-by: Devin Nakamura
---
block.c | 18 --
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index a8a013a..ac5a103 100644
--- a/block.c
+++ b/block.c
@@ -441,14 +441,17 @@ static int refresh_total_sectors(BlockDriverState *bs,
int64_t
This patch series introduces the api to support block conversion.
Devin Nakamura (7):
block: add block conversion api
block: make bdrv_open_common more ready to be called by
bdrv_open_conversion_target
block: add bdrv_get_conversion_options()
block: add bdrv_open_conversion_target
On Tue, Aug 16, 2011 at 12:22 PM, Stefan Hajnoczi wrote:
> On Mon, Aug 15, 2011 at 07:16:10PM -0400, Devin Nakamura wrote:
>> @@ -263,6 +263,8 @@ static int qed_read_string(BlockDriverState *file,
>> uint64_t offset, size_t n,
>> */
>> static uint64_t qed_all
Signed-off-by: Devin Nakamura
---
block/qed.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 333f067..9a1e49c 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -263,6 +263,8 @@ static int qed_read_string(BlockDriverState *file, uint64_t
Documentation states the num is measured in clusters, but its
actually measured in sectors
Signed-off-by: Devin Nakamura
---
block/qcow2-cluster.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 81cf77d..154597e
On Mon, Aug 1, 2011 at 9:34 AM, Kevin Wolf wrote:
>> + /**
>> + * Gets a mapping in the image file.
>> + *
>> + * The function starts searching for a mapping at
>> + * starting_guest_offset = guest_offset + contiguous_bytes
>> + *
>> + * @param bs[in] T
On Mon, Aug 1, 2011 at 11:26 AM, Kevin Wolf wrote:
> Am 29.07.2011 06:49, schrieb Devin Nakamura:
>> Still in very raw form. Not likely to work yet
>>
>> Signed-off-by: Devin Nakamura
>
> I don't think it's quite as easy.
>
> The problem is that qcow2
On Mon, Aug 1, 2011 at 11:38 AM, Kevin Wolf wrote:
> Am 29.07.2011 06:49, schrieb Devin Nakamura:
>> bdrv_get_mapping will be used when it is defined,
>> otherwise default to old behaviour.
>>
>> Signed-off-by: Devin Nakamura
>
> Hm, I think I would use a new co
Fuction to get drive mapping from qed images
Signed-off-by: Devin Nakamura
---
block/qed.c | 32
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 00cf895..dadb7f8 100644
--- a/block/qed.c
+++ b/block/qed.c
Still in very raw form. Not likely to work yet
Signed-off-by: Devin Nakamura
---
block/qcow2.c | 124 +
1 files changed, 124 insertions(+), 0 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 86df65d..f1e1e12 100644
--- a
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
Signed-off-by: Devin Nakamura
---
block/qed.c | 16
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index b05224a..556512b 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1579,6 +1579,21 @@ static int bdrv_qed_map(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block/qcow2.c | 24 +---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 3bb28d2..86df65d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1427,6 +1427,23 @@ static int
Documentation states the num is measured in clusters, but its
actually measured in sectors
Signed-off-by: Devin Nakamura
---
block/qcow2-cluster.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 882f50a..ca56918
Conflicts:
block.h
Signed-off-by: Devin Nakamura
---
block.c | 29 +
block.h |2 ++
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 9530577..d0019c4 100644
--- a/block.c
+++ b/block.c
@@ -3082,3 +3082,32 @@ int
Signed-off-by: Devin Nakamura
---
block/qcow2-refcount.c | 39 +--
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 14b2f67..75f1f88 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2
Signed-off-by: Devin Nakamura
---
block/qed.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 556512b..26e43e2 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1594,6 +1594,18 @@ static int bdrv_qed_copy_header(BlockDriverState
Signed-off-by: Devin Nakamura
---
block.c | 14 ++
block.h |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index d0019c4..98a9491 100644
--- a/block.c
+++ b/block.c
@@ -3111,3 +3111,17 @@ int bdrv_get_mapping(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block.c | 12
block.h |2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 98a9491..28b4418 100644
--- a/block.c
+++ b/block.c
@@ -3125,3 +3125,15 @@ int bdrv_map(BlockDriverState *bs, uint64_t
Signed-off-by: Devin Nakamura
---
block/qed.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 3970379..00cf895 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -263,6 +263,9 @@ static int qed_read_string(BlockDriverState *file, uint64_t
bdrv_get_mapping will be used when it is defined,
otherwise default to old behaviour.
Signed-off-by: Devin Nakamura
---
qemu-io.c | 23 ++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index a553d0c..caf51fe 100644
--- a/qemu-io.c
Signed-off-by: Devin Nakamura
---
block/qcow2.c | 36
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 48e1b95..05ea40c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1340,6 +1340,40 @@ static int
Signed-off-by: Devin Nakamura
---
block/qed-cluster.c | 35 +++
block/qed.h |4
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/block/qed-cluster.c b/block/qed-cluster.c
index 3e19ad1..063b965 100644
--- a/block/qed-cluster.c
Signed-off-by: Devin Nakamura
---
Makefile |2 +
qemu-img-cmds.hx |6 +
qemu-img.c | 64 ++
3 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index daa3aa0..243c818 100644
--- a
Signed-off-by: Devin Nakamura
---
qemu-io.c | 24
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index caf51fe..a49f62a 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -1601,6 +1601,29 @@ static const cmdinfo_t map_cmd
Signed-off-by: Devin Nakamura
---
block/qcow2.c | 54 ++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index b75364d..3bb28d2 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1374,6 +1374,59
Signed-off-by: Devin Nakamura
---
block/qcow2-cluster.c | 49 +
block/qcow2.c |1 +
block/qcow2.h |3 +++
3 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index
Signed-off-by: Devin Nakamura
---
block/qcow2-refcount.c | 34 ++
block/qcow2.h |2 ++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 75f1f88..2f78a71 100644
--- a/block/qcow2
Signed-off-by: Devin Nakamura
---
block/qed.c | 86 +++---
1 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index daf82fd..b05224a 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1451,6 +1451,57
Signed-off-by: Devin Nakamura
---
block.c | 13 +
block.h |2 ++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 9549b9e..4503b7b 100644
--- a/block.c
+++ b/block.c
@@ -3037,3 +3037,16 @@ out:
return ret;
}
+
+int
Conflicts:
block.h
Signed-off-by: Devin Nakamura
---
block.c | 32
block.h |4
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 4503b7b..9530577 100644
--- a/block.c
+++ b/block.c
@@ -3038,6 +3038,38
add functions to block driver interface to support inplace image conversion
Signed-off-by: Devin Nakamura
---
block.h |2 +
block_int.h | 88 +++
2 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/block.h b/block.h
the
image.
I've integerated inplace conversion into qemu-img in the form:
qemu-img convert-inplace
I've also integrated bdrv_get_mapping and bdrv_map into qemu-io (with the
former replacing qemu-io's
internal mapping when then block driver supports it)
Devin Nakamura (24):
bl
Signed-off-by: Devin Nakamura
---
block.c | 14 ++
block.h |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index cda600b..86a4752 100644
--- a/block.c
+++ b/block.c
@@ -3091,3 +3091,17 @@ int bdrv_get_mapping(BlockDriverState *bs
Conflicts:
block.h
Signed-off-by: Devin Nakamura
---
block.c | 29 +
block.h |2 ++
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 7d3bc67..cda600b 100644
--- a/block.c
+++ b/block.c
@@ -3062,3 +3062,32 @@ int
Conflicts:
block.h
Signed-off-by: Devin Nakamura
---
block.c | 31 +++
block.h |3 +++
2 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 5c0ba2d..7d3bc67 100644
--- a/block.c
+++ b/block.c
@@ -3019,6 +3019,37
add functions to block driver interface to support inplace image conversion
Signed-off-by: Devin Nakamura
---
block_int.h | 70 +++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/block_int.h b/block_int.h
index 1e265d2
Signed-off-by: Devin Nakamura
---
block.c | 12
block.h |2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 86a4752..0f38aff 100644
--- a/block.c
+++ b/block.c
@@ -3105,3 +3105,15 @@ int bdrv_map(BlockDriverState *bs, uint64_t
Signed-off-by: Devin Nakamura
---
block.c | 13 +
block.h |2 ++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 24a25d5..5c0ba2d 100644
--- a/block.c
+++ b/block.c
@@ -3018,3 +3018,16 @@ out:
return ret;
}
+
+int
Signed-off-by: Devin Nakamura
---
block.c | 14 ++
block.h |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 97d5a6b..3874ed5 100644
--- a/block.c
+++ b/block.c
@@ -3037,3 +3037,17 @@ int bdrv_open_conversion_target(BlockDriverState
Signed-off-by: Devin Nakamura
---
block.c | 14 ++
block.h |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 3874ed5..39510cb 100644
--- a/block.c
+++ b/block.c
@@ -3051,3 +3051,17 @@ int bdrv_get_mapping(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block.c | 12
block.h |2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 39510cb..69a3e13 100644
--- a/block.c
+++ b/block.c
@@ -3065,3 +3065,15 @@ int bdrv_map(BlockDriverState *bs, uint64_t
Fix a bug caused by lack of braces in if statement
Lack of braces means that if(count & 0x1ff) is never reached
Conflicts:
qemu-io.c
Signed-off-by: Devin Nakamura
---
qemu-io.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
i
Fix a bug caused by lack of braces in if statement
Lack of braces means that if(count & 0x1ff) is never reached
Conflicts:
qemu-io.c
Signed-off-by: Devin Nakamura
---
qemu-io.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
i
Signed-off-by: Devin Nakamura
---
block.c | 12
block.h |2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index e7699a6..302b0d5 100644
--- a/block.c
+++ b/block.c
@@ -3037,3 +3037,15 @@ int bdrv_open_conversion_target(BlockDriverState
add functions to block driver interface to support inplace image conversion
Signed-off-by: Devin Nakamura
---
block_int.h | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/block_int.h b/block_int.h
index 1e265d2..ef311c7 100644
--- a/block_int.h
+++ b
Signed-off-by: Devin Nakamura
---
block.c | 12
block.h |2 ++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 302b0d5..c9ea201 100644
--- a/block.c
+++ b/block.c
@@ -3049,3 +3049,15 @@ int bdrv_get_mapping(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block.c | 19 +++
block.h |2 ++
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 24a25d5..e7699a6 100644
--- a/block.c
+++ b/block.c
@@ -3018,3 +3018,22 @@ out:
return ret;
}
+
+
+int
Signed-off-by: Devin Nakamura
---
block.c | 10 ++
block.h |2 ++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index c9ea201..c6c36e7 100644
--- a/block.c
+++ b/block.c
@@ -3061,3 +3061,13 @@ int bdrv_map(BlockDriverState *bs, uint64_t
Fix a bug caused by lack of braces in if statement
Signed-off-by: Devin Nakamura
---
qemu-io.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 53adb76..1c4f684 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -433,12 +433,12 @@ static int read_f
Signed-off-by: Devin Nakamura
---
block.h |6 +++---
block_int.h |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.h b/block.h
index da7d39c..859d1d9 100644
--- a/block.h
+++ b/block.h
@@ -110,7 +110,7 @@ int bdrv_check(BlockDriverState *bs
Signed-off-by: Devin Nakamura
---
block.h |6 +++---
block_int.h |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.h b/block.h
index da7d39c..859d1d9 100644
--- a/block.h
+++ b/block.h
@@ -110,7 +110,7 @@ int bdrv_check(BlockDriverState *bs
69 matches
Mail list logo