search for: rcaps_net_bus

..., 10 deletions(-) diff --git a/v2v/types.ml b/v2v/types.ml index 2cb67fb..ab27510 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -357,10 +357,29 @@ type guestcaps = { gcaps_arch : string; gcaps_acpi : bool; } +and requested_guestcaps = { + rcaps_block_bus : guestcaps_block_type option; + rcaps_net_bus : guestcaps_net_type option; + rcaps_video : guestcaps_video_type option; +} and guestcaps_block_type = Virtio_blk | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +let string_of_block_type block_type = + (match block_type with + | Virtio_...

..., 10 deletions(-) diff --git a/v2v/types.ml b/v2v/types.ml index a082c37..821b7ec 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -361,10 +361,29 @@ type guestcaps = { gcaps_arch : string; gcaps_acpi : bool; } +and requested_guestcaps = { + rcaps_block_bus : guestcaps_block_type option; + rcaps_net_bus : guestcaps_net_type option; + rcaps_video : guestcaps_video_type option; +} and guestcaps_block_type = Virtio_blk | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +let string_of_block_type block_type = + (match block_type with + | Virtio_...

...> g#mkdir_p driverdir; > > if not (copy_drivers g inspect driverdir) then ( > + let block_type = match rcaps.rcaps_block_bus with > + | None -> IDE > + | Some block_type -> block_type in > + let net_type = match rcaps.rcaps_net_bus with > + | None -> RTL8139 > + | Some net_type -> net_type in > + let video = match rcaps.rcaps_video with > + | None -> Cirrus > + | Some video -> video in > + > + if block_type = Virtio_blk ||...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...d source_sound = { diff --git a/v2v/v2v.ml b/v2v/v2v.ml index c828e48..7f5decf 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -82,11 +82,17 @@ let rec main () = ); let keep_serial_console = output#keep_serial_console in - let rcaps = { - rcaps_block_bus = None; - rcaps_net_bus = None; - rcaps_video = None; - } in + let rcaps = + match conversion_mode with + | Copying (_, _) -> + { + rcaps_block_bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_f...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...rus | Source_QXL diff --git a/v2v/v2v.ml b/v2v/v2v.ml index c828e48..608150f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -82,11 +82,17 @@ let rec main () = ); let keep_serial_console = output#keep_serial_console in - let rcaps = { - rcaps_block_bus = None; - rcaps_net_bus = None; - rcaps_video = None; - } in + let rcaps = + match conversion_mode with + | Copying (_, _) -> + { + rcaps_block_bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_f...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...+ match rcaps.rcaps_video with + | None -> get_display_driver () + | Some video -> video in + + let block_type = + match rcaps.rcaps_block_bus with + | None -> if virtio then Virtio_blk else IDE + | Some block_type -> block_type in + + let net_type = + match rcaps.rcaps_net_bus with + | None -> if virtio then Virtio_net else E1000 + | Some net_type -> net_type in + configure_display_driver video; - remap_block_devices virtio; - configure_kernel_modules virtio; + remap_block_devices block_type; + configure_kernel_modules block_type net_type; rebuild_i...

...2v.ml > index c828e48..608150f 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -82,11 +82,17 @@ let rec main () = > ); > > let keep_serial_console = output#keep_serial_console in > - let rcaps = { > - rcaps_block_bus = None; > - rcaps_net_bus = None; > - rcaps_video = None; > - } in > + let rcaps = > + match conversion_mode with > + | Copying (_, _) -> You can just write this: | Copying _ -> > + { > + rcaps_block_bus = None; > + rcaps_net_bus...

...> > > > if not (copy_drivers g inspect driverdir) then ( > > + let block_type = match rcaps.rcaps_block_bus with > > + | None -> IDE > > + | Some block_type -> block_type in > > + let net_type = match rcaps.rcaps_net_bus with > > + | None -> RTL8139 > > + | Some net_type -> net_type in > > + let video = match rcaps.rcaps_video with > > + | None -> Cirrus > > + | Some video -> video in > > + > >...

...+ match rcaps.rcaps_video with + | None -> get_display_driver () + | Some video -> video in + + let block_type = + match rcaps.rcaps_block_bus with + | None -> if virtio then Virtio_blk else IDE + | Some block_type -> block_type in + + let net_type = + match rcaps.rcaps_net_bus with + | None -> if virtio then Virtio_net else E1000 + | Some net_type -> net_type in + configure_display_driver video; - remap_block_devices virtio; - configure_kernel_modules virtio; + remap_block_devices block_type; + configure_kernel_modules block_type net_type; rebuild_i...

...deo = > > + match source.s_video with > > + | Some Source_QXL -> Some QXL > > + | Some Source_Cirrus -> Some Cirrus > > + | Some Source_other_video _ | None -> None in > > + > > + { > > + rcaps_block_bus = block_type; > > + rcaps_net_bus = net_type; > > + rcaps_video = video; > > + } > > + > > let () = run_main_and_handle_errors main > > It's a bit surprising, because I thought that you'd want to pass in > the requested preferences on the command line? Passing that on the command line...

...tio" + | Source_virtio_blk -> "virtio-blk" + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_bloc...

...tio" + | Source_virtio_blk -> "virtio-blk" + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_bloc...

...tio" + | Source_virtio_blk -> "virtio-blk" + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_bloc...

...tio" + | Source_virtio_blk -> "virtio-blk" + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_bloc...

...estcaps_net_type = - let has_netkvm = g#exists (driverdir // "netkvm.inf") in + let filenames = ["virtio_net.inf"; "netkvm.inf"] in + let has_netkvm = List.exists (fun driver_file -> g#exists (driverdir // driver_file)) filenames in match rcaps.rcaps_net_bus, has_netkvm with | Some Virtio_net, false -> error (f_"there is no virtio network driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s") -- 2.6.6

...inspect source output rcaps = let block_type = match rcaps.rcaps_block_bus with - | None -> if virtio then Virtio_blk else IDE + | None -> if kernel.ki_supports_virtio_blk then Virtio_blk else IDE | Some block_type -> block_type in let net_type = match rcaps.rcaps_net_bus with - | None -> if virtio then Virtio_net else E1000 + | None -> if kernel.ki_supports_virtio_net then Virtio_net else E1000 | Some net_type -> net_type in configure_display_driver video; diff --git a/v2v/linux_kernels.ml b/v2v/linux_kernels.ml index 312d6d1c0..725bd03c2 1...