search for: block_driver

...<--colors> =item B<--colours> diff --git a/in-place/in_place.ml b/in-place/in_place.ml index 2049db16..e8c260c2 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml @@ -43,6 +43,7 @@ let rec main () = let bandwidth = ref None in let bandwidth_file = ref None in + let block_driver = ref None in let input_conn = ref None in let input_format = ref None in let input_password = ref None in @@ -156,6 +157,8 @@ let rec main () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge),...

...<--colors> =item B<--colours> diff --git a/in-place/in_place.ml b/in-place/in_place.ml index 2049db16..e8c260c2 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml @@ -43,6 +43,7 @@ let rec main () = let bandwidth = ref None in let bandwidth_file = ref None in + let block_driver = ref None in let input_conn = ref None in let input_format = ref None in let input_password = ref None in @@ -156,6 +157,8 @@ let rec main () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge),...

...om: "Richard W.M. Jones" <rjones at redhat.com> When injecting a block VirtIO driver during conversion, we rely on the predefined list of names of such drivers. Order in this list denotes the priority (see common/mlcustomize/inject_virtio_win.ml). This commit introduces the "block_driver" convert option, setting its value to the default Virtio_blk and making sure it's being properly passed to the conversion functions. Along with the means of altering the drivers list (introduced in a separate commit in the common submodule), this option will be brought to command line, giv...

...om: "Richard W.M. Jones" <rjones at redhat.com> When injecting a block VirtIO driver during conversion, we rely on the predefined list of names of such drivers. Order in this list denotes the priority (see common/mlcustomize/inject_virtio_win.ml). This commit introduces the "block_driver" convert option, setting its value to the default Virtio_blk and making sure it's being properly passed to the conversion functions. Along with the means of altering the drivers list (introduced in a separate commit in the common submodule), this option will be brought to command line, giv...

From: "Richard W.M. Jones" <rjones at redhat.com> If "block_driver" option is set to Virtio_SCSI, prepend the block drivers priority list with "vioscsi" so that we first search for "vioscsi.sys" during the drivers injection phase. Originally-by: Richard W.M. Jones <rjones at redhat.com> Signed-off-by: Andrey Drobyshev <andrey.dro...

From: "Richard W.M. Jones" <rjones at redhat.com> If "block_driver" option is set to Virtio_SCSI, prepend the block drivers priority list with "vioscsi" so that we first search for "vioscsi.sys" during the drivers injection phase. Originally-by: Richard W.M. Jones <rjones at redhat.com> Signed-off-by: Andrey Drobyshev <andrey.dro...

...ck drivers are being searched for (and, as a consequence, the default driver). Andrey Drobyshev (2): Revert "Remove guestcaps_block_type Virtio_SCSI" convert_windows: add Inject_virtio_win.Virtio_SCSI as a possible block type Richard W.M. Jones (3): convert: introduce "block_driver" convert option convert_windows: set block driver priority according to block_driver option v2v, in-place: introduce --block-driver command line option convert/convert.ml | 11 +++++++---- convert/convert.mli | 1 + convert/convert_linux.ml...

This is just an outline patch, only compile tested. It doesn't make changes to virt-v2v-in-place, but those would be the same as made in v2v/v2v.ml. It reuses the existing Types.guestcaps_block_type which is a bit ugly but fairly practical. I've made the change to the documentation, but it needs a test. Rich.

...as a consequence, the default driver). Andrey Drobyshev (3): Revert "Remove guestcaps_block_type Virtio_SCSI" convert_windows: add Inject_virtio_win.Virtio_SCSI as a possible block type tests: add --block-driver option test Richard W.M. Jones (3): convert: introduce "block_driver" convert option convert_windows: set block driver priority according to block_driver option v2v, in-place: introduce --block-driver command line option convert/convert.ml | 11 ++- convert/convert.mli | 1 + convert/convert_linux.ml |...

...+++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 6bc2343b..79050c66 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = | Virt -> Virt and configure_firstboot () = - (* Note that pnp_wait.exe must be the first firstboot script as it - * suppresses PnP for all following scripts. + (* Run the firstboot script with pnputil.exe before the one with + * pnp_wait.exe as the latter...

...+++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 6bc2343b..e15a5e62 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = | Virt -> Virt and configure_firstboot () = - (* Note that pnp_wait.exe must be the first firstboot script as it - * suppresses PnP for all following scripts. + (* Run the firstboot script with pnputil.exe before the one with + * pnp_wait.exe as the latter...

...4 insertions(+), 2 deletions(-) > > diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml > index 6bc2343b..e15a5e62 100644 > --- a/convert/convert_windows.ml > +++ b/convert/convert_windows.ml > @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = > | Virt -> Virt > > and configure_firstboot () = > - (* Note that pnp_wait.exe must be the first firstboot script as it > - * suppresses PnP for all following scripts. > + (* Run the firstboot script with pnputil.exe before the one with >...

...t;> diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml > >> index 6bc2343b..e15a5e62 100644 > >> --- a/convert/convert_windows.ml > >> +++ b/convert/convert_windows.ml > >> @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = > >> | Virt -> Virt > >> > >> and configure_firstboot () = > >> - (* Note that pnp_wait.exe must be the first firstboot script as it > >> - * suppresses PnP for all following scripts. > >> + (* Run the first...

...tions(-) >> >> diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml >> index 6bc2343b..e15a5e62 100644 >> --- a/convert/convert_windows.ml >> +++ b/convert/convert_windows.ml >> @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = >> | Virt -> Virt >> >> and configure_firstboot () = >> - (* Note that pnp_wait.exe must be the first firstboot script as it >> - * suppresses PnP for all following scripts. >> + (* Run the firstboot script with pnputil.exe b...

...t/convert_windows.ml >>> @@ -38,7 +38,7 @@ module G = Guestfs >>> * time the Windows VM is booted on KVM. >>> *) >>> >>> -let convert (g : G.guestfs) _ inspect i_firmware _ static_ips = >>> +let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = >>> (*----------------------------------------------------------------------*) >>> (* Inspect the Windows guest. *) >>> >>> @@ -47,6 +47,16 @@ let convert (g : G.guestfs) _ inspect i_firmware _ static_ips = >>> *) >>>...

While messing around this script, I added one more tiny patch making wait-pnp log its output into the common log.txt file, as suggested by Richard here: https://listman.redhat.com/archives/libguestfs/2023-March/031023.html Discussion on v3: https://listman.redhat.com/archives/libguestfs/2023-March/031070.html v3 -> v4: * Remove unneeded line break from the script; * Add another small

...--git a/convert/convert_windows.ml b/convert/convert_windows.ml >>>> index 6bc2343b..e15a5e62 100644 >>>> --- a/convert/convert_windows.ml >>>> +++ b/convert/convert_windows.ml >>>> @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = >>>> | Virt -> Virt >>>> >>>> and configure_firstboot () = >>>> - (* Note that pnp_wait.exe must be the first firstboot script as it >>>> - * suppresses PnP for all following scripts. >>>> +...

...convert_windows.ml b/convert/convert_windows.ml >>>>> index 6bc2343b..e15a5e62 100644 >>>>> --- a/convert/convert_windows.ml >>>>> +++ b/convert/convert_windows.ml >>>>> @@ -295,9 +295,11 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = >>>>> | Virt -> Virt >>>>> >>>>> and configure_firstboot () = >>>>> - (* Note that pnp_wait.exe must be the first firstboot script as it >>>>> - * suppresses PnP for all following scripts....

v1 discussion: https://listman.redhat.com/archives/libguestfs/2023-March/031001.html v1 -> v2: * Omit redirecting output to a separate log with "%~dpn0.log". Andrey Drobyshev (1): convert_windows: add firstboot script to install drivers with pnputil convert/convert_windows.ml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -- 2.31.1

I've been experiencing problem with the drivers not always being installed. This patch merely implements the solution offered by Richard in the commit 73e009c04 ("v2v: windows: Document use of pnputil to install drivers."). The solution wasn't implemented back then, but rather added merely as a comment. Thus I wonder is there some issues which it may cause? The most obvious