On Wed, Dec 07, 2016 at 03:34:58PM +0100, Pino Toscano wrote:
On Wednesday, 7 December 2016 10:02:49 CET Richard W.M. Jones wrote:
Support for RHEV with RHEL 6 nodes required us to output the old style qcow2 compat=0.10 images. Since RHEV 3.6 GA, RHEL 6 has not been supported as a RHEV node type. Since RHV 4.1, compat=1.1 is supported. (Support for compat=1.1 is uncertain in RHV 4.0 even on RHEL 7 nodes.)
There are significant downsides to using qcow2 compat=0.10 instead of the modern default (compat=1.1).
Therefore this patch does two things:
For -o rhev, it drops support for compat=0.10 completely. You must use RHV 4.1.
For -o vdsm, it adds an interim flag (--vdsm-compat=0.10 or --vdsm-compat=1.1) which controls the compat level of the qcow2 output file. VDSM should use --vdsm-compat=1.1 when it is known that modern qemu is available. We can make this the default later when all RHV instances have moved to 4.1.
It also adds:
vdsm-compat-option
to the `virt-v2v --machine-readable' output to indicate that this flag can be used.
Thanks: Yaniv Kaul, Michal Skrivanek. ---
LGTM, just one note below.
diff --git a/v2v/test-v2v-o-vdsm-options.sh b/v2v/test-v2v-o-vdsm-options.sh index 3b7eaae..1de0e17 100755 --- a/v2v/test-v2v-o-vdsm-options.sh +++ b/v2v/test-v2v-o-vdsm-options.sh @@ -21,6 +21,7 @@ unset CDPATH export LANG=C set -e +set -x
This should be left out, I guess.
I added it so I could see why the test was failing during my tests. I think we should leave it (it doesn't have any effect unless the test fails, and then it's very useful). Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW