diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-27 11:25:23 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-27 11:25:23 -0500 |
| commit | bb820c03e2d638038fd48f42ee71e4004e55aba8 (patch) | |
| tree | 43266acaef2a63fcd06de565a42c264a4f71e95f /qemu-img.c | |
| parent | 2fb0c09f4ff036f68474277ed4edc036f6529de8 (diff) | |
| parent | 20fa53ece42bec6ce5db801bead125277b26ab8a (diff) | |
| download | focaccia-qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.tar.gz focaccia-qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qemu-img.c b/qemu-img.c index 4f162d1abe..32628b3110 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -304,11 +304,11 @@ static int img_create(int argc, char **argv) fmt = optarg; break; case 'e': - error_report("qemu-img: option -e is deprecated, please use \'-o " + error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); return 1; case '6': - error_report("qemu-img: option -6 is deprecated, please use \'-o " + error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); return 1; case 'o': @@ -633,11 +633,11 @@ static int img_convert(int argc, char **argv) compress = 1; break; case 'e': - error_report("qemu-img: option -e is deprecated, please use \'-o " + error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); return 1; case '6': - error_report("qemu-img: option -6 is deprecated, please use \'-o " + error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); return 1; case 'o': @@ -690,12 +690,12 @@ static int img_convert(int argc, char **argv) if (snapshot_name != NULL) { if (bs_n > 1) { - error_report("No support for concatenating multiple snapshot\n"); + error_report("No support for concatenating multiple snapshot"); ret = -1; goto out; } if (bdrv_snapshot_load_tmp(bs[0], snapshot_name) < 0) { - error_report("Failed to load snapshot\n"); + error_report("Failed to load snapshot"); ret = -1; goto out; } |