[Libguestfs] [v2v PATCH] rhv: Use osinfo to distinguish Windows >= 10 variants in "ovirt:id" too

[Laszlo Ersek]

Hi Rich,

On 1/1/23 15:09, Laszlo Ersek wrote:
> Reflect commit 38b35f3b7e5c ("rhv: Use osinfo to distinguish Windows >= 10
> variants", 2022-12-02) to the "ovirt:id" field in the OVF as well. Take
> the values from "packaging/conf/osinfo-defaults.properties" in the
> ovirt-engine tree, as the comment on "get_ovirt_osid" explains.
> 
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2152465
> Signed-off-by: Laszlo Ersek <lersek at redhat.com>
> ---
>  lib/create_ovf.ml | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml
> index 8aff3d8f0b53..79b3285766c9 100644
> --- a/lib/create_ovf.ml
> +++ b/lib/create_ovf.ml
> @@ -437,13 +437,22 @@ and get_ovirt_osid = function
>        i_arch = "i386" } ->
>      26
>  
> +  (* For Windows NT 10.0 always use the <osinfo> field since the
> +   * other fields will not accurately reflect the version.
> +   *)
>    | { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
> -      i_arch = "x86_64"; i_product_variant = "Client" } ->
> -    27
> -
> -  | { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
> -      i_arch = "x86_64" } ->
> -    29
> +      i_arch = "x86_64"; i_osinfo = osinfo; i_product_name = product } ->
> +     (match osinfo with
> +      | "win10" -> (* windows_10x64 *) 27
> +      | "win11" -> (* windows_11 *) 36
> +      | "win2k16" -> (* windows_2016x64 *) 29
> +      | "win2k19" -> (* windows_2019x64 *) 31
> +      | "win2k22" -> (* windows_2022 *) 37
> +      | _ ->
> +         warning (f_"unknown Windows 10 variant: %s (%s)")
> +           osinfo product;
> +         (* windows_2022 *) 37
> +     )
>  
>    | { i_type = typ; i_distro = distro;
>        i_major_version = major; i_minor_version = minor; i_arch = arch;

green light for this patch?

Thanks!
Laszlo