Install blnsvr.exe to \Windows\Drivers\VirtIO

resolves: RHEL-148423

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2026-02-12 11:43:47 -05:00
parent 4760c929b3
commit 4d58d7e04a
2 changed files with 72 additions and 1 deletions

View File

@ -0,0 +1,66 @@
From 2666493010b1b82d5b8dbb517c9976727b05184f Mon Sep 17 00:00:00 2001
Message-ID: <2666493010b1b82d5b8dbb517c9976727b05184f.1770914130.git.crobinso@redhat.com>
In-Reply-To: <859c43b1eb81cfdcb5f481b571e2c387860f8a27.1770914130.git.crobinso@redhat.com>
References: <859c43b1eb81cfdcb5f481b571e2c387860f8a27.1770914130.git.crobinso@redhat.com>
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 11 Feb 2026 19:09:26 -0500
Subject: [PATCH] Update common submodule
Content-type: text/plain
Update to fix:
https://issues.redhat.com/browse/RHEL-148423
This pulls in the following commits:
Cole Robinson (1):
virtio-win: Install blnsvr.exe to C:\Windows\Drivers\VirtIO
Signed-off-by: Cole Robinson <crobinso@redhat.com>
(cherry picked from commit b227d493ace2250bbc53a25ce7db42fcf220ba51)
---
common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Submodule common 1005f4a6..22b583b9:
diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
index 114df064..a2938080 100644
--- a/common/mlcustomize/inject_virtio_win.ml
+++ b/common/mlcustomize/inject_virtio_win.ml
@@ -254,13 +254,10 @@ and inject_qemu_ga ({ g; root } as t) =
and inject_blnsvr ({ g; root } as t) =
(* Copy the files to the guest. *)
- let dir, dir_win = Firstboot.firstboot_dir g root in
- let dir_win = Option.value dir_win ~default:dir in
- let tempdir = sprintf "%s/Temp" dir in
- let tempdir_win = sprintf "%s\\Temp" dir_win in
- g#mkdir_p tempdir;
+ let driverdir = sprintf "%s/Drivers/VirtIO" t.i_windows_systemroot in
+ g#mkdir_p driverdir;
- let files = copy_blnsvr t tempdir in
+ let files = copy_blnsvr t driverdir in
match files with
| [] -> false (* Didn't find or install anything. *)
@@ -268,7 +265,7 @@ and inject_blnsvr ({ g; root } as t) =
* drivers/by-driver). Pick the first.
*)
| blnsvr :: _ ->
- configure_blnsvr t tempdir_win blnsvr;
+ configure_blnsvr t driverdir blnsvr;
true
and add_guestor_to_registry t ((g, root) as reg) drv_name drv_pciid =
@@ -570,9 +567,9 @@ and configure_qemu_ga t tempdir_win files =
Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga" !script
-and configure_blnsvr t tempdir_win blnsvr =
+and configure_blnsvr t driverdir blnsvr =
let cmd = sprintf "\
@echo off\n\
echo Installing %s\n\
- \"%s\\%s\" -i\n" blnsvr tempdir_win blnsvr in
+ \"%s\\%s\" -i\n" blnsvr driverdir blnsvr in
Firstboot.add_firstboot_script t.g t.root "install-blnsvr" cmd

View File

@ -45,7 +45,7 @@ ExclusiveArch: x86_64
Name: virt-v2v
Epoch: 1
Version: 2.10.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -93,6 +93,7 @@ Patch0025: 0025-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
Patch0026: 0026-RHEL-tests-Remove-btrfs-test.patch
Patch0027: 0027-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
Patch0028: 0028-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
Patch0029: 0029-Update-common-submodule.patch
BuildRequires: autoconf, automake, libtool
BuildRequires: make
@ -397,6 +398,10 @@ done
%changelog
* Thu Feb 12 2026 Cole Robinson <crobinso@redhat.com> - 1:2.10.0-6
- Install blnsvr.exe to \Windows\Drivers\VirtIO
resolves: RHEL-148423
* Wed Feb 11 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.10.0-5
- Rebase to virt-v2v 2.10.0
resolves: RHEL-111241