This fix was cherry picked from the qemu CVS via
cvs diff -r1.21 -r1.22 qemu-img.c
Signed-off-by: "Theodore Ts'o" <[EMAIL PROTECTED]>
---
qemu/qemu-img.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/qemu/qemu-img.c b/qemu/qemu-img.c
index d021082..b84b75b 100644
--- a/qemu/qemu-img.c
+++ b/qemu/qemu-img.c
@@ -269,9 +269,9 @@ static int img_create(int argc, char **argv)
case 'e':
flags |= BLOCK_FLAG_ENCRYPT;
break;
- case '6':
+ case '6':
flags |= BLOCK_FLAG_COMPAT6;
- break;
+ break;
}
}
if (optind >= argc)
@@ -471,7 +471,7 @@ static int img_convert(int argc, char **argv)
error("Compression not supported for this file format");
if (flags & BLOCK_FLAG_ENCRYPT && drv != &bdrv_qcow && drv != &bdrv_qcow2)
error("Encryption not supported for this file format");
- if (flags & BLOCK_FLAG_COMPRESS && drv != &bdrv_vmdk)
+ if (flags & BLOCK_FLAG_COMPAT6 && drv != &bdrv_vmdk)
error("Alternative compatibility level not supported for this file
format");
if (flags & BLOCK_FLAG_ENCRYPT && flags & BLOCK_FLAG_COMPRESS)
error("Compression and encryption not supported at the same time");
--
1.5.3.5.623.g91546-dirty
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
