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 <f...@redhat.com> > > 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 it and it's straightforward. I'll send v14 basing off your block-next, once you've done reviewing. For now, the rebased branch, including the two small fixes, is pushed to my github branch: git://github.com/famz/qemu.git image-lock Fam