search for: add_bridge

...t; no_trim : string list; output_alloc : output_allocation; output_format : string option; @@ -81,16 +87,25 @@ let parse_cmdline () = error (f_"unknown -i option: %s") s in - let network_map = ref [] in + let network_map = ref NetworkMap.empty in let add_network, add_bridge = - let add t str = + let add flag name t str = match String.split ":" str with - | "", "" -> error (f_"invalid --bridge or --network parameter") - | out, "" | "", out -> network_map := ((t, ""), out)...

...ndwidth_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), s_"Map bridge ?in? to ?out?"; + [ L"block-driver" ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'vir...

...ndwidth_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), s_"Map bridge ?in? to ?out?"; + [ L"block-driver" ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'vir...

...ay) add_nic(result, nic.mac, iface_name) + + # process the vlan tagging + + nic.network.usages.map do |usage| + usage.networks.map do |net| + if net.type == "Vlan" + eth_vlan_name = "#{nic.interface_name}.#{net.number}" + add_bridge(result, 'none', eth_vlan_name, + nic.boot_protocol, nic.ip_address, + nic.netmask, nic.broadcast, + nic.gateway) + add_vlan(result, eth_vlan_name) + end + end # end of : usage.networks.map do |net| + end...

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac

...,6 +27,7 @@ open Types open Utils let parse_cmdline () = + let compressed = ref false in let debug_overlays = ref false in let do_copy = ref true in let machine_readable = ref false in @@ -147,6 +148,7 @@ let parse_cmdline () = let argspec = [ "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; "--bridge", Arg.String add_bridge, "in:out " ^ ditto; + "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; "--dcpath"...

...Arg.Set dryrun, " " ^ s_"Perform a dry run"; diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 0a0349c..ad0b16c 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -137,7 +137,6 @@ let parse_cmdline () = let argspec = [ "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--debug-gc",Arg.Unit set_debug_gc, " " ^ s_"Debug GC and memory allocations"; "--d...

....0a0349c 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -134,7 +134,7 @@ let parse_cmdline () = String.concat "|" (Modules_list.output_modules ()) in let ditto = " -\"-" in - let argspec = Arg.align [ + let argspec = [ "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; "--bridge", Arg.String add_bridge, "in:out " ^ ditto; "--debug-gc",Arg.Unit set_debug_gc, " " ^ s_"Debug GC and memory allocations"; @@ -146,8 +146...

...@@ open Types open Utils let parse_cmdline () = - let debug_gc = ref false in let debug_overlays = ref false in let do_copy = ref true in let input_conn = ref "" in @@ -138,7 +137,7 @@ let parse_cmdline () = let argspec = Arg.align [ "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--debug-gc",Arg.Set debug_gc, " " ^ s_"Debug GC and memory allocations"; + "--d...

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

...1064987..ff0ab59 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -164,55 +164,47 @@ let parse_cmdline () = and o_options = String.concat "|" (Modules_list.output_modules ()) in - let ditto = " -\"-" in let argspec = [ - "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; - "--dcpath"...

...emu_boot = ref false in - let dcpath = ref None in let input_conn = ref None in let input_format = ref None in let in_place = ref false in @@ -182,8 +181,6 @@ let parse_cmdline () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge ‘in’ to ‘out’"; [ L"compressed" ], Getopt.Set compressed, s_"Compress output file (-of qcow2 only)"; - [ L"dcpath"; L"dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath), -...

Shahar: This is the same patch as you posted, but I have rebased it on top of current HEAD. You'll have to do save the next email to a file, and do: git reset --hard HEAD^ git pull git am /path/to/saved_email There are no changes in this patch, except what is needed to make it compile. Will follow-up with comments. Rich.

...e.ml > +++ b/v2v/cmdline.ml > @@ -164,55 +164,47 @@ let parse_cmdline () = > and o_options = > String.concat "|" (Modules_list.output_modules ()) in > > - let ditto = " -\"-" in > let argspec = [ > - "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; > - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; > - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; > - &quot...

...ettext open Common_utils +open Getopt.OptionName open Types open Utils @@ -165,45 +166,45 @@ let parse_cmdline () = String.concat "|" (Modules_list.output_modules ()) in let argspec = [ - [ "-b"; "--bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge 'in' to 'out'"; - [ "--compressed" ], Getopt.Set compressed, s_"Compress output file"; - [ "--dcpath"; "--dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath),...

On Thu, Aug 21, 2014 at 01:50:18PM +0100, Richard W.M. Jones wrote: > + (* extract ova (tar) file *) > + let cmd = sprintf ("tar -xf %s -C %s") (ova) (dir) in Lots of extra parentheses here :-) The same command can be written more naturally without any of them: let cmd = sprintf "tar -xf %s -C %s" ova dir in However I think what you might have meant is to call

...1a729ca..1cd30d7 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -164,55 +164,47 @@ let parse_cmdline () = and o_options = String.concat "|" (Modules_list.output_modules ()) in - let ditto = " -\"-" in let argspec = [ - "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; - "--dcpath"...

This is built on top of the following patch series: https://www.redhat.com/archives/libguestfs/2019-April/msg00054.html Rich.