Libguestfs - Sep 2019 - [PATCH 2/2] v2v: linux: do not install qemu-guest-agent if already installed

In case qemu-guest-agent is already installed in the guest, do not try
to install it again from the RHV Tools ISO.

Pino Toscano (2):
  v2v: linux: install linux tools after unconfigurations
  v2v: linux: do not install qemu-guest-agent if already installed

 v2v/convert_linux.ml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

-- 
2.21.0

Install the new tools after removing the old hypervisor tools.

It should not change the result of the conversion.
---
 v2v/convert_linux.ml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index f9e811c8d..f02ba373e 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -81,8 +81,6 @@ let convert (g : G.guestfs) inspect source output rcaps    let
rec do_convert ()      augeas_grub_configuration ();
 
-    Windows_virtio.install_linux_tools g inspect;
-
     unconfigure_xen ();
     unconfigure_vbox ();
     unconfigure_vmware ();
@@ -90,6 +88,8 @@ let convert (g : G.guestfs) inspect source output rcaps     
unconfigure_kudzu ();
     unconfigure_prltools ();
 
+    install_linux_tools ();
+
     let kernel = configure_kernel () in
 
     if output#keep_serial_console then (
@@ -492,6 +492,9 @@ let convert (g : G.guestfs) inspect source output rcaps     
msg
     )
 
+  and install_linux_tools () +    Windows_virtio.install_linux_tools g inspect
+
   and configure_kernel ()      (* Previously this function would try to install
kernels, but we
      * don't do that any longer.
-- 
2.21.0

In case qemu-guest-agent is already installed in the guest, then do not
attempt to install it again.

Reported by Martin Kletzander.
---
 v2v/convert_linux.ml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index f02ba373e..484e387cc 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -493,7 +493,13 @@ let convert (g : G.guestfs) inspect source output rcaps    
)
 
   and install_linux_tools () -    Windows_virtio.install_linux_tools g inspect
+    let has_qemu_guest_agent +      List.exists (
+        fun { G.app2_name = name } ->
+          name = "qemu-guest-agent"
+      ) inspect.i_apps in
+    if not has_qemu_guest_agent then
+      Windows_virtio.install_linux_tools g inspect
 
   and configure_kernel ()      (* Previously this function would try to install
kernels, but we
-- 
2.21.0

On Thu, Sep 19, 2019 at 01:56:17PM +0200, Pino Toscano
wrote:
> In case qemu-guest-agent is already installed in the guest, then do not
> attempt to install it again.
> 
> Reported by Martin Kletzander.
> ---
>  v2v/convert_linux.ml | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
> index f02ba373e..484e387cc 100644
> --- a/v2v/convert_linux.ml
> +++ b/v2v/convert_linux.ml
> @@ -493,7 +493,13 @@ let convert (g : G.guestfs) inspect source output
rcaps >      )
>  
>    and install_linux_tools () > -    Windows_virtio.install_linux_tools
g inspect
> +    let has_qemu_guest_agent > +      List.exists (
> +        fun { G.app2_name = name } ->
> +          name = "qemu-guest-agent"
> +      ) inspect.i_apps in
It's possible to omit the ‘= name’, but then you have to replace the
‘name =’ with ‘app2_name =’ so it's not really any shorter ...
> +    if not has_qemu_guest_agent then
> +      Windows_virtio.install_linux_tools g inspect
Obvious changes, so ACK series.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top