search for: rcaps_video

.../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_blk -> "virtio-blk" + | IDE -...

.../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_blk -> "virtio-blk" + | IDE -...

...+ | 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 || net_type = Virtio_net || video = QXL then > + error (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s). virt...

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

....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_from_source source + in let guestc...

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

....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_from_source source + in let guestc...

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

..._blk -> "vd" + | IDE -> ide_block_prefix in let map = mapi ( @@ -1411,15 +1420,29 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = let acpi = supports_acpi () in - let video = get_display_driver () in + let video = + 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 + | No...

...; --- 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 = None; > + rcaps_video = Non...

...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 || net_type = Virtio_net || video = QXL then > > + error (f_"there are no virtio drivers available for this version of Win...

..._blk -> "vd" + | IDE -> ide_block_prefix in let map = mapi ( @@ -1411,15 +1420,29 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = let acpi = supports_acpi () in - let video = get_display_driver () in + let video = + 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 + | No...

...ange like: diff -Nurp a/v2v/convert_linux.ml b/v2v/convert_linux.ml --- a/v2v/convert_linux.ml    2019-02-28 16:30:58.668800431 -0700 +++ b/v2v/convert_linux.ml    2019-02-28 16:33:14.729907825 -0700 @@ -104,7 +104,7 @@ let convert (g : G.guestfs) inspect sour        let video =        match rcaps.rcaps_video with -      | None -> get_display_driver () +      | None -> QLX        | Some video -> video in        let block_type = @@ -771,9 +771,6 @@ let convert (g : G.guestfs) inspect sour      else        true   -  and get_display_driver () = -    if family = `SUSE_family then Cirrus else QXL -...

...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 makes sense for the copying mode, beca...

...irtio-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_block_type block_type = (match block_type wit...

...irtio-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_block_type block_type = (match block_type wit...

...t; + error (f_"curl error: failed to download ‘%s’, error code %d") url code + in + run_main_and_handle_errors main_wrap diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 277d8f2c7..1b3ec0b6c 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -870,4 +870,11 @@ and rcaps_from_source source = rcaps_video = video; } -let () = run_main_and_handle_errors main +let () = + let main_wrap () = + try main () + with + | Curl.Curl_failed (code, url) -> + error (f_"curl error: failed to download ‘%s’, error code %d") url code + in + run_main_and_handle_errors main_wrap -- 2...

...irtio-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_block_type block_type = (match block_type wit...

Hi Mike, in 2013 you added the support for SUSE guests in the old virt-v2v (the one written in Perl); the commit doing it is attached, since the old virt-v2v was hosted on fedorahosted.org, which is no more. As part of that change, the default graphics driver was changed to be cirrus for SUSE guests, and qxl (as before) for any other. When Rich Jones rewrote virt-v2v in 2014 in OCaml, he kept