include/block/snapshot.h | 6 +++-- block.c | 62 ++++++++++++++++++++++++---------------------- block/block-backend.c | 10 +++++--- block/snapshot.c | 45 +++++++++++++++++---------------- migration/savevm.c | 6 ++--- qemu-img.c | 6 ++--- tests/qemu-iotests/060 | 13 ++++++++++ tests/qemu-iotests/060.out | 12 +++++++++ tests/qemu-iotests/176 | 3 ++- tests/qemu-iotests/176.out | 8 +++--- 10 files changed, 103 insertions(+), 68 deletions(-)