virt-v2v/0001-convert-Display-osinfo-in-Converting-.-message.patch
Richard W.M. Jones ae89f3e094 Rebase to upstream development version 2.5.9
Fix display of incorrect Windows 11 version
  resolves: RHEL-56784
Add customization options for post-conversion modification
  resolves: RHEL-55761
convert: windows: Ignore sriov drivers on virtio-win disk
  resolves: RHEL-56383
2024-09-05 09:15:43 +01:00

40 lines
1.3 KiB
Diff

From 4b39b7bd0f7f8cc3069df7e32f2dc35140a2b6d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 31 Aug 2024 09:25:50 +0100
Subject: [PATCH] convert: Display osinfo in "Converting ..." message
eg:
[ 9.3] Converting Windows Server 2022 Phony Edition (win2k22) to run on KVM
Reported-by: Ming Xie
Fixes: https://issues.redhat.com/browse/RHEL-56784
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
convert/convert.ml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/convert/convert.ml b/convert/convert.ml
index 5d955599..64b36c97 100644
--- a/convert/convert.ml
+++ b/convert/convert.ml
@@ -220,11 +220,15 @@ and do_fstrim g inspect =
(* Conversion. *)
and do_convert g source inspect i_firmware
block_driver keep_serial_console interfaces =
- (match inspect.i_product_name with
- | "unknown" ->
+ (match inspect.i_product_name, inspect.i_osinfo with
+ | "unknown", "unknown" ->
message (f_"Converting the guest to run on KVM")
- | prod ->
+ | "unknown", osinfo ->
+ message (f_"Converting %s guest to run on KVM") osinfo
+ | prod, "unknown" ->
message (f_"Converting %s to run on KVM") prod
+ | prod, osinfo ->
+ message (f_"Converting %s (%s) to run on KVM") prod osinfo
);
let convert, conversion_name =