search for: source_scsi

https://bugzilla.redhat.com/show_bug.cgi?id=1508874 Also avoids a warning. Rich.

...ide_block_prefix in let map = @@ -1257,7 +1265,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let block_prefix_before_conversion = match disk.s_controller with | Some Source_IDE -> ide_block_prefix - | Some Source_SCSI -> "sd" + | Some Source_virtio_SCSI | Some Source_SCSI -> "sd" | Some Source_virtio_blk -> "vd" | None -> (* This is basically a guess. It assumes the source used IDE. *) diff --git a/v2v/input_libvirtxml...

...ide_block_prefix in let map = @@ -1255,7 +1263,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let block_prefix_before_conversion = match disk.s_controller with | Some Source_IDE -> ide_block_prefix - | Some Source_SCSI -> "sd" + | Some Source_virtio_SCSI | Some Source_SCSI -> "sd" | Some Source_virtio_blk -> "vd" | None -> (* This is basically a guess. It assumes the source used IDE. *) diff --git a/v2v/input_libvirtxml...

...ide_block_prefix in let map = @@ -1255,7 +1263,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let block_prefix_before_conversion = match disk.s_controller with | Some Source_IDE -> ide_block_prefix - | Some Source_SCSI -> "sd" + | Some Source_virtio_SCSI | Some Source_SCSI -> "sd" | Some Source_virtio_blk -> "vd" | None -> (* This is basically a guess. It assumes the source used IDE. *) diff --git a/v2v/input_libvirtxml...

...ide_block_prefix in let map = @@ -1255,7 +1258,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let block_prefix_before_conversion = match disk.s_controller with | Some Source_IDE -> ide_block_prefix - | Some Source_SCSI -> "sd" + | Some Source_virtio_SCSI | Some Source_SCSI -> "sd" | Some Source_virtio_blk -> "vd" | None -> (* This is basically a guess. It assumes the source used IDE. *) diff --git a/v2v/input_libvirtxml...

...es changed, 53 insertions(+), 8 deletions(-) > > diff --git a/v2v/types.mli b/v2v/types.mli > index 0e40668..fbd45cf 100644 > --- a/v2v/types.mli > +++ b/v2v/types.mli > @@ -66,7 +66,7 @@ and source_disk = { > (** A source disk. *) > > and s_controller = Source_IDE | Source_SCSI | Source_virtio_blk > -(** Source disk controller. > +(** Source disk controller (in ascending order of preference). > > For the purposes of this field, we can treat virtio-scsi as > [SCSI]. However we don't support conversions from virtio in any > @@ -88,7 +88,7...

...+++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/v2v/types.mli b/v2v/types.mli index 2949fd0..7ee78bd 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -66,7 +66,7 @@ and source_disk = { (** A source disk. *) and s_controller = Source_IDE | Source_SCSI | Source_virtio_blk -(** Source disk controller. +(** Source disk controller (in ascending order of preference). For the purposes of this field, we can treat virtio-scsi as [SCSI]. However we don't support conversions from virtio in any @@ -88,7 +88,7 @@ and source_nic = { s_vne...

...+++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/v2v/types.mli b/v2v/types.mli index 0e40668..fbd45cf 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -66,7 +66,7 @@ and source_disk = { (** A source disk. *) and s_controller = Source_IDE | Source_SCSI | Source_virtio_blk -(** Source disk controller. +(** Source disk controller (in ascending order of preference). For the purposes of this field, we can treat virtio-scsi as [SCSI]. However we don't support conversions from virtio in any @@ -88,7 +88,7 @@ and source_nic = { s_vne...

When importing from VMware via the libvirt driver, the libvirt driver can add an empty source bridge name: <interface type='bridge'> <mac address='00:01:02:03:04:05:06'/> <source bridge=''/> </interface> Replicate what we do on the -i ova path, and map these to "eth0", "eth1" etc. This also includes a bunch

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

...t; + let best_block_type = > > + List.fold_left max None > > + (List.map (fun sd -> sd.s_controller) source.s_disks) in > > + let block_type = > > + match best_block_type with > > + | Some Source_virtio_blk -> Some Virtio_blk > > + | Some Source_SCSI -> None > > + | Some Source_IDE -> Some IDE > > + | None -> None in > > + > > + (* rely on s_nic_model enum being in ascending preference order, and None > > + * being smaller than Some anything *) > > + let best_net_type = > > + List....

...address/> under <disk/>. > This case is handled fine in the patch, isn't it? has_virtio_scsi is a > local variable which is only consulted when populating per-drive > s_controller field: for drives with bus='scsi' it differentiates between > Source_virtio_SCSI and Source_SCSI. Oh I see, target_bus is consulted for each drive. So this is right (except for the scsi/virtio-scsi case, but who knows about that). > The place where we make up a single disk type is > v2v.ml:rcaps_from_source, but there I explicitly error out if the guest > has multiple disk types (w...

...sSlotRemovable r in let bus = - match r.s_removable_controller with - | None -> ide_bus (* Wild guess, but should be safe. *) - | Some Source_virtio_blk -> virtio_blk_bus - | Some Source_IDE -> ide_bus - | Some Source_virtio_SCSI | Some Source_SCSI -> scsi_bus in + match r.s_removable_type with + | CDROM -> + (match r.s_removable_controller with + | None -> ide_bus (* Wild guess, but should be safe. *) + | Some Source_virtio_blk -> virtio_blk_bus + | Some Source_...

...ext empty slot in that bus. + *) + List.iter ( + fun r -> + let bus = match r.s_removable_controller with + | None -> ide_bus (* Wild guess, but should be safe. *) + | Some Source_virtio_blk -> virtio_blk_bus + | Some Source_IDE -> ide_bus + | Some Source_SCSI -> scsi_bus in + match r.s_removable_slot with + | None -> ignore (insert_after bus 0 (BusSlotRemovable r)) + | Some desired_slot_nr -> + if not (insert_after bus desired_slot_nr (BusSlotRemovable r)) then + warning (f_"removable %s device in slot %d c...

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.

A colleague found some VMX files which omit the deviceType field. This allows -i vmx mode to parse them. Rich.

...let expr = sprintf "/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceID/text()=%d]/rasd:ResourceType/text()" id in - let controller = xpath_int expr in - - (* 6: iscsi controller, 5: ide *) - match controller with - | Some 6 -> Some Source_SCSI - | Some 5 -> Some Source_IDE + match name with | None -> - warning (f_"ova disk has no parent controller, please report this as a bug supplying the *.ovf file extracted from the ova"); - None - | Some controller -> - warning (f_"ov...

This isn't quite the full thing. I think that Pino is also working on replacing the ssh and scp commands in the v2v/input_vmx.ml file with libssh. Without those changes, -i vmx will still issue raw ssh and scp commands, which will use ssh-agent (or keyboard-interactive). The Xen input method doesn't use raw ssh and scp commands, so that one is OK. Rich.

A couple of patches cleaning up the -i ova code. These are both just refactoring (or should be at any rate). The second patch is best viewed with 'git show -w' to exclude whitespace changes. Rich.

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