[Libguestfs] [PATCH 1/2] windows: fix detection of qemu-ga installer on RHV

[Tomáš Golembiovský]

On Mon, Jan 27, 2020 at 05:01:57PM +0100, Pino Toscano wrote:
> On Thursday, 21 November 2019 12:11:01 CET Tomáš Golembiovský wrote:
> > The detection was incorrectly matching only 32-bit installer on all
> > architectures.
> > 
> > Signed-off-by: Tomáš Golembiovský <tgolembi at redhat.com>
> > ---
> >  v2v/windows_virtio.ml | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
> > index 5ec7664b..f47d28e0 100644
> > --- a/v2v/windows_virtio.ml
> > +++ b/v2v/windows_virtio.ml
> > @@ -450,14 +450,13 @@ and virtio_iso_path_matches_qemu_ga path inspect =
> >     * elements.
> >     *)
> >    let lc_name = String.lowercase_ascii (Filename.basename path) in
> > -  lc_name = "rhev-qga.msi" ||
> >    match arch, lc_name with
> >    | ("i386", "qemu-ga-x86.msi")
> >    | ("i386", "qemu-ga-i386.msi")
> > -  | ("i386", "RHEV-QGA.msi")
> > +  | ("i386", "rhev-qga.msi")
> >    | ("x86_64", "qemu-ga-x64.msi")
> >    | ("x86_64", "qemu-ga-x86_64.msi")
> > -  | ("x86_64", "RHEV-QGA64.msi") -> true
> > +  | ("x86_64", "rhev-qga64.msi")
> >    | _ -> false
> 
> Actually, after another pre-push re-read, this function
> (virtio_iso_path_matches_qemu_ga) will always return false now!

Oh! How did that happen?! :)

Thanks for noticing, Pino.

    Tomas

> 
> -- 
> Pino Toscano



-- 
Tomáš Golembiovský <tgolembi at redhat.com>