search for: bed69a0

...e the guest in the target sub create_guest { my $self = shift; - my ($dom, $guestcaps) = @_; + my ($desc, $dom, $guestcaps) = @_; # Get the name of the guest my ($name) = $dom->findnodes('/domain/name/text()'); diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index bed69a0..96e89d1 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -378,7 +378,7 @@ my $guestcaps = Sys::VirtV2V::Converter->convert($g, $guestos, close_guest_handle(); -$target->create_guest($dom, $guestcaps); +$target->create_guest($os, $dom, $guestcaps); my ($name) = $dom->findno...

...Ctrl-C killed the guestfs qemu process first it would deliver a SIGPIPE to v2v, which caused an unclean shutdown without cleanup. Fixes RHBZ#596015 --- v2v/virt-v2v.pl | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index bed69a0..36297ed 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -214,6 +214,14 @@ Display version number and exit. =cut +$SIG{'INT'} = \&signal_exit; +$SIG{'QUIT'} = \&signal_exit; + +# SIGPIPE will cause an untidy exit of the perl process, without calling +# destructors...