search for: output_gl

Thanks: Vladik Romanovsky, Ming Xie. --- v2v/output_glance.ml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index e38b172..179448b 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -92,6 +92,10 @@ object | Virtio_net -> "virtio" | E1000 -> "...

...as identifier. Instead of first creating the image and then setting all the properties for it, set all the properties when creating the image: other than being simplier, it also avoid parsing the output of the 'glance image-create' command for the UUID ('id') of the image. --- v2v/output_glance.ml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index d2660a7..399b45c 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -73,12 +73,6 @@ object if i == 0 then source.s_name...

When converting a guest with UEFI firmware, set the also hw_firmware_type=uefi property for all the disks of the guest, so Nova can properly boot the guest. --- v2v/output_glance.ml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index b712d68..cfb19b4 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -41,7 +41,7 @@ object method as_options = "-o glance" - method s...

Use the common open_guestfs to open Guestfs handles, so we get debugging, tracing, and other common options set. --- v2v/convert_windows.ml | 4 +--- v2v/input_disk.ml | 2 +- v2v/input_libvirt_other.ml | 2 +- v2v/input_ova.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_null.ml | 2 +- v2v/output_rhev.ml | 2 +- v2v/output_vdsm.ml | 2 +- v2v/types.ml | 2 +- v2v/v2v.ml | 4 ++-- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/conver...

...Use the common open_guestfs to open Guestfs handles, so we get > debugging, tracing, and other common options set. > --- > v2v/convert_windows.ml | 4 +--- > v2v/input_disk.ml | 2 +- > v2v/input_libvirt_other.ml | 2 +- > v2v/input_ova.ml | 2 +- > v2v/output_glance.ml | 2 +- > v2v/output_null.ml | 2 +- > v2v/output_rhev.ml | 2 +- > v2v/output_vdsm.ml | 2 +- > v2v/types.ml | 2 +- > v2v/v2v.ml | 4 ++-- > 10 files changed, 11 insertions(+), 13 deletions(-) I guess it sets th...

Many of the properties for disks are the same for all of them, so collect them only once, instead of doing that for every disk. Should be just code motion, with no behaviour change. --- v2v/output_glance.ml | 143 ++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index cfb19b4..3feb2e4 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -66,6 +66,78 @@ object ) targets...

This patch series lifts the previous restriction that virt-v2v would refuse to convert a guest to Glance that had more than one disk. The first patch is just better documentation for the Glance output mode. The second patch contains the change (best viewed with 'git diff -w' since it is mostly a whitespace change). virt-v2v -o glance will now create multiple disks called: - guestname

...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 ++++++++++++++++++++++++------ 9 files changed, 79 insertio...

...ich is using secure boot will be new enough that it'll be using Q35 anyway after this patch (on x86). --- v2v/convert_linux.ml | 20 ++++++++++++++++++++ v2v/convert_windows.ml | 10 ++++++++++ v2v/create_libvirt_xml.ml | 21 ++++++++++++++------- v2v/create_ovf.ml | 2 ++ v2v/output_glance.ml | 5 +++++ v2v/output_qemu.ml | 14 ++++++++------ v2v/test-v2v-i-ova.xml | 2 +- v2v/types.ml | 8 ++++++++ v2v/types.mli | 6 ++++-- 9 files changed, 72 insertions(+), 16 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml inde...

...<> None then @@ -348,7 +348,8 @@ read the man page virt-v2v(1). error (f_"-o glance: --qemu-boot option cannot be used in this output mode"); if not do_copy then error (f_"--no-copy and '-o glance' cannot be used at the same time"); - Output_glance.output_glance () + Output_glance.output_glance (), + output_format, output_alloc | `Not_set | `Libvirt -> @@ -358,7 +359,8 @@ read the man page virt-v2v(1). error (f_"-o libvirt: --qemu-boot option cannot be used in this output mode"); if not d...

...ll the small files > 2) cachedir, created as $LIBGUESTFS_CACHEDIR/virt-v2v.XXXXXX, for the > big files (e.g. disks) > This way there is no need to manually schedule all the temporary files > and directories for removal when the application quits. > --- Side note: > +++ b/v2v/output_glance.ml > @@ -27,16 +27,6 @@ open Types > open Utils > > class output_glance () = > - (* Although glance can slurp in a stream from stdin, unfortunately > - * 'qemu-img convert' cannot write to a stream (although I guess > - * it could be implemented at least...

...ince any guest which is using secure boot will be new enough that it'll be using Q35 anyway (on x86). --- v2v/convert_linux.ml | 7 +++++++ v2v/convert_windows.ml | 7 +++++++ v2v/create_libvirt_xml.ml | 37 +++++++++++++++++++++++++------------ v2v/create_ovf.ml | 2 ++ v2v/output_glance.ml | 5 +++++ v2v/output_qemu.ml | 30 +++++++++++++++++++----------- v2v/test-v2v-i-ova.xml | 2 +- v2v/types.ml | 8 ++++++++ v2v/types.mli | 6 ++++-- 9 files changed, 78 insertions(+), 26 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/conve...

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml

...R/virt-v2v.XXXXXX, for the big files (e.g. disks) This way there is no need to manually schedule all the temporary files and directories for removal when the application quits. --- v2v/input_ova.ml | 5 ++--- v2v/input_vmx.ml | 5 ----- v2v/measure_disk.ml | 5 +++-- v2v/output_glance.ml | 18 ++++++------------ v2v/output_libvirt.ml | 3 +++ v2v/output_null.ml | 14 ++------------ v2v/output_openstack.ml | 3 +-- v2v/output_rhv.ml | 2 +- v2v/output_rhv_upload.ml | 7 ------- v2v/parse_ova.ml | 30 ++++++++++++++---------------- v2v/utils.ml...

...w enough that it'll be using Q35 anyway > after this patch (on x86). > --- > v2v/convert_linux.ml | 20 ++++++++++++++++++++ > v2v/convert_windows.ml | 10 ++++++++++ > v2v/create_libvirt_xml.ml | 21 ++++++++++++++------- > v2v/create_ovf.ml | 2 ++ > v2v/output_glance.ml | 5 +++++ > v2v/output_qemu.ml | 14 ++++++++------ > v2v/test-v2v-i-ova.xml | 2 +- > v2v/types.ml | 8 ++++++++ > v2v/types.mli | 6 ++++-- > 9 files changed, 72 insertions(+), 16 deletions(-) > > diff --git a/v2v/convert_l...

...ary files are placed in $TMPDIR (usually /tmp). I cleaned up some existing code which used /var/tmp for small temporaries. --- docs/virt-v2v.pod | 29 ++++++++++++++++++++--------- v2v/input_ova.ml | 4 ++-- v2v/input_vmx.ml | 3 +-- v2v/nbdkit.ml | 3 +-- v2v/output_glance.ml | 3 +-- v2v/output_null.ml | 3 +-- v2v/output_rhv_upload.ml | 29 ++++++++++++++++------------- v2v/parse_ova.ml | 6 ++---- v2v/python_script.ml | 12 +++--------- v2v/python_script.mli | 5 +---- v2v/utils.ml | 6 +++++- v2v/utils.mli...

...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 | 30 ++++++++++++++++++++++++------ 9 files changed, 85 inserti...

...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 | 30 ++++++++++++++++++++++++------ 9 files changed, 85 inserti...

It will be used to do extra checks in the output before copying the disks. Partially revert commit 3bafec4e693a25ef1c84abc0fd1bc3251862c7de. --- v2v/output_glance.ml | 2 +- v2v/output_json.ml | 2 +- v2v/output_libvirt.ml | 2 +- v2v/output_local.ml | 2 +- v2v/output_null.ml | 2 +- v2v/output_openstack.ml | 2 +- v2v/output_qemu.ml | 2 +- v2v/output_rhv.ml | 2 +- v2v/output_rhv_upload.ml | 2 +- v2v/output_vdsm....

...u Tao <hutao@cn.fujitsu.com> --- resize/resize.ml | 10 +++++----- sparsify/copying.ml | 2 +- src/fuse.c | 2 +- src/launch-libvirt.c | 4 ++-- src/libvirt-domain.c | 2 +- v2v/convert_linux.ml | 6 +++--- v2v/input_libvirt.ml | 4 ++-- v2v/lib_ovf.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_rhev.ml | 6 +++--- v2v/v2v.ml | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resize/resize.ml b/resize/resize.ml index 81bb270..a3ea9be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -310,7 +310,7 @@ read the man page...