From 52a4f93f1d8bb150167885c94df890af0d00d76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Date: Wed, 5 Feb 2020 14:11:35 +0100 Subject: [PATCH] windows: fix detection of qemu-ga installer on RHV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The detection was incorrectly matching only 32-bit installer on all architectures. Signed-off-by: Tomáš Golembiovský (cherry picked from commit 45acf8d0557bee948c035305a6bafc6c9963a467 in virt-v2v) --- 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 ea7e5c02d..9a7297344 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -444,14 +444,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") -> true | _ -> false (* The following function is only exported for unit tests. *) -- 2.18.4