On 11/25/2015 10:05 PM, Fam Zheng wrote: > The "flags" bit mask is expanded to two booleans, "data" and "zero"; > "bs" is replaced with "filename" string. > > Refactor the merge conditions in img_map() into entry_mergable(). s/mergable/mergeable/ here and in the patch body > > Signed-off-by: Fam Zheng > --- > qapi/block-core.json | 27 ++++++++++++++++++++ > qemu-img.c | 71 +++++++++++++++++++++++++++++++--------------------- > 2 files changed, 69 insertions(+), 29 deletions(-) > With the spelling fix, Reviewed-by: Eric Blake -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org