Displaying 2 results from an estimated 2 matches for "726cd50".
Did you mean:
26c8d50
2010 Jun 09
1
[PATCH] Fix cleanup if Ctrl-C kills guestfs qemu process
..., the unmount_all and sync calls will fail. This causes all further
cleanup to be aborted, which is undesirable.
Additional fix to RHBZ#596015
---
v2v/virt-v2v.pl | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl
index 1ab8fdc..726cd50 100755
--- a/v2v/virt-v2v.pl
+++ b/v2v/virt-v2v.pl
@@ -414,11 +414,18 @@ sub close_guest_handle
$guestos = undef;
if (defined($g)) {
- $g->umount_all();
- $g->sync();
-
my $retval = $?;
+ eval {
+ $g->umount_all();
+ $g->...
2010 Jun 09
1
[PATCH] Fix cleanup of guest handle when installing with local files
...ore closing the guest
handle. It also localises $guestos, which also keeps a reference to the guestfs
handle in an eval block.
---
v2v/virt-v2v.pl | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl
index 726cd50..9008ad6 100755
--- a/v2v/virt-v2v.pl
+++ b/v2v/virt-v2v.pl
@@ -370,16 +370,29 @@ if ($output_method eq 'rhev') {
$> = "0";
}
-# Inspect the guest
-my $os = inspect_guest($g);
+my $os;
+my $guestcaps;
+eval {
+ # Inspect the guest
+ $os = inspect_guest($g);
+
+...