search for: input_libvirtxml

When reading a libvirt XML which has: <graphics ...> <listen type='none'/> </graphics> then just ignore it, as it is (roughly) the same as no <listen> child elements at all. This avoids a warning about an unknown listen type. --- v2v/input_libvirtxml.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml index 33e878e..1540798 100644 --- a/v2v/input_libvirtxml.ml +++ b/v2v/input_libvirtxml.ml @@ -101,6 +101,7 @@ let parse_libvirt_xml ?conn xml = (* Use only the first <listen> co...

On 32 bit platforms, reading the memory values can cause some numbers to be read as negative numbers. Fix this by treating memory values as 64 bit integers throughout the parsing and calculation. --- v2v/input_libvirtxml.ml | 7 ++++--- v2v/input_ova.ml | 7 ++++--- v2v/utils.ml | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml index 976848f..d8c6215 100644 --- a/v2v/input_libvirtxml.ml +++ b/v2v/input_libvirtx...

...d 'LNone' to mean "no parseable <listen/> element" I also had to change previous uses of 'LNone' to 'LNoListen', so we can use 'LNone' to mean "<listen type='none'>". Thanks: Ming Xie. --- v2v/input_disk.ml | 2 +- v2v/input_libvirtxml.ml | 17 ++++++++++++----- v2v/output_libvirt.ml | 9 ++++++++- v2v/types.ml | 8 ++++++-- v2v/types.mli | 4 +++- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index e07222f..2852ce9 100644 --- a/v2v/input_disk.ml +...

...isions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/test-v2v-print-source.sh | 4 +++- v2v/types...

...isions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 27 +++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/test-v2v-print-source.sh | 4 +++- v2v/types.ml...

When importing from VMware via the libvirt driver, the libvirt driver can add an empty source bridge name: <interface type='bridge'> <mac address='00:01:02:03:04:05:06'/> <source bridge=''/> </interface> Replicate what we do on the -i ova path, and map these to "eth0", "eth1" etc. This also includes a bunch

...adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- Notes: v2: - add catch-all string-valued variants for source network and video adapter models test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 27 +++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/test-v2v-print-source.sh | 4 +++- v2v/types.ml...

...;> <driver name='qemu' type='raw'/> <target dev='fda'/> </disk> Miscellaneous other changes were required in the code. There is also a regression test (see following commit). Note this ignores floppy disks in '-o qemu' mode. --- v2v/input_libvirtxml.ml | 1 + v2v/output_libvirt.ml | 6 ++++-- v2v/output_qemu.ml | 4 ++++ v2v/target_bus_assignment.ml | 20 ++++++++++++-------- v2v/test-v2v-i-ova.xml | 2 +- v2v/types.ml | 1 + v2v/types.mli | 10 +++++++--- 7 files changed, 30 inse...

...mode. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2: - corrected OVF and glance output - stopped abusing debug stringifier to obtain linux module name - droped unneeded braces v2v/OVF.ml | 4 +++- v2v/convert_linux.ml | 20 ++++++++++++++------ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++------------ v2v/output_glance.ml | 5 +++++ v2v/test-v2v-print-source.sh | 2 +- v2v/types.ml | 9 ++++++--- v2v/types.mli | 11 ++++------- v2v/v2v.ml | 13 ++++++++----- v2v/windows_virtio.ml | 3...

...; when referring to virtio SCSI v3: - resend off a proper branch v2: - corrected OVF and glance output - stopped abusing debug stringifier to obtain linux module name - droped unneeded braces v2v/OVF.ml | 4 +++- v2v/convert_linux.ml | 20 ++++++++++++++------ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++------------ v2v/output_glance.ml | 5 +++++ v2v/test-v2v-print-source.sh | 2 +- v2v/types.ml | 9 ++++++--- v2v/types.mli | 11 ++++------- v2v/v2v.ml | 13 ++++++++----- v2v/windows_virtio.ml | 3...

...<rkagan@virtuozzo.com> --- v3: - resend off a proper branch v2: - corrected OVF and glance output - stopped abusing debug stringifier to obtain linux module name - droped unneeded braces v2v/OVF.ml | 4 +++- v2v/convert_linux.ml | 20 ++++++++++++++------ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++------------ v2v/output_glance.ml | 5 +++++ v2v/test-v2v-print-source.sh | 2 +- v2v/types.ml | 9 ++++++--- v2v/types.mli | 11 ++++------- v2v/v2v.ml | 13 ++++++++----- v2v/windows_virtio.ml | 3...

These patches add the --password-file parameter, allowing you to pass a single password via a file. https://bugzilla.redhat.com/show_bug.cgi?id=1158526 Rich.

...e must be freed before the other. To solve this we have to move the finalisers into OCaml code, since the OCaml Gc.finalise function comes with an explicit ordering guarantee (that finalisers are always called in reverse order that they were created), which the C-level finaliser does not. --- v2v/input_libvirtxml.ml | 18 +++--- v2v/input_ova.ml | 10 ++-- v2v/output_libvirt.ml | 6 +- v2v/test-harness/v2v_test_harness.ml | 2 +- v2v/xml-c.c | 103 ++++++++++++++++++----------------- v2v/xml.ml | 85 +++...

...e must be freed before the other. To solve this we have to move the finalisers into OCaml code, since the OCaml Gc.finalise function comes with an explicit ordering guarantee (that finalisers are always called in reverse order that they were created), which the C-level finaliser does not. --- v2v/input_libvirtxml.ml | 18 +++--- v2v/input_ova.ml | 10 ++-- v2v/output_libvirt.ml | 6 +- v2v/test-harness/v2v_test_harness.ml | 2 +- v2v/xml-c.c | 103 ++++++++++++++++++----------------- v2v/xml.ml | 92 +++...

...h on input and on output of v2v. Virtio-blk remains the default, so for now virtio-scsi-based guests can only be produced in --in-place mode. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2v/OVF.ml | 4 +++- v2v/convert_linux.ml | 15 +++++++++------ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++------------ v2v/output_glance.ml | 1 + v2v/test-v2v-print-source.sh | 2 +- v2v/types.ml | 9 ++++++--- v2v/types.mli | 14 +++++++------- v2v/v2v.ml | 13 ++++++++----- v2v/windows_virtio.ml | 30...

In version 2: - No substantial change, I just tidied up the code a bit. - Removed one case where whitespace changes had crept in. Rich.

...virt_other.mli | 4 +- v2v/input_libvirt_vcenter_https.ml | 24 ++++----- v2v/input_libvirt_vcenter_https.mli | 2 +- v2v/input_libvirt_xen_ssh.ml | 10 ++-- v2v/input_libvirt_xen_ssh.mli | 2 +- v2v/input_libvirtxml.ml | 10 ++-- v2v/input_libvirtxml.mli | 6 +-- v2v/input_ova.ml | 14 ++--- v2v/input_ova.mli | 2 +- v2v/linux.ml | 26 +++++----- v2v/li...

This is built on top of the following patch series: https://www.redhat.com/archives/libguestfs/2019-April/msg00054.html Rich.

...g v2v: in-place: request caps based on source config v2v: better explain --in-place test-data/phony-guests/guests.xml.in | 8 ++++ v2v/convert_linux.ml | 49 ++++++++++++++----- v2v/convert_windows.ml | 4 +- v2v/input_disk.ml | 2 + v2v/input_libvirtxml.ml | 27 +++++++++++ v2v/input_ova.ml | 2 + v2v/modules_list.ml | 3 +- v2v/modules_list.mli | 3 +- v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.exp...

...g v2v: in-place: request caps based on source config v2v: better explain --in-place test-data/phony-guests/guests.xml.in | 8 ++++ v2v/convert_linux.ml | 49 ++++++++++++++----- v2v/convert_windows.ml | 4 +- v2v/input_disk.ml | 2 + v2v/input_libvirtxml.ml | 27 +++++++++++ v2v/input_ova.ml | 2 + v2v/modules_list.ml | 3 +- v2v/modules_list.mli | 3 +- v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.exp...