Libguestfs - Jan 2014 - [PATCH] virt-v2v: Check for firstboot before unconfiguring XenPV

Although not fatal, _unconfigure_xenpv should report a warning and return
if firstboot is not available (during Windows conversions).

---
 lib/Sys/VirtConvert/Converter/Windows.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Sys/VirtConvert/Converter/Windows.pm
b/lib/Sys/VirtConvert/Converter/Windows.pm
index 59d273f..ce8b474 100644
--- a/lib/Sys/VirtConvert/Converter/Windows.pm
+++ b/lib/Sys/VirtConvert/Converter/Windows.pm
@@ -564,6 +564,12 @@ sub _unconfigure_xenpv
 {
     my ($g, $h_soft, $firstboot) = @_;
 
+    if (!defined($firstboot)) {
+        logmsg WARN, __x('Unable to uninstall Xen PV drivers without '.
+                         'firstboot');
+        return;
+    }
+
     my @regkey = ('Microsoft', 'Windows',
'CurrentVersion', 'Uninstall',
                   'Red Hat Paravirtualized Xen Drivers for
Windows(R)');
 
-- 
1.8.1.4

On 03/01/14 20:37, Mike Latimer wrote:
> Although not fatal, _unconfigure_xenpv should report a warning and return
> if firstboot is not available (during Windows conversions).
> 
> ---
>  lib/Sys/VirtConvert/Converter/Windows.pm | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/lib/Sys/VirtConvert/Converter/Windows.pm
b/lib/Sys/VirtConvert/Converter/Windows.pm
> index 59d273f..ce8b474 100644
> --- a/lib/Sys/VirtConvert/Converter/Windows.pm
> +++ b/lib/Sys/VirtConvert/Converter/Windows.pm
> @@ -564,6 +564,12 @@ sub _unconfigure_xenpv
>  {
>      my ($g, $h_soft, $firstboot) = @_;
>  
> +    if (!defined($firstboot)) {
> +        logmsg WARN, __x('Unable to uninstall Xen PV drivers without
'.
> +                         'firstboot');
> +        return;
> +    }
> +
>      my @regkey = ('Microsoft', 'Windows',
'CurrentVersion', 'Uninstall',
>                    'Red Hat Paravirtualized Xen Drivers for
Windows(R)');
>  
> 
ACK.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490