[Libguestfs] [PATCH virt-v2v] v2v: windows: Install both legacy and modern virtio keys in the registry (RHBZ#1431579).

--- v2v/windows_virtio.ml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 6c9708c03..9891a770c 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -36,8 +36,10 @@ let virtio_win = else Guestfs_config.datadir // "virtio-win" let scsi_class_guid = "{4D36E97B-E325-11CE-BFC1-08002BE10318}" -let viostor_pciid = "VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00" -let vioscsi_pciid = "VEN_1AF4&DEV_1004&SUBSYS_00081AF4&REV_00" +let viostor_legacy_pciid = "VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00" +let viostor_modern_pciid = "VEN_1AF4&DEV_1042&SUBSYS_11001AF4&REV_01" +let vioscsi_legacy_pciid = "VEN_1AF4&DEV_1004&SUBSYS_00081AF4&REV_00" +let vioscsi_modern_pciid = "VEN_1AF4&DEV_1048&SUBSYS_11001AF4&REV_01" let rec install_drivers ((g, _) as reg) inspect rcaps = (* Copy the virtio drivers to the guest. *) @@ -104,7 +106,8 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = inspect.i_windows_systemroot driver_name in let target = g#case_sensitive_path target in g#cp source target; - add_guestor_to_registry reg inspect driver_name viostor_pciid; + add_guestor_to_registry reg inspect driver_name viostor_legacy_pciid; + add_guestor_to_registry reg inspect driver_name viostor_modern_pciid; Virtio_blk | Some Virtio_SCSI, _, true -> @@ -115,7 +118,8 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = inspect.i_windows_systemroot in let target = g#case_sensitive_path target in g#cp source target; - add_guestor_to_registry reg inspect "vioscsi" vioscsi_pciid; + add_guestor_to_registry reg inspect "vioscsi" vioscsi_legacy_pciid; + add_guestor_to_registry reg inspect "vioscsi" vioscsi_modern_pciid; Virtio_SCSI | Some IDE, _, _ -> -- 2.12.0