On Thu, 04/20 12:20, Kevin Wolf wrote:
> Am 20.04.2017 um 09:52 hat Fam Zheng geschrieben:
> > Signed-off-by: Fam Zheng
>
> This one conflicts with my block-next branch, probably Peter's
> simplification of img_convert().
Probably, thanks for pointing out. I've tried to resolve
Am 20.04.2017 um 09:52 hat Fam Zheng geschrieben:
> Signed-off-by: Fam Zheng
This one conflicts with my block-next branch, probably Peter's
simplification of img_convert().
Kevin
Signed-off-by: Fam Zheng
---
qemu-img.c | 148 +++--
1 file changed, 114 insertions(+), 34 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index b220cf7..b9dcd3e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -283,12