52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
|
From 4df3dcf64da91645d20aa9f74cd04fa8985c4610 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Wed, 3 Jul 2024 11:36:11 +0100
|
||
|
|
Subject: [PATCH] inspector: Add more fields to the output
|
||
|
|
|
||
|
|
Add more inspection fields in the <operatingsystem> element of
|
||
|
|
virt-v2v-inspector output. I've tried to keep these field names
|
||
|
|
consistent with virt-inspector (if there is a difference then it's a
|
||
|
|
bug in this tool).
|
||
|
|
|
||
|
|
See: https://issues.redhat.com/browse/MTV-1079
|
||
|
|
---
|
||
|
|
inspector/inspector.ml | 25 +++++++++++++++++++++++++
|
||
|
|
1 file changed, 25 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/inspector/inspector.ml b/inspector/inspector.ml
|
||
|
|
index 02d1a0e7..c79dd687 100644
|
||
|
|
--- a/inspector/inspector.ml
|
||
|
|
+++ b/inspector/inspector.ml
|
||
|
|
@@ -490,6 +490,31 @@ and inspector_xml v2vdir inspect =
|
||
|
|
[PCData inspect.i_package_management]);
|
||
|
|
if inspect.i_product_name <> "" then
|
||
|
|
List.push_back os (e "product_name" [] [PCData inspect.i_product_name]);
|
||
|
|
+ if inspect.i_product_variant <> "" then
|
||
|
|
+ List.push_back os (e "product_variant" []
|
||
|
|
+ [PCData inspect.i_product_variant]);
|
||
|
|
+
|
||
|
|
+ if inspect.i_windows_systemroot <> "" then
|
||
|
|
+ List.push_back os (e "windows_systemroot" []
|
||
|
|
+ [PCData inspect.i_windows_systemroot]);
|
||
|
|
+ if inspect.i_windows_software_hive <> "" then
|
||
|
|
+ List.push_back os (e "windows_software_hive" []
|
||
|
|
+ [PCData inspect.i_windows_software_hive]);
|
||
|
|
+ if inspect.i_windows_systemroot <> "" then
|
||
|
|
+ List.push_back os (e "windows_system_hive" []
|
||
|
|
+ [PCData inspect.i_windows_system_hive]);
|
||
|
|
+ if inspect.i_windows_current_control_set <> "" then
|
||
|
|
+ List.push_back os (e "windows_current_control_set" []
|
||
|
|
+ [PCData inspect.i_windows_current_control_set]);
|
||
|
|
+
|
||
|
|
+ List.push_back os (e "root" [] [PCData inspect.i_root]);
|
||
|
|
+ let mps = ref [] in
|
||
|
|
+ List.iter (
|
||
|
|
+ fun (fs, dev) ->
|
||
|
|
+ List.push_back mps (e "mountpoint" [ "dev", dev ] [PCData fs])
|
||
|
|
+ ) inspect.i_mountpoints;
|
||
|
|
+ List.push_back os (e "mountpoints" [] !mps);
|
||
|
|
+
|
||
|
|
List.push_back body (e "operatingsystem" [] !os);
|
||
|
|
|
||
|
|
(* Construct the final document. *)
|