similar to: [PATCH v2] v2v: ovf: Add virtio-rng and memory balloon device

This affects -o rhv and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index cfca63452..03df7f934 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -390,6 +390,29 @@ let rec create_ovf source targets guestcaps inspect ]

On Thursday, 6 April 2017 22:53:08 CEST Tomáš Golembiovský wrote: > This affects -o rhv and -o vdsm. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- Looks mostly good. > v2v/create_ovf.ml | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml > index cfca63452..03df7f934 100644

The change is not correct in case the OVF is used in -o vdsm mode, for example. Let's revert it, and then implement it properly. This reverts commit 296b2f66c71df0bf5ee2ee605fe4b92672796ab3. --- v2v/create_ovf.ml | 2 +- v2v/test-v2v-o-rhv.ovf.expected | 2 +- v2v/test-v2v-o-vdsm-options.ovf.expected | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

On Thursday, 1 March 2018 17:24:17 CET Richard W.M. Jones wrote: > Without this extra element, oVirt will crash with a Java > NullPointerException (see https://bugzilla.redhat.com/1550123). > > Fixes commit dac5fc53acdd1e51be2957c67e1e063e2132e680. > --- > v2v/create_ovf.ml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/v2v/create_ovf.ml

If CPU model is available store it in OVF for oVirt. This affects -o rhev and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f5dc64753..9d7341696 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -306,6 +306,12 @@ let rec create_ovf source

The main reason for creating different OVF is that it can be used to create VM by oVirt REST API. The RHV export domain flavor cannot be used that way. Tomáš Golembiovský (3): v2v: tests: check generated OVF v2v: ovf: Create OVF more aligned with the standard v2v: vdsm: add --vdsm-fixed-ovf option v2v/cmdline.ml | 5 ++ v2v/create_ovf.ml

The main reason for creating different OVF is that it can be used to create VM by oVirt REST API. The RHV export domain flavor cannot be used that way. v1 -> v2: - introduced flavour types instead of booleans - instead of referring to the new flavour as "standard OVF" or "fixed OVF" I refer to it as oVirt flavour. While it is more conforming than the one used in export

https://bugzilla.redhat.com/show_bug.cgi?id=1342398#c6 --- v2v/OVF.ml | 138 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 8a6f13e..0599306 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -184,6 +184,15 @@ and get_ostype = function typ distro major minor arch product;

See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5 --- v2v/create_ovf.ml | 2 +- v2v/test-v2v-o-rhv.ovf.expected | 2 +- v2v/test-v2v-o-vdsm-options.ovf.expected | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index b2a240907..f5f29cdc4 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@

QEMU for x86 supports two machine types, "pc" (emulating the ancient Intel i440FX chipset originally used by the Pentium Pro), and "q35" (https://wiki.qemu.org/Features/Q35). Currently virt-v2v does not set any machine type, so libvirt or the target hypervisor will choose some default, probably i440fx. Newer versions of libvirt and QEMU will probably switch over to defaulting

Without this extra element, oVirt will crash with a Java NullPointerException (see https://bugzilla.redhat.com/1550123). Fixes commit dac5fc53acdd1e51be2957c67e1e063e2132e680. --- v2v/create_ovf.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f5e34d79f..87245fdc8 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -444,6 +444,9 @@

For historical reasons the OVF used in RHV export domain contains some deviations from the OVF standard. The format used in -o rhv has to remain fixed but for -o vdsm and we could produce much nicer OVF. This patch serves as a preparatory step to this. The main reason for creating different OVF is that it can be used to create VM by oVirt REST API. The RHV export domain flavor cannot be used that

Due to a conflict with the IDs of the OVF standard, and the existing implementation in ovirt-engine, the ID of QXL devices changed to a different value. As a consequence, change the ResourceType of QXL devices, but only in OVirt flavour to avoid breaking vdsm mode. See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5 --- v2v/create_ovf.ml | 6 +++++-

v1 -> v2: - Support for passing topology through -o glance. - Support for passing topology through -o rhv. - Use bool for acpi/apic/pae struct fields in virt-p2v. - Write the xpath expression in error messages instead of file/line. - Fix more memory leaks in virt-p2v cpuid.c. - Passes make check & check-valgrind. There may be some other minor changes. I believe that everything

Without this extra element, oVirt will crash with a Java NullPointerException (see https://bugzilla.redhat.com/1550123). Fixes commit dac5fc53acdd1e51be2957c67e1e063e2132e680. --- v2v/create_ovf.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f5e34d79f..87245fdc8 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -444,6 +444,9 @@

On Fri, 02 Mar 2018 17:35:10 +0100 Pino Toscano <ptoscano@redhat.com> wrote: > On Thursday, 1 March 2018 17:24:17 CET Richard W.M. Jones wrote: > > Without this extra element, oVirt will crash with a Java > > NullPointerException (see https://bugzilla.redhat.com/1550123). > > > > Fixes commit dac5fc53acdd1e51be2957c67e1e063e2132e680. > > --- > >

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...

Add oVirt specific elemnt to OVF. It represents the combination of machine type (i440fx/q35) and firmware (BIOS/UEFI). Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 20 +++++++++++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml