[Pkg-libvirt-commits] [libguestfs] 58/66: v2v: Update list of virtio-win drivers to latest (RHBZ#1145908).

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.54-1
in repository libguestfs.

commit 0ba0692fda5d866eb3ae57e9aa3c6d95de79c961
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Sep 24 17:51:43 2014 +0100

    v2v: Update list of virtio-win drivers to latest (RHBZ#1145908).
    
    Update with latest list from:
    - virtio-win-1.7.2-1.el7.noarch
    - https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions
---
 v2v/convert_windows.ml | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
index 52016a2..2f07e25 100644
--- a/v2v/convert_windows.ml
+++ b/v2v/convert_windows.ml
@@ -219,26 +219,39 @@ echo uninstalling Xen PV driver
 
     (* See if the drivers for this guest are available in virtio_win_dir. *)
     let path =
-      match inspect.i_major_version, inspect.i_minor_version, inspect.i_arch with
-      | 5, 1, "i386" ->
+      match inspect.i_major_version, inspect.i_minor_version,
+      inspect.i_arch, inspect.i_product_variant with
+      | 5, 1, "i386", _ ->
         Some (virtio_win_dir // "drivers/i386/WinXP")
-      | 5, 2, "i386" ->
+      | 5, 2, "i386", _ ->
         Some (virtio_win_dir // "drivers/i386/Win2003")
-      | 5, 2, "x86_64" ->
-        Some (virtio_win_dir // "drivers/amd64/Win2003")
-      | 6, 0, "i386" ->
+      | 6, 0, "i386", _ ->
         Some (virtio_win_dir // "drivers/i386/Win2008")
-      | 6, 0, "x86_64" ->
+      | 6, 1, "i386", _ ->
+        Some (virtio_win_dir // "drivers/i386/Win7")
+      | 6, 2, "i386", _ ->
+        Some (virtio_win_dir // "drivers/i386/Win8")
+      | 6, 3, "i386", _ ->
+        Some (virtio_win_dir // "drivers/i386/Win8.1")
+
+      | 5, 2, "x86_64", _ ->
+        Some (virtio_win_dir // "drivers/amd64/Win2003")
+      | 6, 0, "x86_64", _ ->
         Some (virtio_win_dir // "drivers/amd64/Win2008")
-      | 6, 1, "i386" ->
-        Some (virtio_win_dir // "drivers/i386/Win2008R2")
-      | 6, 1, "x86_64" ->
+      | 6, 1, "x86_64", "Server" ->
         Some (virtio_win_dir // "drivers/amd64/Win2008R2")
-      | 6, 3, "i386" ->
-        Some (virtio_win_dir // "drivers/i386/Win2012R2")
-      | 6, 3, "x86_64" ->
+      | 6, 1, "x86_64", "Client" ->
+        Some (virtio_win_dir // "drivers/amd64/Win7")
+      | 6, 2, "x86_64", "Server" ->
+        Some (virtio_win_dir // "drivers/amd64/Win2012")
+      | 6, 2, "x86_64", "Client" ->
+        Some (virtio_win_dir // "drivers/amd64/Win8")
+      | 6, 3, "x86_64", "Server" ->
         Some (virtio_win_dir // "drivers/amd64/Win2012R2")
-      | _, _, _ ->
+      | 6, 3, "x86_64", "Client" ->
+        Some (virtio_win_dir // "drivers/amd64/Win8.1")
+
+      | _ ->
         None in
 
     let path =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git