Re: [Libguestfs] [PATCH 7/8] v2v: -o rhv-upload: remove uploaded disks on failure

@@ -275,6 +290,13 @@ object if Python_script.run_command vmcheck_script json_params [] <> 0 then error (f_"failed vmchecks, see earlier errors"); + (* Set up an at-exit handler so we delete the orphan disks on failure. *) + at_exit ( + fun () -> + if disks_uuids <> [] then

+ delete_disks disks_uuids + ); + (* Create an nbdkit instance for each disk and set the * target URI to point to the NBD socket. *) @@ -419,7 +441,12 @@ If the messages above are not sufficient to diagnose the problem then add the with_open_out ovf_file (fun chan -> output_string chan ovf); if Python_script.run_command createvm_script json_params [ovf_file] <> 0 then - error (f_"failed to create virtual machine, see earlier errors") + error (f_"failed to create virtual machine, see earlier errors"); + + (* The virtual machine was created successfully, so there are no disks + * to remove manually. + *) + disks_uuids <- []