search for: src_name

...rtions(+), 7 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 4ee15663f261..508a2b4f39a5 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -815,13 +815,28 @@ and actual_target_size target_file disk_stats = (* Save overlays if --debug-overlays option was used. *) and preserve_overlays overlays src_name = - List.iter ( - fun ov -> - let saved_filename = - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in - rename ov.ov_overlay_file saved_filename; - info (f_"Overlay saved as %s [--debug-overlays]") saved_filename - ) overlays + let filenam...

..._name; message (f_"Finishing off"); delete_target_on_exit := false (* Don't delete target on exit. *) @@ -916,4 +906,15 @@ and target_bus_assignment source targets guestcaps = target_ide_bus = !ide_bus; target_scsi_bus = !scsi_bus } +and preserve_overlays overlays src_name = + (* Save overlays if --debug-overlays option was used. *) + let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in + List.iter ( + fun ov -> + let saved_filename = + sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in + rename ov.ov_overlay_file s...

...it a/v2v/v2v.ml b/v2v/v2v.ml > index 4ee15663f261..508a2b4f39a5 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -815,13 +815,28 @@ and actual_target_size target_file disk_stats = > > (* Save overlays if --debug-overlays option was used. *) > and preserve_overlays overlays src_name = > - List.iter ( > - fun ov -> > - let saved_filename = > - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in > - rename ov.ov_overlay_file saved_filename; > - info (f_"Overlay saved as %s [--debug-overlays]") saved_filenam...

...xit overlay_file; + Filename.temp_file ~temp_dir:cachedir "v2vovl" ".qcow2" in (* There is a specific reason to use the newer qcow2 variant: * Because the L2 table can store zero clusters efficiently, and @@ -823,7 +820,7 @@ and preserve_overlays overlays src_name = List.iter ( fun ov -> let saved_filename = - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in + sprintf "%s/%s-%s.qcow2" cachedir src_name ov.ov_sd in rename ov.ov_overlay_file saved_filename; info (f_"Overlay saved a...

...rlay_dir "v2vovl" ".qcow2" in + Filename.temp_file ~temp_dir:large_tmpdir "v2vovl" ".qcow2" in unlink_on_exit overlay_file; (* There is a specific reason to use the newer qcow2 variant: @@ -823,7 +821,7 @@ and preserve_overlays overlays src_name = List.iter ( fun ov -> let saved_filename = - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in + sprintf "%s/%s-%s.qcow2" large_tmpdir src_name ov.ov_sd in rename ov.ov_overlay_file saved_filename; info (f_"Overlay sav...

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

v1 was here: https://www.redhat.com/archives/libguestfs/2020-April/msg00007.html There's a BZ for this now which I forgot to add to the commit message: https://bugzilla.redhat.com/show_bug.cgi?id=1814611 For v2: - Fix incorrect reference to $TMPDIR in existing manual. - Separate handling for small temporary files and large temporary files. Small temporary files go into $TMPDIR

...#get_cachedir () in + let overlay_dir = (open_guestfs ())#get_cachedir () in List.mapi ( fun i ({ s_qemu_uri = qemu_uri; s_format = format } as source) -> let overlay_file = @@ -944,7 +944,7 @@ and target_bus_assignment source targets guestcaps = and preserve_overlays overlays src_name = (* Save overlays if --debug-overlays option was used. *) - let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in + let overlay_dir = (open_guestfs ())#get_cachedir () in List.iter ( fun ov -> let saved_filename = -- 2.1.0

..._bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_from_source source + in let guestcaps = do_convert g inspect source keep_serial_console rcaps in g#umount_all (); @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename ) overlays +and rcaps_from_source source = + (* Request guest caps based on source configuration. *) + + (* rely on s_controller enum being in ascending preference order, and None + * being smaller than...

..._bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_from_source source + in let guestcaps = do_convert g inspect source keep_serial_console rcaps in g#umount_all (); @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename ) overlays +and rcaps_from_source source = + (* Request guest caps based on source configuration. *) + + (* rely on s_controller enum being in ascending preference order, and None + * being smaller than...

...t; + +#ifdef MECH_GSSAPI + +#include <gssapi/gssapi.h> + +struct gssapi_auth_request { + struct auth_request auth_request; + gss_ctx_id_t gss_ctx; + gss_cred_id_t service_cred; + + enum { + GSS_STATE_SEC_CONTEXT, + GSS_STATE_WRAP, + GSS_STATE_UNWRAP + } sasl_gssapi_state; + + gss_name_t src_name; + + pool_t pool; +}; + +static void auth_request_log_gss_error(struct auth_request *request, OM_uint32 status_value, int status_type, const char *description) +{ + OM_uint32 message_context = 0; + OM_uint32 major_status, minor_status; + gss_buffer_desc status_string; + + do { + major_status = g...

...ml >> index 4ee15663f261..508a2b4f39a5 100644 >> --- a/v2v/v2v.ml >> +++ b/v2v/v2v.ml >> @@ -815,13 +815,28 @@ and actual_target_size target_file disk_stats = >> >> (* Save overlays if --debug-overlays option was used. *) >> and preserve_overlays overlays src_name = >> - List.iter ( >> - fun ov -> >> - let saved_filename = >> - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in >> - rename ov.ov_overlay_file saved_filename; >> - info (f_"Overlay saved as %s [--debug-overla...

...rlay_dir = (open_guestfs ())#get_cachedir () in > List.mapi ( > fun i ({ s_qemu_uri = qemu_uri; s_format = format } as source) -> > let overlay_file = > @@ -944,7 +944,7 @@ and target_bus_assignment source targets guestcaps = > > and preserve_overlays overlays src_name = > (* Save overlays if --debug-overlays option was used. *) > - let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in > + let overlay_dir = (open_guestfs ())#get_cachedir () in > List.iter ( > fun ov -> > let saved_filename = > -- > 2.1.0 &gt...

...ot; in + Filename.temp_file ~temp_dir:tmpdir "v2vovl" ".qcow2" in unlink_on_exit overlay_file; (* There is a specific reason to use the newer qcow2 variant: @@ -822,8 +820,7 @@ and actual_target_size target_file disk_stats = and preserve_overlays overlays src_name = List.iter ( fun ov -> - let saved_filename = - sprintf "%s/%s-%s.qcow2" overlay_dir src_name ov.ov_sd in + let saved_filename = sprintf "%s/%s-%s.qcow2" tmpdir src_name ov.ov_sd in rename ov.ov_overlay_file saved_filename; info (f_&quo...

It took me a while to track this down. I am using MIT Kerberos 1.4.3 and libgssapi-0.7. With some patches that came with Suse 10, but that doesn't appear to be relevant. I have been using openssh-4.2p1 (with Simon's patches) and openssh-4p3p2 out of the box. I see the same problem no matter which version of openssh I am using. I am using two Suse Linux x86 boxes as a test

...> + rcaps_video = None; > + } > + | In_place -> > + rcaps_from_source source > + in > let guestcaps = do_convert g inspect source keep_serial_console rcaps in > > g#umount_all (); > @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = > printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename > ) overlays > > +and rcaps_from_source source = > + (* Request guest caps based on source configuration. *) > + > + (* rely on s_controller enum being in ascending preference order...

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

This series is a second attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. The first 14 patches are just refactoring and rearrangement of the code, factoring the implementation

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset