search for: i_firmwar

...@ open Utils module G = Guestfs type options = { + block_driver : guestcaps_block_type; keep_serial_console : bool; ks : key_store; network_map : Networks.t; @@ -88,7 +89,7 @@ let rec convert dir options source = (* Conversion. *) let guestcaps = do_convert g source inspect i_firmware - options.keep_serial_console options.static_ips in + options.block_driver options.keep_serial_console options.static_ips in g#umount_all (); @@ -221,7 +222,8 @@ and do_fstrim g inspect = ) fses (* Conversion. *) -and do_convert g source inspect i_firmware keep_serial_consol...

...@ open Utils module G = Guestfs type options = { + block_driver : guestcaps_block_type; keep_serial_console : bool; ks : key_store; network_map : Networks.t; @@ -88,7 +89,7 @@ let rec convert dir options source = (* Conversion. *) let guestcaps = do_convert g source inspect i_firmware - options.keep_serial_console options.static_ips in + options.block_driver options.keep_serial_console options.static_ips in g#umount_all (); @@ -221,7 +222,8 @@ and do_fstrim g inspect = ) fses (* Conversion. *) -and do_convert g source inspect i_firmware keep_serial_consol...

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.

Discussion on v1: https://listman.redhat.com/archives/libguestfs/2023-February/030849.html https://listman.redhat.com/archives/libguestfs/2023-March/030917.html v1 -> v2: * Adapt the patch suggested by Richard, splitting it up into 3: https://listman.redhat.com/archives/libguestfs/2023-March/030975.html Now we have "--block-driver" command line option which regulates the

This patch is just for discussion. There are still a couple of issues that I'm trying to fix. One is that all of the test guests I have, even ones with static IPs, have multiple interfaces, some using DHCP, so the conditions for adding the Powershell script don't kick in. This makes testing very awkward. However a bigger issue is that I think the premise is wrong. In some registries

Discussion on v2: https://listman.redhat.com/archives/libguestfs/2023-March/030987.html v2 -> v3: * Patch 2/6 ("convert_windows: add Inject_virtio_win.Virtio_SCSI as a possible block type"): omit "Inject_virtio_win." prefix in favor of type inference. Add a short commit message body; * Add tests/test-v2v-block-driver.sh testing the new "--block-driver"

v1 was here with much discussion: https://www.redhat.com/archives/libguestfs/2018-December/msg00048.html v2: - Fix the case where there are multiple interfaces. Note this does not preserve order correctly (see patch for comment on why that is a hard problem). - Preserve name servers. This patch is still for discussion only. I'd like to see what might be done to get this upstream

...ring list option; I think what you really want is for the type to be "string list" (not option), and for empty list to mean BIOS. (Assuming that UEFI cannot have zero system partitions -- as far as I understand UEFI, that's true). Alternately you could write something like: type i_firmware = | BIOS | UEFI of string list ... i_firmware : i_firmware; which is quite nice, I think, because it's explicit about the meaning. > } > > let string_of_inspect inspect = > @@ -341,7 +341,7 @@ i_uefi = %b > inspect.i_package_management > inspect.i_pro...

...| 2 +- output/openstack_image_properties.ml | 7 +++++++ 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml index 0aa0e5cd..084619c8 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = (* Did we manage to install virtio drivers? *) if not (quiet ()) then ( match guestcaps.gcaps_block_bus with - | Virtio_blk -> + | Virtio_blk | Virtio_SCSI -> info (f_"This guest has virtio drivers installed.") | IDE -...

...| 2 +- output/openstack_image_properties.ml | 7 +++++++ 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml index 0aa0e5cd..084619c8 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = (* Did we manage to install virtio drivers? *) if not (quiet ()) then ( match guestcaps.gcaps_block_bus with - | Virtio_blk -> + | Virtio_blk | Virtio_SCSI -> info (f_"This guest has virtio drivers installed.") | IDE -...

...properties.ml | 7 +++++++ > 7 files changed, 20 insertions(+), 5 deletions(-) > > diff --git a/convert/convert.ml b/convert/convert.ml > index 0aa0e5cd..084619c8 100644 > --- a/convert/convert.ml > +++ b/convert/convert.ml > @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = > (* Did we manage to install virtio drivers? *) > if not (quiet ()) then ( > match guestcaps.gcaps_block_bus with > - | Virtio_blk -> > + | Virtio_blk | Virtio_SCSI -> > info (f_"This guest has virtio drivers...

...f36b486359 100644 >>> --- a/convert/convert_windows.ml >>> +++ b/convert/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 c...

...gt;> 7 files changed, 20 insertions(+), 5 deletions(-) >> >> diff --git a/convert/convert.ml b/convert/convert.ml >> index 0aa0e5cd..084619c8 100644 >> --- a/convert/convert.ml >> +++ b/convert/convert.ml >> @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = >> (* Did we manage to install virtio drivers? *) >> if not (quiet ()) then ( >> match guestcaps.gcaps_block_bus with >> - | Virtio_blk -> >> + | Virtio_blk | Virtio_SCSI -> >> info (f_"This g...

...ix path "/grub.cfg" then + Some Grub2 + else if String.is_suffix path "/grub.conf" || + String.is_suffix path "/menu.lst" then + Some Grub1 + else + None + +(* Where to start searching for bootloaders. *) +let bootloader_mountpoint = function + | { i_firmware = I_BIOS } -> "/boot" + | { i_firmware = I_UEFI _ } -> "/boot/efi/EFI" + let detect_bootloader (g : G.guestfs) inspect = - let config_file, typ = - let locations = [ - "/boot/grub2/grub.cfg", Grub2; - "/boot/grub/grub.cfg", Grub2; -...

...| 16 ++++++++++++++-- 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...

...| 16 ++++++++++++++-- 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...

...; --- convert/convert_windows.ml | 1 + 1 files changed, 1 insertions(+) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 9d8d271d..4f672487 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -273,6 +273,7 @@ let convert (g : G.guestfs) _ inspect i_firmware _ static_ips = and of_virtio_win_block_type = function | Inject_virtio_win.Virtio_blk -> Virtio_blk + | Inject_virtio_win.Virtio_SCSI -> Virtio_SCSI | IDE -> IDE and of_virtio_win_net_type = function -- 2.31.1

..., 20 insertions(+), 5 deletions(-) >>> >>> diff --git a/convert/convert.ml b/convert/convert.ml >>> index 0aa0e5cd..084619c8 100644 >>> --- a/convert/convert.ml >>> +++ b/convert/convert.ml >>> @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = >>> (* Did we manage to install virtio drivers? *) >>> if not (quiet ()) then ( >>> match guestcaps.gcaps_block_bus with >>> - | Virtio_blk -> >>> + | Virtio_blk | Virtio_SCSI -> >>>...

...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...

...gt; > >> 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. > >> + (*...