From 7b4c4781e390a041fa0ef70817678f1b97fc6db6 Mon Sep 17 00:00:00 2001 From: Wenchao Xia Date: Wed, 4 Dec 2013 17:10:54 +0800 Subject: snapshot: distinguish id and name in load_tmp Since later this function will be used so improve it. The only caller of it now is qemu-img, and it is not impacted by introduce function bdrv_snapshot_load_tmp_by_id_or_name() that call bdrv_snapshot_load_tmp() twice to keep old search logic. bdrv_snapshot_load_tmp_by_id_or_name() return int to let caller know the errno, and errno will be used later. Also fix a typo in comments of bdrv_snapshot_delete(). Signed-off-by: Wenchao Xia Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'qemu-img.c') diff --git a/qemu-img.c b/qemu-img.c index dc0c2f0ed3..685c566d22 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1264,8 +1264,12 @@ static int img_convert(int argc, char **argv) ret = -1; goto out; } - if (bdrv_snapshot_load_tmp(bs[0], snapshot_name) < 0) { - error_report("Failed to load snapshot"); + + bdrv_snapshot_load_tmp_by_id_or_name(bs[0], snapshot_name, &local_err); + if (error_is_set(&local_err)) { + error_report("Failed to load snapshot: %s", + error_get_pretty(local_err)); + error_free(local_err); ret = -1; goto out; } -- cgit v1.2.1