[Libguestfs] [v2v PATCH] windows: use libosinfo only for in-disk virtio-win

[Martin Kletzander]

On Wed, Nov 25, 2020 at 11:10:44AM +0100, Pino Toscano wrote:
>Try to install the Windows drivers from virtio-win only in case it is
>requested from a local directory (and not an ISO, or a block file).

It'd be nice to have an explanation here to see why it needs to be changed or
(if looking back) why it _was_ changed.  If it's really needed, the possible
error message needs to be changed accordingly.

>---
> v2v/windows_virtio.ml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
>index 4e00cd61..207fff2e 100644
>--- a/v2v/windows_virtio.ml
>+++ b/v2v/windows_virtio.ml
>@@ -298,7 +298,7 @@ and ddb_regedits inspect drv_name drv_pciid =
>  * been copied.
>  *)
> and copy_drivers g inspect driverdir =
>-  [] <> copy_from_libosinfo g inspect driverdir ||
>+  (is_directory virtio_win && [] <> copy_from_libosinfo g inspect driverdir) ||
>     [] <> copy_from_virtio_win g inspect "/" driverdir
>       virtio_iso_path_matches_guest_os
>       (fun () ->
>-- 
>2.28.0
>
>_______________________________________________
>Libguestfs mailing list
>Libguestfs at redhat.com
>https://www.redhat.com/mailman/listinfo/libguestfs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20201203/258a51ef/attachment.sig>