search for: current_cs

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

...+++++---------------------- 1 file changed, 176 insertions(+), 135 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 14ffc51..8a0b529 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -146,48 +146,50 @@ and add_viostor_to_critical_device_database g root current_cs = * NB: All these edits are in the HKLM\SYSTEM hive. No other * hive may be modified here. *) + let driver = "viostor.sys" in + let driver_name = Filename.chop_extension driver in let regedits = [ [ current_cs; "Control"; "CriticalDeviceDatabase&quo...

[Partly using the mailing list as a backup again ...] This commit changes virt-v2v to make registry changes to all ControlSets, not just the CurrentControlSet. Not sure what difference if any this would make. Rich.

...= match xenpv_uninst with | None -> () (* nothing to be uninstalled *) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 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&...

...y my $h = Win::Hivex->open ($tmpdir . "/system", write => 1) or die "open system hive: $!"; + # Get the 'Current' ControlSet. This is normally 001, but not always. + my $select = $h->node_get_child($h->root(), 'Select'); + my $current_cs = $h->node_get_value($select, 'Current'); + $current_cs = sprintf("ControlSet%03i", $h->value_dword($current_cs)); + # Make the changes. - my $regedits = ' + my $regedits = <<REGEDITS; ; Edits to be made to a Windows guest to have ; it boot from vio...

The way we patch the Windows registry in order to allow it to boot off a virtio-blk drive was initially conceived by comparing the state with virtio-blk driver properly installed, to that without. However, we don't want to replicate the Windows PnP system; rather we need to apply just enough edits to make the system boot, and then let the Windows PnP manager figure out the rest. This series

...+++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index f538b36..b0d9d08 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -82,7 +82,7 @@ let rec install_drivers g inspect systemroot root current_cs 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 d...

...++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 49811a7..012f03d 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -318,6 +318,7 @@ if errorlevel 3010 exit /b 0 debug "current ControlSet is %s" current_cs; disable_services root current_cs; + disable_prl_drivers root current_cs; disable_autoreboot root current_cs; Windows_virtio.install_drivers g inspect systemroot root current_cs rcaps @@ -344,6 +345,51 @@ if errorlevel 3010 exit /b 0...

...windows.ml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index bd1bc53..25acdcc 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -404,33 +404,22 @@ if errorlevel 3010 exit /b 0 let current_cs = get_current_cs root in debug "current ControlSet is %s" current_cs; - disable_services root current_cs; + disable_xenpv_win_drivers root current_cs; disable_prl_drivers root current_cs; disable_autoreboot root current_cs; Windows_virtio.install_drivers g insp...

...-- v2v/windows_virtio.ml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 8a0b529..dfb7b71 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -139,15 +139,18 @@ and add_viostor_to_registry g inspect root current_cs driverdir = if (major == 6 && minor >= 2) || major >= 7 then (* Windows >= 8 *) add_viostor_to_driver_database g root arch current_cs driverdir else (* Windows <= 7 *) - add_viostor_to_critical_device_database g root current_cs + add_vio...

...le changed, 12 insertions(+) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index e37c6b8..c8db860 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -191,6 +191,7 @@ echo uninstalling Xen PV driver if verbose then printf "current ControlSet is %s\n%!" current_cs; disable_services root current_cs; + disable_autoreboot root current_cs; install_virtio_drivers root current_cs and disable_services root current_cs = @@ -212,6 +213,17 @@ echo uninstalling Xen PV driver ) ) disable + and disable_autoreboot root current_cs = +...

...und -> - Guestfs_config.datadir // "virtio-win" in - (* Check if RHEV-APT exists. This is optional. *) let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in let rhev_apt_exe = @@ -289,7 +282,7 @@ if errorlevel 3010 exit /b 0 disable_services root current_cs; disable_autoreboot root current_cs; - Windows_virtio.install_drivers g inspect systemroot virtio_win + Windows_virtio.install_drivers g inspect systemroot root current_cs and disable_services root current_cs = diff --git a/v2v/windows_virtio.ml b...

...210,13 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > (*----------------------------------------------------------------------*) > (* Perform the conversion of the Windows guest. *) > > + (* Find the 'Current' ControlSet. *) > + let get_current_cs root = > + let select = g#hivex_node_get_child root "Select" in > + let valueh = g#hivex_node_get_value select "Current" in > + let value = int_of_le32 (g#hivex_value_value valueh) in > + sprintf "ControlSet%03Ld" value in > + > let rec...

A very miscellaneous set of cleanups to how we handle the Windows registry in virt-v2v, firstboot, and inspection code. This should all be straightforward non-controversial refactoring. Some highlights: - Add a new mllib Registry module containing various utility functions that are currently scattered all around. - Only compute the software/system hive paths once during inspection, and

...ole (g : G.guestfs) inspect source = +let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Get the data directory. *) let virt_tools_data_dir = try Sys.getenv "VIRT_TOOLS_DATA_DIR" @@ -283,7 +283,7 @@ if errorlevel 3010 exit /b 0 disable_services root current_cs; disable_autoreboot root current_cs; Windows_virtio.install_drivers g inspect systemroot - root current_cs + root current_cs rcaps and disable_services root current_cs = (* Disable miscellaneous services. *) dif...

...ole (g : G.guestfs) inspect source = +let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Get the data directory. *) let virt_tools_data_dir = try Sys.getenv "VIRT_TOOLS_DATA_DIR" @@ -283,7 +283,7 @@ if errorlevel 3010 exit /b 0 disable_services root current_cs; disable_autoreboot root current_cs; Windows_virtio.install_drivers g inspect systemroot - root current_cs + root current_cs rcaps and disable_services root current_cs = (* Disable miscellaneous services. *) dif...

...> index bdce038..8e0430c 100644 > --- a/v2v/windows_virtio.ml > +++ b/v2v/windows_virtio.ml > @@ -33,57 +33,105 @@ 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 ( &...

...= match xenpv_uninst with | None -> () (* nothing to be uninstalled *) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 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 = tr...

...staller. --- v2v/windows_virtio.ml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index dfb7b71..22e3e31 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -196,6 +196,14 @@ and add_viostor_to_critical_device_database g root current_cs major = [ "0", REG_SZ (sprintf "PCI\\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\\%s&20" subkey); "Count", REG_DWORD 0x1_l; "NextInstance", REG_DWORD 0x1_l ]; + + [ current_cs; "Enum"; "PCI"; &quo...

...sertions(+) > > > > diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml > > index dfb7b71..22e3e31 100644 > > --- a/v2v/windows_virtio.ml > > +++ b/v2v/windows_virtio.ml > > @@ -196,6 +196,14 @@ and add_viostor_to_critical_device_database g > > root current_cs major = > > [ "0", REG_SZ (sprintf > > "PCI\\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\\%s&20" subkey); > > "Count", REG_DWORD 0x1_l; > > "NextInstance", REG_DWORD 0x1_l ]; > > + > >...