|
 |
5ce0c7 |
From 52a4f93f1d8bb150167885c94df890af0d00d76d Mon Sep 17 00:00:00 2001
|
|
|
46b2f6 |
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
|
|
|
46b2f6 |
Date: Wed, 5 Feb 2020 14:11:35 +0100
|
|
|
46b2f6 |
Subject: [PATCH] windows: fix detection of qemu-ga installer on RHV
|
|
|
46b2f6 |
MIME-Version: 1.0
|
|
|
46b2f6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
46b2f6 |
Content-Transfer-Encoding: 8bit
|
|
|
46b2f6 |
|
|
|
46b2f6 |
The detection was incorrectly matching only 32-bit installer on all
|
|
|
46b2f6 |
architectures.
|
|
|
46b2f6 |
|
|
|
46b2f6 |
Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
|
|
|
46b2f6 |
|
|
|
46b2f6 |
(cherry picked from commit 45acf8d0557bee948c035305a6bafc6c9963a467
|
|
|
46b2f6 |
in virt-v2v)
|
|
|
46b2f6 |
---
|
|
|
46b2f6 |
v2v/windows_virtio.ml | 5 ++---
|
|
|
46b2f6 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
46b2f6 |
|
|
|
46b2f6 |
diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
|
|
|
46b2f6 |
index ea7e5c02d..9a7297344 100644
|
|
|
46b2f6 |
--- a/v2v/windows_virtio.ml
|
|
|
46b2f6 |
+++ b/v2v/windows_virtio.ml
|
|
|
46b2f6 |
@@ -444,14 +444,13 @@ and virtio_iso_path_matches_qemu_ga path inspect =
|
|
|
46b2f6 |
* elements.
|
|
|
46b2f6 |
*)
|
|
|
46b2f6 |
let lc_name = String.lowercase_ascii (Filename.basename path) in
|
|
|
46b2f6 |
- lc_name = "rhev-qga.msi" ||
|
|
|
46b2f6 |
match arch, lc_name with
|
|
|
46b2f6 |
| ("i386", "qemu-ga-x86.msi")
|
|
|
46b2f6 |
| ("i386", "qemu-ga-i386.msi")
|
|
|
46b2f6 |
- | ("i386", "RHEV-QGA.msi")
|
|
|
46b2f6 |
+ | ("i386", "rhev-qga.msi")
|
|
|
46b2f6 |
| ("x86_64", "qemu-ga-x64.msi")
|
|
|
46b2f6 |
| ("x86_64", "qemu-ga-x86_64.msi")
|
|
|
46b2f6 |
- | ("x86_64", "RHEV-QGA64.msi") -> true
|
|
|
46b2f6 |
+ | ("x86_64", "rhev-qga64.msi") -> true
|
|
|
46b2f6 |
| _ -> false
|
|
|
46b2f6 |
|
|
|
46b2f6 |
(* The following function is only exported for unit tests. *)
|
|
|
46b2f6 |
--
|
|
|
5ce0c7 |
2.18.4
|
|
|
46b2f6 |
|