search for: driverdir

...x 22e3e31..87e39e6 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -62,15 +62,23 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = else ( (* Can we install the block driver? *) let block : guestcaps_block_type = - let has_viostor = g#exists (driverdir // "viostor.inf") in + let filenames = ["pvvxblk.sys"; "virtio_blk.sys"; "vrtioblk.sys"; "viostor.sys"] in + let driver_name = try ( + List.find ( + fun driver_file -> + let source = driverdir // driver_file i...

...ert_windows.ml index 9e83df8..26609f2 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -231,12 +231,9 @@ echo uninstalling Xen PV driver with Not_found -> () - and install_virtio_drivers root current_cs = - (* Copy the virtio drivers to the guest. *) - let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in - g#mkdir_p driverdir; + and copy_virtio_drivers driverdir = + (* Copy the matching drivers to the driverdir. *) - (* Load the list of drivers available. *) let drivers = find_virtio_win_drivers virtio_win in (* Filter ou...

...ert_windows.ml index d1aef36..55213aa 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -271,12 +271,9 @@ echo uninstalling Xen PV driver with Not_found -> () - and install_virtio_drivers root current_cs = - (* Copy the virtio drivers to the guest. *) - let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in - g#mkdir_p driverdir; + and copy_virtio_drivers driverdir = + (* Copy the matching drivers to the driverdir. *) - (* Load the list of drivers available. *) let drivers = find_virtio_win_drivers virtio_win in (* Filter ou...

.../windows_virtio.ml b/v2v/windows_virtio.ml index 9b45c76f5..91649694d 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -250,32 +250,35 @@ and ddb_regedits inspect drv_name drv_pciid = [ "Configuration", REG_SZ drv_config ]; ] -(* Copy the matching drivers to the driverdir; return true if any have - * been copied. +(* Copy all files from [srcdir] and all its subdirectories to the [destdir]. + * The file list is filtered based on [filter] function. Return list of copied + * files. *) -and copy_drivers g inspect driverdir = - let ret = ref false in +and copy_files g...

On Tue, Apr 05, 2016 at 01:47:27PM +0200, Cédric Bosdonnat wrote: > + let oem_inf = set_free_oem_inf g root scsi_adapter_guid "viostor.inf" driverdir in Seems better if it was called *get_next*_free_oem_inf? > > (* There should be a key > * HKLM\SYSTEM\ControlSet001\Control\Class\<scsi_adapter_guid> > @@ -398,6 +378,28 @@ and add_viostor_to_driver_database g root arch current_cs = > @=hex(ffff0012):6f,00...

Hi there, SUSE ships Virtual Machine Driver Pack for the virtio windows drivers. Get v2v and customize to discover them and use them if available. Cédric Bosdonnat (7): v2v: check next free oem%d.inf in /Windows/Inf v2v: extract controller offset discovery as a function customize: add support for pvvxsvc v2v: extract reusable parts of viostor regedits v2v: adapt the subkey in Enum

...with Not_found -> > Guestfs_config.datadir // "virtio-win" > > -let rec install_drivers g inspect systemroot root current_cs = > +let rec install_drivers g inspect systemroot root current_cs rcaps = > (* Copy the virtio drivers to the guest. *) > let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in > g#mkdir_p driverdir; > > if not (copy_drivers g inspect driverdir) then ( > + let block_type = match rcaps.rcaps_block_bus with > + | None -> IDE > + | Some block_type -&g...

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. That support, however, looks too heavy-weight: in order to access those drivers, a separate guestfs handle is created (and thus a new emulator process is started), which runs until v2v completes. This series attempts to make it simpler and lighter-weight, by making the relevant code more local, and by

...s rcaps = let target = sprintf "%s/system32/drivers/viostor.sys" systemroot in let target = g#case_sensitive_path target in g#cp source target; - add_viostor_to_registry g inspect root current_cs; + add_viostor_to_registry g inspect root current_cs driverdir; Virtio_blk | Some IDE, _ -> @@ -133,11 +133,11 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = (block, net, video) ) -and add_viostor_to_registry g inspect root current_cs = +and add_viostor_to_registry g inspect root current_cs driverdir =...

This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more attention: - it is "abusing" Winows_virtio code but renaming/refactoring everything to remove "windows" from the name and use "guest tools" seems like a lot of unnecesary

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. This series attempts to make it simpler and better scoped. Roman Kagan (3): v2v: consolidate virtio-win file copying v2v: copy virtio drivers without guestfs handle leak v2v: drop useless forced gc --- changes since v2: - drop patch 4 (reuse of the master guestfs handle for hot-adding the ISO image)

...ff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml > index 9b45c76f5..da02b6c4e 100644 > --- a/v2v/windows_virtio.ml > +++ b/v2v/windows_virtio.ml > @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = > * been copied. > *) > and copy_drivers g inspect driverdir = > - let ret = ref false in > + List.length ( > + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os > + ) > 0 You can write this as: [] <> copy_from_virtio_win g [etc...] which is also more efficient because the compiler will op...

On Tue, 2016-04-05 at 13:04 +0100, Richard W.M. Jones wrote: > On Tue, Apr 05, 2016 at 01:47:27PM +0200, Cédric Bosdonnat wrote: > > + let oem_inf = set_free_oem_inf g root scsi_adapter_guid > > "viostor.inf" driverdir in > > Seems better if it was called *get_next*_free_oem_inf? Yes, sounds better. > > (* There should be a key > > * HKLM\SYSTEM\ControlSet001\Control\Class\<scsi_adapter_guid> > > @@ -398,6 +378,28 @@ and add_viostor_to_driver_database g root arch > &gt...

...with Not_found -> + try Sys.getenv "VIRTIO_WIN_DIR" (* old name for VIRTIO_WIN *) + with Not_found -> + Guestfs_config.datadir // "virtio-win" + +let rec install_drivers g inspect systemroot root current_cs = (* Copy the virtio drivers to the guest. *) let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in g#mkdir_p driverdir; - if not (copy_drivers g inspect virtio_win driverdir) then ( + if not (copy_drivers g inspect driverdir) then ( warning (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s)....

...gt; Guestfs_config.datadir // "virtio-win" > > > > -let rec install_drivers g inspect systemroot root current_cs = > > +let rec install_drivers g inspect systemroot root current_cs rcaps = > > (* Copy the virtio drivers to the guest. *) > > let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in > > g#mkdir_p driverdir; > > > > if not (copy_drivers g inspect driverdir) then ( > > + let block_type = match rcaps.rcaps_block_bus with > > + | None -> IDE > > +...

...insertions(+), 17 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 9b45c76f5..da02b6c4e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - let ret = ref false in + List.length ( + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os + ) > 0 + +(* Copy all files from virtio_win directory/ISO located in [srcdir] + * subdirectory and all its subdirectories to the [destdir]. The directory +...

...insertions(+), 17 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 9b45c76f5..da02b6c4e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -254,28 +254,41 @@ and ddb_regedits inspect drv_name drv_pciid = * been copied. *) and copy_drivers g inspect driverdir = - let ret = ref false in + List.length ( + copy_from_virtio_win g inspect "/" driverdir virtio_iso_path_matches_guest_os + ) > 0 + +(* Copy all files from virtio_win directory/ISO located in [srcdir] + * subdirectory and all its subdirectories to the [destdir]. The directory +...

...x 7e9f735..a878a3e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -66,11 +66,19 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = else ( (* Can we install the block driver? *) let block : guestcaps_block_type = - let has_viostor = g#exists (driverdir // "viostor.inf") in + let filenames = ["virtio_blk"; "vrtioblk"; "viostor"] in + let driver_name = try ( + List.find ( + fun driver_file -> + let source = driverdir // (driver_file ^ ".sys") in + g...

...x 7e9f735..74a1ab6 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -66,11 +66,20 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = else ( (* Can we install the block driver? *) let block : guestcaps_block_type = - let has_viostor = g#exists (driverdir // "viostor.inf") in + let filenames = ["virtio_blk"; "vrtioblk"; "viostor"] in + let viostor_driver = try ( + Some ( + List.find ( + fun driver_file -> + let source = driverdir // driver_file ^ ".sys&...

...+33,102 @@ let virtio_win = with Not_found -> Guestfs_config.datadir // "virtio-win" -let rec install_drivers g inspect systemroot root current_cs = +let rec install_drivers g inspect systemroot root current_cs rcaps = (* Copy the virtio drivers to the guest. *) let driverdir = sprintf "%s/Drivers/VirtIO" systemroot in g#mkdir_p driverdir; if not (copy_drivers g inspect driverdir) then ( - warning (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s). virt-v2v looks for drivers in %s\n\nThe guest will be configure...