Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virt-v2v for openSUSE:Factory
checked in at 2022-01-08 23:23:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-v2v (Old)
and /work/SRC/openSUSE:Factory/.virt-v2v.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-v2v"
Sat Jan 8 23:23:46 2022 rev:4 rq:944822 version:1.44.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-v2v/virt-v2v.changes 2021-09-16
23:17:55.344000218 +0200
+++ /work/SRC/openSUSE:Factory/.virt-v2v.new.1892/virt-v2v.changes
2022-01-08 23:24:30.914275529 +0100
@@ -1,0 +2,8 @@
+Thu Jan 6 15:56:46 MST 2022 - carn...@suse.com
+
+- Update to version 1.44.2
+ * This is a bug fix release
+ virt-v2v-1.44.2.tar.gz.sig
+- Drop virt-v2v-1.44.0.tar.gz.sig
+
+-------------------------------------------------------------------
Old:
----
virt-v2v-1.44.0.tar.gz
virt-v2v-1.44.0.tar.gz.sig
New:
----
virt-v2v-1.44.2.tar.gz
virt-v2v-1.44.2.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-v2v.spec ++++++
--- /var/tmp/diff_new_pack.Q2cYfV/_old 2022-01-08 23:24:31.426275947 +0100
+++ /var/tmp/diff_new_pack.Q2cYfV/_new 2022-01-08 23:24:31.430275950 +0100
@@ -1,7 +1,7 @@
#
# spec file for package virt-v2v
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
# The source directory.
%global source_directory 1.44-stable
Name: virt-v2v
-Version: 1.44.0
+Version: 1.44.2
Release: 0
Summary: Tools to convert a virtual machine to run on KVM
License: GPL-2.0-or-later
@@ -56,6 +56,7 @@
BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: po4a
+BuildRequires: qemu-tools
BuildRequires: perl(Sys::Guestfs)
BuildRequires: pkgconfig(bash-completion) >= 2.0
Requires: %{_bindir}/gawk
++++++ virt-v2v-1.44.0.tar.gz -> virt-v2v-1.44.2.tar.gz ++++++
++++ 2161 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/configure.ac new/virt-v2v-1.44.2/configure.ac
--- old/virt-v2v-1.44.0/configure.ac 2021-04-30 16:44:43.184945250 +0200
+++ new/virt-v2v-1.44.2/configure.ac 2021-11-25 18:52:01.045621767 +0100
@@ -20,7 +20,7 @@
# freeform string.
m4_define([v2v_major], [1])
m4_define([v2v_minor], [44])
-m4_define([v2v_release], [0])
+m4_define([v2v_release], [2])
AC_INIT([virt-v2v],v2v_major.v2v_minor.v2v_release)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/docs/virt-v2v-input-vmware.pod
new/virt-v2v-1.44.2/docs/virt-v2v-input-vmware.pod
--- old/virt-v2v-1.44.0/docs/virt-v2v-input-vmware.pod 2021-01-19
10:36:45.739551937 +0100
+++ new/virt-v2v-1.44.2/docs/virt-v2v-input-vmware.pod 2021-11-23
11:32:59.410663709 +0100
@@ -522,6 +522,10 @@
Provisioning:
- Allow disk access
- Allow read-only disk access
+
+ Cryptographic operations:
+ - Decrypt
+ - Direct Access
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/docs/virt-v2v-output-rhv.pod
new/virt-v2v-1.44.2/docs/virt-v2v-output-rhv.pod
--- old/virt-v2v-1.44.0/docs/virt-v2v-output-rhv.pod 2020-04-02
14:21:53.277308477 +0200
+++ new/virt-v2v-1.44.2/docs/virt-v2v-output-rhv.pod 2021-11-23
11:32:59.436663443 +0100
@@ -125,8 +125,7 @@
=item *
-the specified UUIDs are used as they are, without checking whether
-they are already used by other disks
+the specified UUIDs must not conflict with the UUIDs of existing disks
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/docs/virt-v2v.pod new/virt-v2v-1.44.2/docs/virt-v2v.pod
--- old/virt-v2v-1.44.0/docs/virt-v2v.pod 2021-04-15 17:49:29.538038491
+0200
+++ new/virt-v2v-1.44.2/docs/virt-v2v.pod 2021-11-23 11:32:59.367664147
+0100
@@ -1324,7 +1324,7 @@
=item Linux root filesystem
-Minimum free space: 20 MB
+Minimum free space: 100 MB
=item Linux F</boot>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/m4/guestfs-c.m4 new/virt-v2v-1.44.2/m4/guestfs-c.m4
--- old/virt-v2v-1.44.0/m4/guestfs-c.m4 2021-04-14 13:04:20.479540217 +0200
+++ new/virt-v2v-1.44.2/m4/guestfs-c.m4 2021-11-23 11:34:36.153615997 +0100
@@ -30,7 +30,7 @@
AM_PROG_CC_C_O
AC_ARG_ENABLE([werror],
- [AS_HELP_STRING([--enable-error],
+ [AS_HELP_STRING([--enable-werror],
[turn on lots of GCC warnings (for developers)])],
[case $enableval in
yes|no) ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/m4/guestfs-ocaml.m4 new/virt-v2v-1.44.2/m4/guestfs-ocaml.m4
--- old/virt-v2v-1.44.0/m4/guestfs-ocaml.m4 2021-03-25 09:27:44.113106408
+0100
+++ new/virt-v2v-1.44.2/m4/guestfs-ocaml.m4 2021-11-23 11:34:16.106836591
+0100
@@ -184,7 +184,7 @@
])
dnl Flags we want to pass to every OCaml compiler call.
-OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX+52-3"
+OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/ocaml-dep.sh.in new/virt-v2v-1.44.2/ocaml-dep.sh.in
--- old/virt-v2v-1.44.0/ocaml-dep.sh.in 2021-03-16 15:38:29.196737435 +0100
+++ new/virt-v2v-1.44.2/ocaml-dep.sh.in 2021-11-23 11:32:59.398663831 +0100
@@ -42,8 +42,6 @@
common/mlv2v
common/mlvisit
common/mlxml
-customize
-ocaml
"
# Output file is always created in the current directory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/ocaml-link.sh new/virt-v2v-1.44.2/ocaml-link.sh
--- old/virt-v2v-1.44.0/ocaml-link.sh 2021-04-30 16:45:46.324378662 +0200
+++ new/virt-v2v-1.44.2/ocaml-link.sh 2021-11-25 18:52:50.626072474 +0100
@@ -50,11 +50,11 @@
-runtime-variant _pic \
-I +guestfs \
-linkpkg \
- -cclib "'-Wl,-z,relro -Wl,--as-needed -Wl,-z,now
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld $cclib'"
+ -cclib "'-Wl,-z,relro -Wl,--as-needed -Wl,-z,now
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld
-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 $cclib'"
fi
# NB -cclib must come last.
exec "$@" \
-runtime-variant _pic \
-I +guestfs \
-linkpkg \
- -cclib "-Wl,-z,relro -Wl,--as-needed -Wl,-z,now
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld $cclib"
+ -cclib "-Wl,-z,relro -Wl,--as-needed -Wl,-z,now
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld
-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 $cclib"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-copy-to-local.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-copy-to-local.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-copy-to-local.1 2021-04-30
16:45:58.840266359 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-copy-to-local.1 2021-11-25
18:53:05.726905172 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-copy-to-local 1"
-.TH virt-v2v-copy-to-local 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-copy-to-local 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-vmware.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-vmware.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-vmware.1 2021-04-30
16:45:58.896265857 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-vmware.1 2021-11-25
18:53:05.777904607 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-input-vmware 1"
-.TH virt-v2v-input-vmware 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-input-vmware 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -571,6 +571,10 @@
\& Provisioning:
\& \- Allow disk access
\& \- Allow read\-only disk access
+\&
+\& Cryptographic operations:
+\& \- Decrypt
+\& \- Direct Access
.Ve
.SS "vCenter: Firewall and proxy settings"
.IX Subsection "vCenter: Firewall and proxy settings"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-vmware.pod
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-vmware.pod
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-vmware.pod 2021-04-30
16:45:58.773266960 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-vmware.pod 2021-11-25
18:53:05.672905771 +0100
@@ -513,6 +513,10 @@
Provisioning:
- Allow disk access
- Allow read-only disk access
+
+ Cryptographic operations:
+ - Decrypt
+ - Direct Access
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-xen.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-xen.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-input-xen.1 2021-04-30
16:45:58.945265417 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-input-xen.1 2021-11-25
18:53:05.730905128 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-input-xen 1"
-.TH virt-v2v-input-xen 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-input-xen 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-local.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-local.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-local.1 2021-04-30
16:45:58.846266306 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-local.1 2021-11-25
18:53:05.740905017 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-local 1"
-.TH virt-v2v-output-local 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-local 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-openstack.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-openstack.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-openstack.1 2021-04-30
16:45:58.956265319 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-openstack.1 2021-11-25
18:53:05.744904973 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-openstack 1"
-.TH virt-v2v-output-openstack 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-openstack 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-rhv.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-rhv.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-rhv.1 2021-04-30
16:45:58.867266117 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-rhv.1 2021-11-25
18:53:05.748904929 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-rhv 1"
-.TH virt-v2v-output-rhv 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-rhv 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -184,8 +184,7 @@
you \fBmust\fR pass as many \fI\-oo rhv\-disk\-uuid=UUID\fR options as the
amount of
disks in the guest
.IP "\(bu" 4
-the specified UUIDs are used as they are, without checking whether they are
-already used by other disks
+the specified UUIDs must not conflict with the UUIDs of existing disks
.RE
.RS 4
.Sp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-rhv.pod
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-rhv.pod
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-output-rhv.pod 2021-04-30
16:45:58.754267131 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-output-rhv.pod 2021-11-25
18:53:05.654905970 +0100
@@ -123,8 +123,7 @@
=item *
-the specified UUIDs are used as they are, without checking whether they are
-already used by other disks
+the specified UUIDs must not conflict with the UUIDs of existing disks
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-support.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-support.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-support.1 2021-04-30
16:45:58.942265444 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-support.1 2021-11-25
18:53:05.735905073 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-support 1"
-.TH virt-v2v-support 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization Support"
+.TH virt-v2v-support 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-test-harness.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-test-harness.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v-test-harness.1 2021-04-30
16:45:59.003264897 +0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v-test-harness.1 2021-11-25
18:53:05.762904774 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-test-harness 1"
-.TH virt-v2v-test-harness 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-test-harness 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v.1
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v.1
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v.1 2021-04-30 16:45:58.979265112
+0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v.1 2021-11-25 18:53:05.862903666
+0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v 1"
-.TH virt-v2v 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization Support"
+.TH virt-v2v 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -1337,7 +1337,7 @@
perform the conversion. Currently it checks:
.IP "Linux root filesystem" 4
.IX Item "Linux root filesystem"
-Minimum free space: 20 \s-1MB\s0
+Minimum free space: 100 \s-1MB\s0
.IP "Linux \fI/boot\fR" 4
.IX Item "Linux /boot"
Minimum free space: 50 \s-1MB\s0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/ja/virt-v2v.pod
new/virt-v2v-1.44.2/po-docs/ja/virt-v2v.pod
--- old/virt-v2v-1.44.0/po-docs/ja/virt-v2v.pod 2021-04-30 16:45:58.838266377
+0200
+++ new/virt-v2v-1.44.2/po-docs/ja/virt-v2v.pod 2021-11-25 18:53:05.715905294
+0100
@@ -1287,7 +1287,7 @@
=item Linux root filesystem
-Minimum free space: 20 MB
+Minimum free space: 100 MB
=item Linux F</boot>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-copy-to-local.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-copy-to-local.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-copy-to-local.1 2021-04-30
16:45:59.594259595 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-copy-to-local.1 2021-11-25
18:53:06.282899013 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-copy-to-local 1"
-.TH virt-v2v-copy-to-local 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-copy-to-local 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-vmware.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-vmware.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-vmware.1 2021-04-30
16:45:59.551259981 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-vmware.1 2021-11-25
18:53:06.337898403 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-input-vmware 1"
-.TH virt-v2v-input-vmware 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-input-vmware 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -588,6 +588,10 @@
\& Provisioning:
\& \- Allow disk access
\& \- Allow read\-only disk access
+\&
+\& Cryptographic operations:
+\& \- Decrypt
+\& \- Direct Access
.Ve
.SS "vCenter: Firewall and proxy settings"
.IX Subsection "vCenter: Firewall and proxy settings"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-vmware.pod
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-vmware.pod
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-vmware.pod 2021-04-30
16:45:59.459260806 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-vmware.pod 2021-11-25
18:53:06.232899567 +0100
@@ -530,6 +530,10 @@
Provisioning:
- Allow disk access
- Allow read-only disk access
+
+ Cryptographic operations:
+ - Decrypt
+ - Direct Access
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-xen.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-xen.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-input-xen.1 2021-04-30
16:45:59.444260941 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-input-xen.1 2021-11-25
18:53:06.286898968 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-input-xen 1"
-.TH virt-v2v-input-xen 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-input-xen 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-local.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-local.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-local.1 2021-04-30
16:45:59.458260815 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-local.1 2021-11-25
18:53:06.305898758 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-local 1"
-.TH virt-v2v-output-local 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-local 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-openstack.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-openstack.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-openstack.1 2021-04-30
16:45:59.608259469 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-openstack.1 2021-11-25
18:53:06.300898813 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-openstack 1"
-.TH virt-v2v-output-openstack 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-openstack 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-rhv.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-rhv.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-rhv.1 2021-04-30
16:45:59.458260815 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-rhv.1 2021-11-25
18:53:06.305898758 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-output-rhv 1"
-.TH virt-v2v-output-rhv 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-output-rhv 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -184,8 +184,7 @@
you \fBmust\fR pass as many \fI\-oo rhv\-disk\-uuid=UUID\fR options as the
amount of
disks in the guest
.IP "\(bu" 4
-the specified UUIDs are used as they are, without checking whether they are
-already used by other disks
+the specified UUIDs must not conflict with the UUIDs of existing disks
.RE
.RS 4
.Sp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-rhv.pod
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-rhv.pod
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-output-rhv.pod 2021-04-30
16:45:59.375261560 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-output-rhv.pod 2021-11-25
18:53:06.207899843 +0100
@@ -123,8 +123,7 @@
=item *
-the specified UUIDs are used as they are, without checking whether they are
-already used by other disks
+the specified UUIDs must not conflict with the UUIDs of existing disks
=back
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-support.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-support.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-support.1 2021-04-30
16:45:59.625259317 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-support.1 2021-11-25
18:53:06.298898835 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-support 1"
-.TH virt-v2v-support 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization Support"
+.TH virt-v2v-support 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-test-harness.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-test-harness.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v-test-harness.1 2021-04-30
16:45:59.452260869 +0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v-test-harness.1 2021-11-25
18:53:06.321898581 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v-test-harness 1"
-.TH virt-v2v-test-harness 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization
Support"
+.TH virt-v2v-test-harness 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization
Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v.1
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v.1
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v.1 2021-04-30 16:45:59.613259425
+0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v.1 2021-11-25 18:53:06.429897384
+0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Podwrapper::Man 1.44.0 (Pod::Simple 3.41)
+.\" Automatically generated by Podwrapper::Man 1.44.2 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "virt-v2v 1"
-.TH virt-v2v 1 "2021-04-27" "virt-v2v-1.44.0" "Virtualization Support"
+.TH virt-v2v 1 "2021-11-24" "virt-v2v-1.44.2" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -1389,7 +1389,7 @@
?????????????????? ????????????????????????. ?? ???????????????? ????????????
???????????????? ?????????????????? ????????:
.IP "Linux root filesystem" 4
.IX Item "Linux root filesystem"
-?????????????????????? ?????????????? ??????????????: 20 ????
+Minimum free space: 100 \s-1MB\s0
.IP "Linux \fI/boot\fR" 4
.IX Item "Linux /boot"
?????????????????????? ?????????????? ??????????????: 50 ????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/po-docs/uk/virt-v2v.pod
new/virt-v2v-1.44.2/po-docs/uk/virt-v2v.pod
--- old/virt-v2v-1.44.0/po-docs/uk/virt-v2v.pod 2021-04-30 16:45:59.473260681
+0200
+++ new/virt-v2v-1.44.2/po-docs/uk/virt-v2v.pod 2021-11-25 18:53:06.277899068
+0100
@@ -1337,7 +1337,7 @@
=item Linux root filesystem
-?????????????????????? ?????????????? ??????????????: 20 ????
+Minimum free space: 100 MB
=item Linux F</boot>
Binary files old/virt-v2v-1.44.0/test-data/phony-guests/fedora.db and
new/virt-v2v-1.44.2/test-data/phony-guests/fedora.db differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/tests/test-v2v-no-copy.sh
new/virt-v2v-1.44.2/tests/test-v2v-no-copy.sh
--- old/virt-v2v-1.44.0/tests/test-v2v-no-copy.sh 2020-03-10
14:08:24.262869146 +0100
+++ new/virt-v2v-1.44.2/tests/test-v2v-no-copy.sh 2021-11-23
11:32:59.442663382 +0100
@@ -19,6 +19,7 @@
# Test --no-copy option.
set -e
+set -x
$TEST_FUNCTIONS
skip_if_skipped
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/tests/test-v2v-o-rhv-upload.sh
new/virt-v2v-1.44.2/tests/test-v2v-o-rhv-upload.sh
--- old/virt-v2v-1.44.0/tests/test-v2v-o-rhv-upload.sh 2020-03-10
14:08:24.263869132 +0100
+++ new/virt-v2v-1.44.2/tests/test-v2v-o-rhv-upload.sh 2021-11-23
11:32:59.453663270 +0100
@@ -19,7 +19,7 @@
# Test -o rhv-upload.
#
# These uses a test harness (see
-# v2v/test-v2v-o-rhv-upload-module/ovirtsdk4) to fake responses from
+# tests/test-v2v-o-rhv-upload-module/ovirtsdk4) to fake responses from
# oVirt.
set -e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/convert_linux.ml
new/virt-v2v-1.44.2/v2v/convert_linux.ml
--- old/virt-v2v-1.44.0/v2v/convert_linux.ml 2021-02-26 17:42:10.942228836
+0100
+++ new/virt-v2v-1.44.2/v2v/convert_linux.ml 2021-11-23 11:32:59.380664015
+0100
@@ -58,6 +58,14 @@
assert (inspect.i_package_format = "rpm" || inspect.i_package_format =
"deb");
+ (* Fail early if i_apps is empty. Certain steps such as kernel
+ * detection won't work without this. If the list is empty it
+ * likely indicates that libguestfs inspection is broken for
+ * this guest. See for example RHBZ#1965147.
+ *)
+ if inspect.i_apps = [] then
+ error (f_"inspection of the package database failed for this Linux guest.
Rerun virt-v2v with -v -x and see earlier errors. This is an internal error
which probably means that this guest is not supported by libguestfs inspection.
If the guest should work with virt-v2v (see virt-v2v docs) then a fix will be
required in libguestfs.");
+
(* We use Augeas for inspection and conversion, so initialize it early.
* Calling debug_augeas_errors will display any //error nodes in
* debugging output if verbose (but otherwise it does nothing).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/convert_windows.ml
new/virt-v2v-1.44.2/v2v/convert_windows.ml
--- old/virt-v2v-1.44.0/v2v/convert_windows.ml 2021-02-26 17:42:10.943228827
+0100
+++ new/virt-v2v-1.44.2/v2v/convert_windows.ml 2021-11-23 11:32:59.466663138
+0100
@@ -738,30 +738,32 @@
however, as this is specific to Windows 2003 it lists location
0x1A as unused.
*)
- let rootpart = inspect.i_root in
+ if inspect.i_major_version < 6 (* is Windows 2000/XP *) then (
+ let rootpart = inspect.i_root in
- (* Ignore if the rootpart is something like /dev/sda. RHBZ#1276540. *)
- if not (g#is_whole_device rootpart) then (
- (* Check that the root device contains NTFS magic. *)
- let magic = g#pread_device rootpart 8 3L in
- if magic = "NTFS " then (
- (* Get the size of the whole disk containing the root partition. *)
- let rootdev = g#part_to_dev rootpart in (* eg. /dev/sda *)
- let size = g#blockdev_getsize64 rootdev in
+ (* Ignore if the rootpart is something like /dev/sda. RHBZ#1276540. *)
+ if not (g#is_whole_device rootpart) then (
+ (* Check that the root device contains NTFS magic. *)
+ let magic = g#pread_device rootpart 8 3L in
+ if magic = "NTFS " then (
+ (* Get the size of the whole disk containing the root partition. *)
+ let rootdev = g#part_to_dev rootpart in (* eg. /dev/sda *)
+ let size = g#blockdev_getsize64 rootdev in
- let heads = (* refer to the table above *)
- if size < 2114445312L then 0x40
- else if size < 4228374780L then 0x80
- else 0xff in
+ let heads = (* refer to the table above *)
+ if size < 2114445312L then 0x40
+ else if size < 4228374780L then 0x80
+ else 0xff in
- (* Update NTFS's idea of the number of heads. This is an
- * unsigned 16 bit little-endian integer, offset 0x1a from the
- * beginning of the partition.
- *)
- let b = Bytes.create 2 in
- Bytes.unsafe_set b 0 (Char.chr heads);
- Bytes.unsafe_set b 1 '\000';
- ignore (g#pwrite_device rootpart (Bytes.to_string b) 0x1a_L)
+ (* Update NTFS's idea of the number of heads. This is an
+ * unsigned 16 bit little-endian integer, offset 0x1a from the
+ * beginning of the partition.
+ *)
+ let b = Bytes.create 2 in
+ Bytes.unsafe_set b 0 (Char.chr heads);
+ Bytes.unsafe_set b 1 '\000';
+ ignore (g#pwrite_device rootpart (Bytes.to_string b) 0x1a_L)
+ )
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/input_disk.ml new/virt-v2v-1.44.2/v2v/input_disk.ml
--- old/virt-v2v-1.44.0/v2v/input_disk.ml 2020-04-02 14:21:53.309308028
+0200
+++ new/virt-v2v-1.44.2/v2v/input_disk.ml 2021-11-23 11:34:36.159615932
+0100
@@ -64,7 +64,7 @@
let disk = {
s_disk_id = 0;
s_qemu_uri = disk_absolute;
- s_format = Some format;
+ s_format = format;
s_controller = None;
} in
@@ -79,7 +79,7 @@
let source = {
s_hypervisor = UnknownHV;
- s_name = name; s_orig_name = name;
+ s_name = name;
s_genid = None;
s_memory = 2048L *^ 1024L *^ 1024L; (* 2048 MB *)
s_vcpu = 1; (* 1 vCPU is a safe default *)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/input_libvirt_vcenter_https.ml
new/virt-v2v-1.44.2/v2v/input_libvirt_vcenter_https.ml
--- old/virt-v2v-1.44.0/v2v/input_libvirt_vcenter_https.ml 2020-12-01
13:12:46.449125499 +0100
+++ new/virt-v2v-1.44.2/v2v/input_libvirt_vcenter_https.ml 2021-11-23
11:34:36.159615932 +0100
@@ -95,7 +95,7 @@
(* The libvirt ESX driver doesn't normally specify a format, but
* the format of the -flat file is *always* raw, so force it here.
*)
- { disk with s_qemu_uri = qemu_uri; s_format = Some "raw" }
+ { disk with s_qemu_uri = qemu_uri; s_format = "raw" }
) disks in
source, disks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/input_libvirt_vddk.ml
new/virt-v2v-1.44.2/v2v/input_libvirt_vddk.ml
--- old/virt-v2v-1.44.0/v2v/input_libvirt_vddk.ml 2020-06-01
12:32:20.875706861 +0200
+++ new/virt-v2v-1.44.2/v2v/input_libvirt_vddk.ml 2021-11-23
11:34:36.159615932 +0100
@@ -187,7 +187,7 @@
(* nbdkit always presents us with the raw disk blocks from
* the guest, so force the format to raw here.
*)
- { disk with s_qemu_uri = qemu_uri; s_format = Some "raw" }
+ { disk with s_qemu_uri = qemu_uri; s_format = "raw" }
) disks in
source, disks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/input_ova.ml new/virt-v2v-1.44.2/v2v/input_ova.ml
--- old/virt-v2v-1.44.0/v2v/input_ova.ml 2021-01-19 10:36:45.742551900
+0100
+++ new/virt-v2v-1.44.2/v2v/input_ova.ml 2021-11-23 11:32:59.429663515
+0100
@@ -188,7 +188,6 @@
let source = {
s_hypervisor = VMware;
s_name = name;
- s_orig_name = name;
s_genid = None; (* XXX *)
s_memory = memory;
s_vcpu = vcpu;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/input_vmx.ml new/virt-v2v-1.44.2/v2v/input_vmx.ml
--- old/virt-v2v-1.44.0/v2v/input_vmx.ml 2021-01-19 10:36:45.742551900
+0100
+++ new/virt-v2v-1.44.2/v2v/input_vmx.ml 2021-11-23 11:34:36.160615920
+0100
@@ -190,7 +190,7 @@
let uri, format = qemu_uri_of_filename ?bandwidth input_password
vmx_source filename in
let s = { s_disk_id = (-1);
- s_qemu_uri = uri; s_format = Some format;
+ s_qemu_uri = uri; s_format = format;
s_controller = Some controller } in
Some (c, t, s)
| _ -> None
@@ -499,7 +499,6 @@
s_hypervisor = VMware;
s_name = name;
s_genid = genid;
- s_orig_name = name;
s_memory = memory;
s_vcpu = vcpu;
s_cpu_vendor = None;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/nbdkit.ml new/virt-v2v-1.44.2/v2v/nbdkit.ml
--- old/virt-v2v-1.44.0/v2v/nbdkit.ml 2021-02-08 17:57:31.469715543 +0100
+++ new/virt-v2v-1.44.2/v2v/nbdkit.ml 2021-11-23 11:32:59.459663209 +0100
@@ -26,8 +26,6 @@
open Utils
-let quote = Filename.quote
-
let is_installed () =
Sys.command "nbdkit --version >/dev/null 2>&1" = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/output_rhv_upload.ml
new/virt-v2v-1.44.2/v2v/output_rhv_upload.ml
--- old/virt-v2v-1.44.0/v2v/output_rhv_upload.ml 2021-02-08
17:57:31.470715531 +0100
+++ new/virt-v2v-1.44.2/v2v/output_rhv_upload.ml 2021-11-23
11:32:59.386663954 +0100
@@ -49,6 +49,16 @@
-oo rhv-disk-uuid=UUID Disk UUID
")
+let is_nonnil_uuid uuid =
+ let nil_uuid = "00000000-0000-0000-0000-000000000000" in
+ let rex_uuid = lazy (
+ let hex = "[a-fA-F0-9]" in
+ let str = sprintf "^%s{8}-%s{4}-%s{4}-%s{4}-%s{12}$" hex hex hex hex hex in
+ PCRE.compile str
+ ) in
+ if uuid = nil_uuid then false
+ else PCRE.matches (Lazy.force rex_uuid) uuid
+
let parse_output_options options =
let rhv_cafile = ref None in
let rhv_cluster = ref None in
@@ -71,6 +81,8 @@
| "rhv-verifypeer", "" -> rhv_verifypeer := true
| "rhv-verifypeer", v -> rhv_verifypeer := bool_of_string v
| "rhv-disk-uuid", v ->
+ if not (is_nonnil_uuid v) then
+ error (f_"-o rhv-upload: invalid UUID for -oo rhv-disk-uuid");
rhv_disk_uuids := Some (v :: (Option.default [] !rhv_disk_uuids))
| k, _ ->
error (f_"-o rhv-upload: unknown output option ???-oo %s???") k
@@ -256,6 +268,12 @@
error_unless_output_alloc_sparse output_alloc;
(* Python code prechecks. *)
+ let json_params = match rhv_options.rhv_disk_uuids with
+ | None -> json_params
+ | Some uuids ->
+ let ids = List.map (fun uuid -> JSON.String uuid) uuids in
+ ("rhv_disk_uuids", JSON.List ids) :: json_params
+ in
let precheck_fn = tmpdir // "v2vprecheck.json" in
let fd = Unix.openfile precheck_fn [O_WRONLY; O_CREAT] 0o600 in
if Python_script.run_command ~stdout_fd:fd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/parse_libvirt_xml.ml
new/virt-v2v-1.44.2/v2v/parse_libvirt_xml.ml
--- old/virt-v2v-1.44.0/v2v/parse_libvirt_xml.ml 2020-12-01
13:12:46.450125486 +0100
+++ new/virt-v2v-1.44.2/v2v/parse_libvirt_xml.ml 2021-11-24
12:22:23.739127229 +0100
@@ -194,9 +194,7 @@
Xml.xpathctx_set_current_context xpathctx node;
match xpath_string "model/@type" with
| None -> None
- | Some "qxl" | Some "virtio" -> Some Source_QXL
- | Some "cirrus" | Some "vga" -> Some Source_Cirrus
- | Some model -> Some (Source_other_video model)
+ | Some model -> Some (source_video_of_string model)
) in
(* Sound card. *)
@@ -211,16 +209,12 @@
Xml.xpathctx_set_current_context xpathctx node;
match xpath_string "@model" with
| None -> None
- | Some "ac97" -> Some { s_sound_model = AC97 }
- | Some "es1370" -> Some { s_sound_model = ES1370 }
- | Some "ich6" -> Some { s_sound_model = ICH6 }
- | Some "ich9" -> Some { s_sound_model = ICH9 }
- | Some "pcspk" -> Some { s_sound_model = PCSpeaker }
- | Some "sb16" -> Some { s_sound_model = SB16 }
- | Some "usb" -> Some { s_sound_model = USBAudio }
| Some model ->
- warning (f_"unknown sound model %s ignored") model;
- None
+ match source_sound_model_of_string model with
+ | Some s_sound_model -> Some { s_sound_model }
+ | None ->
+ warning (f_"unknown sound model %s ignored") model;
+ None
) in
(* Presence of virtio-scsi controller. *)
@@ -270,9 +264,14 @@
let format =
match xpath_string "driver/@type" with
- | Some "aio" -> Some "raw" (* Xen wierdness *)
- | None -> None
- | Some format -> Some format in
+ | Some "aio" -> "raw" (* Xen wierdness *)
+ | Some format -> format
+ | None ->
+ (* Some libvirt drivers don't set the format. Typically
+ * this is the vpx/esx driver (see RHBZ#2026199). We
+ * can assume "raw", as it will be overwritten later.
+ *)
+ "raw" in
(* The <disk type='...'> attribute may be 'block', 'file',
* 'network' or 'volume'. We ignore any other types.
@@ -339,7 +338,11 @@
let xpath_string = Xpath_helpers.xpath_string xpathctx in
(* Use the format specified in the volume itself. *)
- let format = xpath_string "/volume/target/format/@type" in
+ let format =
+ match xpath_string "/volume/target/format/@type" with
+ | Some format -> format
+ | None ->
+ error (f_"<volume><target><format type=\"format\"> attribute is
missing from the libvirt XML of volume %s") vol in
(match xpath_string "/volume/@type" with
| None | Some "file" ->
@@ -441,10 +444,7 @@
let model =
match xpath_string "model/@type" with
| None -> None
- | Some "virtio" -> Some Source_virtio_net
- | Some "e1000" -> Some Source_e1000
- | Some "rtl8139" -> Some Source_rtl8139
- | Some model -> Some (Source_other_nic model) in
+ | Some model -> Some (nic_model_of_string model) in
let vnet_type =
match xpath_string "@type" with
@@ -519,7 +519,7 @@
({
s_hypervisor = hypervisor;
- s_name = name; s_orig_name = name;
+ s_name = name;
s_genid = genid;
s_memory = memory;
s_vcpu = vcpu;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/parse_ova.ml new/virt-v2v-1.44.2/v2v/parse_ova.ml
--- old/virt-v2v-1.44.0/v2v/parse_ova.ml 2021-04-23 11:21:55.111815925
+0200
+++ new/virt-v2v-1.44.2/v2v/parse_ova.ml 2021-11-23 11:32:59.373664086
+0100
@@ -57,6 +57,13 @@
*)
| TarOptimized of string (* tarball *)
+let string_of_t { orig_ova; top_dir; ova_type } =
+ sprintf "orig_ova = %s, top_dir = %s, ova_type = %s"
+ orig_ova top_dir
+ (match ova_type with
+ | Directory -> "Directory"
+ | TarOptimized tarball -> "TarOptimized " ^ tarball)
+
type file_ref =
| LocalFile of string
| TarFile of string * string
@@ -122,6 +129,13 @@
(* Exploded path must be absolute (RHBZ#1155121). *)
let top_dir = absolute_path top_dir in
+ (* top_dir must not end with / except if it == "/" (which is
+ * likely not what you want). (RHBZ#1964324)
+ *)
+ let top_dir =
+ if top_dir = "/" || not (String.is_suffix top_dir "/") then top_dir
+ else String.sub top_dir 0 (String.length top_dir - 1) in
+
(* If virt-v2v is running as root, and the backend is libvirt, then
* we have to chmod the directory to 0755 and files to 0644
* so it is readable by qemu.qemu. This is libvirt bug RHBZ#890291.
@@ -136,7 +150,9 @@
ignore (run_command cmd)
);
- { orig_ova = ova; top_dir; ova_type }
+ let ova = { orig_ova = ova; top_dir; ova_type } in
+ debug "ova: %s" (string_of_t ova);
+ ova
(* Return true if [libvirt] supports ["json:"] pseudo-URLs and accepts the
* ["raw"] driver. Function also returns true if [libvirt] backend is not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/parse_ovf_from_ova.ml
new/virt-v2v-1.44.2/v2v/parse_ovf_from_ova.ml
--- old/virt-v2v-1.44.0/v2v/parse_ovf_from_ova.ml 2020-04-02
14:21:53.311308000 +0200
+++ new/virt-v2v-1.44.2/v2v/parse_ovf_from_ova.ml 2021-11-23
11:34:36.160615920 +0100
@@ -157,7 +157,7 @@
source_disk = {
s_disk_id = i;
s_qemu_uri = "";
- s_format = Some "vmdk";
+ s_format = "vmdk";
s_controller = controller;
};
href = href;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/rhv-upload-plugin.py
new/virt-v2v-1.44.2/v2v/rhv-upload-plugin.py
--- old/virt-v2v-1.44.0/v2v/rhv-upload-plugin.py 2021-02-08
17:57:31.470715531 +0100
+++ new/virt-v2v-1.44.2/v2v/rhv-upload-plugin.py 2021-11-23
11:32:59.447663332 +0100
@@ -608,17 +608,29 @@
"""
Finalize a transfer, making the transfer disk available.
- If finalizing succeeds, transfer's phase will change to FINISHED_SUCCESS
- and the transer's disk status will change to OK. On errors, the transfer's
- phase will change to FINISHED_FAILURE and the disk status will change to
- ILLEGAL and it will be removed. In both cases the transfer entity will be
- removed shortly after.
-
- If oVirt fails to finalize the transfer, transfer's phase will change to
- PAUSED_SYSTEM. In this case the disk's status will change to ILLEGAL and it
- will not be removed.
-
- For simplicity, we track only disk's status changes.
+ If finalizing succeeds, the transfer's disk status will change to OK
+ and transfer's phase will change to FINISHED_SUCCESS. Unfortunately,
+ the disk status is modified before the transfer finishes, and oVirt
+ may still hold a lock on the disk at this point.
+
+ The only way to make sure that the disk is unlocked, is to wait
+ until the transfer phase switches FINISHED_SUCCESS. Unfortunately
+ oVirt makes this hard to use because the transfer is removed shortly
+ after switching the phase to the final phase. However if the
+ transfer was removed, we can be sure that the disk is not locked,
+ since oVirt releases the locks before removing the transfer.
+
+ On errors, the transfer's phase will change to FINISHED_FAILURE and
+ the disk status will change to ILLEGAL and it will be removed. Again
+ the transfer will be removed shortly after that.
+
+ If oVirt fails to finalize the transfer, transfer's phase will
+ change to PAUSED_SYSTEM. In this case the disk's status will change
+ to ILLEGAL and it will not be removed.
+
+ oVirt 4.4.7 made waiting for transfer easier by keeping transfers
+ after they complete, but we must support older versions so we have
+ generic code that work with any version.
For more info see:
-
http://ovirt.github.io/ovirt-engine-api-model/4.4/#services/image_transfer
@@ -633,34 +645,62 @@
transfer_service.finalize()
- disk_service = (connection.system_service()
- .disks_service()
- .disk_service(disk_id))
-
while True:
time.sleep(1)
try:
- disk = disk_service.get()
+ transfer = transfer_service.get()
except sdk.NotFoundError:
- # Disk verification failed and the system removed the disk.
- raise RuntimeError(
- "transfer %s failed: disk %s was removed"
- % (transfer.id, disk_id))
+ # Transfer was removed (ovirt < 4.4.7). We need to check the
+ # disk status to understand if the transfer was successful.
+ # Due to the way oVirt does locking, we know that the disk
+ # is unlocked at this point so we can check only once.
+
+ debug("transfer %s was removed, checking disk %s status"
+ % (transfer.id, disk_id))
+
+ disk_service = (connection.system_service()
+ .disks_service()
+ .disk_service(disk_id))
+
+ try:
+ disk = disk_service.get()
+ except sdk.NotFoundError:
+ raise RuntimeError(
+ "transfer %s failed: disk %s was removed"
+ % (transfer.id, disk_id))
- if disk.status == types.DiskStatus.ILLEGAL:
- # Disk verification failed or transfer was paused by the system.
- raise RuntimeError(
- "transfer %s failed: disk is ILLEGAL" % transfer.id)
+ debug("disk %s is %s" % (disk_id, disk.status))
- if disk.status == types.DiskStatus.OK:
- debug("transfer %s finalized in %.3f seconds"
- % (transfer.id, time.time() - start))
- break
+ if disk.status == types.DiskStatus.OK:
+ break
- if time.time() > start + timeout:
raise RuntimeError(
- "timed out waiting for transfer %s to finalize"
- % transfer.id)
+ "transfer %s failed: disk is %s" % (transfer.id, disk.status))
+ else:
+ # Transfer exists, check if it reached one of the final
+ # phases, or we timed out.
+
+ debug("transfer %s is %s" % (transfer.id, transfer.phase))
+
+ if transfer.phase == types.ImageTransferPhase.FINISHED_SUCCESS:
+ break
+
+ if transfer.phase == types.ImageTransferPhase.FINISHED_FAILURE:
+ raise RuntimeError(
+ "transfer %s has failed" % (transfer.id,))
+
+ if transfer.phase == types.ImageTransferPhase.PAUSED_SYSTEM:
+ raise RuntimeError(
+ "transfer %s was paused by system" % (transfer.id,))
+
+ if time.time() > start + timeout:
+ raise RuntimeError(
+ "timed out waiting for transfer %s to finalize, "
+ "transfer is %s"
+ % (transfer.id, transfer.phase))
+
+ debug("transfer %s finalized in %.3f seconds"
+ % (transfer.id, time.time() - start))
def transfer_supports_format():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/rhv-upload-precheck.py
new/virt-v2v-1.44.2/v2v/rhv-upload-precheck.py
--- old/virt-v2v-1.44.0/v2v/rhv-upload-precheck.py 2020-04-02
14:21:53.311308000 +0200
+++ new/virt-v2v-1.44.2/v2v/rhv-upload-precheck.py 2021-11-23
11:32:59.386663954 +0100
@@ -97,6 +97,16 @@
raise RuntimeError("The cluster ???%s??? has an unknown architecture" %
(params['rhv_cluster']))
+# Find if any disk already exists with specified UUID.
+disks_service = system_service.disks_service()
+
+for uuid in params.get('rhv_disk_uuids', []):
+ try:
+ disk_service = disks_service.disk_service(uuid).get()
+ raise RuntimeError("Disk with the UUID '%s' already exists" % uuid)
+ except sdk.NotFoundError:
+ pass
+
# Otherwise everything is OK, print a JSON with the results.
results = {
"rhv_storagedomain_uuid": storage_domain.id,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/types.ml new/virt-v2v-1.44.2/v2v/types.ml
--- old/virt-v2v-1.44.0/v2v/types.ml 2021-02-26 17:42:10.947228792 +0100
+++ new/virt-v2v-1.44.2/v2v/types.ml 2021-11-23 11:34:36.161615910 +0100
@@ -27,7 +27,6 @@
type source = {
s_hypervisor : source_hypervisor;
s_name : string;
- s_orig_name : string;
s_genid : string option;
s_memory : int64;
s_vcpu : int;
@@ -56,7 +55,7 @@
and source_disk = {
s_disk_id : int;
s_qemu_uri : string;
- s_format : string option;
+ s_format : string;
s_controller : s_controller option;
}
and s_controller = Source_IDE | Source_SATA | Source_SCSI |
@@ -168,7 +167,7 @@
| Parallels -> "parallels"
| Bhyve -> "bhyve"
| Physical -> "physical"
- | UnknownHV -> "unknown"
+ | UnknownHV -> "unknownhv"
| OtherHV s -> s
and source_hypervisor_of_string = function
@@ -187,7 +186,7 @@
| "parallels" -> Parallels
| "bhyve" -> Bhyve
| "physical" -> Physical
- | "unknown" -> OtherHV "unknown" (* because `UnknownHV is for internal use *)
+ | "unknownhv" -> UnknownHV
| s -> OtherHV s
and string_of_source_firmware = function
@@ -197,11 +196,8 @@
and string_of_source_disk { s_qemu_uri = qemu_uri; s_format = format;
s_controller = controller } =
- sprintf "\t%s%s%s"
- qemu_uri
- (match format with
- | None -> ""
- | Some format -> " (" ^ format ^ ")")
+ sprintf "\t%s (%s)%s"
+ qemu_uri format
(match controller with
| None -> ""
| Some controller -> " [" ^ string_of_controller controller ^ "]")
@@ -245,6 +241,12 @@
| Source_rtl8139 -> "rtl8139"
| Source_other_nic model -> model
+and nic_model_of_string = function
+ | "virtio" -> Source_virtio_net
+ | "e1000" -> Source_e1000
+ | "rtl8139" -> Source_rtl8139
+ | model -> Source_other_nic model
+
and string_of_source_display { s_display_type = typ;
s_keymap = keymap; s_password = password;
s_listen = listen } =
@@ -266,6 +268,11 @@
| Source_Cirrus -> "cirrus"
| Source_other_video video -> video
+and source_video_of_string = function
+ | "qxl" -> Source_QXL
+ | "cirrus" -> Source_Cirrus
+ | video -> Source_other_video video
+
and string_of_source_sound { s_sound_model = model } =
string_of_source_sound_model model
@@ -282,6 +289,16 @@
| SB16 -> "sb16"
| USBAudio -> "usb"
+and source_sound_model_of_string = function
+ | "ac97" -> Some AC97
+ | "es1370" -> Some ES1370
+ | "ich6" -> Some ICH6
+ | "ich9" -> Some ICH9
+ | "pcspk" -> Some PCSpeaker
+ | "sb16" -> Some SB16
+ | "usb" -> Some USBAudio
+ | _ -> None
+
and string_of_source_cpu_topology { s_cpu_sockets; s_cpu_cores;
s_cpu_threads } =
sprintf "sockets: %d cores/socket: %d threads/core: %d"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/types.mli new/virt-v2v-1.44.2/v2v/types.mli
--- old/virt-v2v-1.44.0/v2v/types.mli 2021-02-26 17:42:10.948228783 +0100
+++ new/virt-v2v-1.44.2/v2v/types.mli 2021-11-23 11:34:36.161615910 +0100
@@ -61,9 +61,6 @@
type source = {
s_hypervisor : source_hypervisor; (** Source hypervisor. *)
s_name : string; (** Guest name. *)
- s_orig_name : string; (** Original guest name (if we rename
- the guest using -on, original is
- still saved here). *)
s_genid : string option; (** VM Generation ID. *)
s_memory : int64; (** Memory size (bytes). *)
s_vcpu : int; (** Number of CPUs. *)
@@ -103,7 +100,7 @@
and source_disk = {
s_disk_id : int; (** A unique ID for each source disk.
*)
s_qemu_uri : string; (** QEMU URI of source disk. *)
- s_format : string option; (** Format. *)
+ s_format : string; (** Format of source disk. *)
s_controller : s_controller option; (** Controller, eg. IDE, SCSI. *)
}
(** A source disk. *)
@@ -173,9 +170,12 @@
val string_of_source_disk : source_disk -> string
val string_of_controller : s_controller -> string
val string_of_nic_model : s_nic_model -> string
+val nic_model_of_string : string -> s_nic_model
val string_of_vnet_type : vnet_type -> string
val string_of_source_sound_model : source_sound_model -> string
+val source_sound_model_of_string : string -> source_sound_model option
val string_of_source_video : source_video -> string
+val source_video_of_string : string -> source_video
val string_of_source_cpu_topology : source_cpu_topology -> string
val string_of_source_hypervisor : source_hypervisor -> string
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/v2v.ml new/virt-v2v-1.44.2/v2v/v2v.ml
--- old/virt-v2v-1.44.0/v2v/v2v.ml 2021-04-15 18:18:36.670985293 +0200
+++ new/virt-v2v-1.44.2/v2v/v2v.ml 2021-11-23 11:34:36.161615910 +0100
@@ -87,7 +87,7 @@
);
let g = open_guestfs ~identifier:"v2v" () in
- g#set_memsize (g#get_memsize () * 14 / 5);
+ g#set_memsize (g#get_memsize () * 2);
(* Setting the number of vCPUs allows parallel mkinitrd, but make
* sure this is not too large because each vCPU consumes guest RAM.
*)
@@ -258,9 +258,6 @@
and set_source_name cmdline source =
match cmdline.output_name with
| None -> source
- (* Note the s_orig_name field retains the original name in case we
- * need it for some reason.
- *)
| Some name -> { source with s_name = name }
(* Map networks and bridges. *)
@@ -297,12 +294,11 @@
* should allow us to fstrim/blkdiscard and avoid copying
* significant parts of the data over the wire.
*)
- let options =
- "compat=1.1" ^
- (match format with None -> ""
- | Some fmt -> ",backing_fmt=" ^ fmt) in
- let cmd = [ "qemu-img"; "create"; "-q"; "-f"; "qcow2"; "-b"; qemu_uri;
- "-o"; options; overlay_file ] in
+ let cmd = [ "qemu-img"; "create"; "-q";
+ "-o"; "compat=1.1";
+ "-b"; qemu_uri; "-F"; format;
+ "-f"; "qcow2";
+ overlay_file ] in
if run_command cmd <> 0 then
error (f_"qemu-img command failed, see earlier errors");
@@ -348,7 +344,7 @@
and populate_disks g source_disks =
List.iter (
fun ({s_qemu_uri = qemu_uri; s_format = format}) ->
- g#add_drive_opts qemu_uri ?format ~cachemode:"unsafe"
+ g#add_drive_opts qemu_uri ~format ~cachemode:"unsafe"
~discard:"besteffort"
) source_disks
@@ -393,14 +389,12 @@
* typical size of 20-30MB. Hence:
*)
| "/boot" | "/" when not has_boot && not is_windows -> 50
- (* We may install some packages, and they would usually go
- * on the root filesystem.
- *)
- | "/" when not is_windows -> 20
- (* Windows requires copying in many device drivers and possibly
- * guest agents, so we need more space. (RHBZ#1949147).
+ (* Both Linux and Windows require installation of files,
+ * device drivers and guest agents.
+ * https://bugzilla.redhat.com/1949147
+ * https://bugzilla.redhat.com/1764569#c16
*)
- | "/" (* when is_windows *) -> 100
+ | "/" -> 100
(* For everything else, just make sure there is some free space. *)
| _ -> 10
in
@@ -610,11 +604,7 @@
| None ->
match cmdline.output_format with
| Some format -> format
- | None ->
- match ov.ov_source.s_format with
- | Some format -> format
- | None ->
- error (f_"disk %s (%s) has no defined format.\n\nThe input
metadata did not define the disk format (eg. raw/qcow2/etc) of this disk, and
so virt-v2v will try to autodetect the format when reading it.\n\nHowever
because the input format was not defined, we do not know what output format you
want to use. You have two choices: either define the original format in the
source metadata, or use the ???-of??? option to force the output format.")
ov.ov_sd ov.ov_source.s_qemu_uri in
+ | None -> ov.ov_source.s_format in
(* What really happens here is that the call to #disk_create
* below fails if the format is not raw or qcow2. We would
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/virt-v2v-1.44.0/v2v/windows_virtio.ml
new/virt-v2v-1.44.2/v2v/windows_virtio.ml
--- old/virt-v2v-1.44.0/v2v/windows_virtio.ml 2021-04-27 18:29:29.398168180
+0200
+++ new/virt-v2v-1.44.2/v2v/windows_virtio.ml 2021-11-23 11:32:59.392663892
+0100
@@ -192,11 +192,11 @@
| "fedora" -> Some "fc28"
| "rhel" | "centos" | "scientificlinux" | "redhat-based"
| "oraclelinux" ->
- (match inspect.i_major_version with
- | 6 -> Some "el6"
- | 7 -> Some "el7"
- | 8 -> Some "el8"
- | _ -> None)
+ (* map 6 -> "el6" etc. *)
+ if inspect.i_major_version >= 6 then
+ Some (sprintf "el%d" inspect.i_major_version)
+ else
+ None
| "sles" | "suse-based" | "opensuse" -> Some "lp151"
| _ -> None in
