search for: static_ip

...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_console interfaces = +and do_convert g source inspect i_firm...

...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_console interfaces = +and do_convert g source inspect i_firm...

...+++ 10 files changed, 149 insertions(+), 16 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 641eed017..82f9a7da6 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -41,11 +41,12 @@ type cmdline = { print_estimate : bool; print_source : bool; root_choice : root_choice; + static_ips : static_ip list; ks : Tools_utils.key_store; } (* Matches --mac command line parameters. *) -let mac_re = PCRE.compile ~anchored:true "([[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}):(network|bridge):(.*)" +let mac_re = PCRE.compi...

Patch v2 was here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00114 There's no change here except that I've rebased it against the latest master branch and retested. There was a comment by Pino (https://www.redhat.com/archives/libguestfs/2019-April/msg00117.html) which isn't incorporated into this patch. Rich.

Essentially identical to v1 except that it now uses (overloads?) the --mac option to supply this data. Rich.

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

...0644 >>> --- 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 convert (g : G...

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

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

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

...ch { |rnic| %> - jnic = new Object; - jnic.network_id = "<%= rnic.network_id.to_s %>"; - jnic.name = "<%= rnic.network.name %>"; - jnic.mac = "<%= rnic.mac %>"; - jnic.ip = "<%= rnic.ip_address %>"; - jnic.static_ip = <%= rnic.network.boot_type.proto == 'static' %>; - jnic.selected = false; - nics.push(jnic); - <% } %> - - // adds unselected network back to selectboxes indicated by selector - function add_unselected_network(selector, network_id){ - for(j = 0; j &lt...

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

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"

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

...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 firstboot script with pnputil.exe before the on...

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

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

...ml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 1ace2948..6bc2343b 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -47,6 +47,14 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = *) let virtio_win = Inject_virtio_win.from_environment g inspect.i_root Config.datadir in + (match block_driver with + | Virtio_blk -> () (* the default, no need to do anything *) + | Virtio_SCSI -> + let drivers = Inject_virtio_win.get_block_driver_priority virtio_wi...

...ert/convert_windows.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 9d8d271d..bfe3ae13 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 + | Virtio_SCSI -> Virtio_SCSI | IDE -> IDE and of_virtio_win_net_type = function -- 2.31.1