search for: s_control

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

...Virtio_blk -> "vd" + | Virtio_SCSI -> "sd" | IDE -> 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 -> (* Th...

...Virtio_blk -> "vd" + | Virtio_SCSI -> "sd" | IDE -> 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 -> (* Th...

...Virtio_blk -> "vd" + | Virtio_SCSI -> "sd" | IDE -> 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 -> (* Th...

...+++++++++++----- > 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 virt...

...Virtio_blk -> "vd" + | Virtio_SCSI -> "sd" | IDE -> 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 -> (* Th...

...ml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 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...

...ml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 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...

...gt; > > For that, the source configuration is used to populate requested caps > > object which is then passed to the convert routine. [...] > > +and rcaps_from_source source = > > + (* Request guest caps based on source configuration. *) > > + > > + (* rely on s_controller enum being in ascending preference order, and None > > + * being smaller than Some anything *) > > + let best_block_type = > > + List.fold_left max None > > + (List.map (fun sd -> sd.s_controller) source.s_disks) in > > + let block_type = > > +...

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

...trollers is done, then? Is it specified > in drive's "address"? Yes, apparently using <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...

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.

...\"filename\":\"%s\" } } }" + offset size ova + ) + in let disk = { s_disk_id = i; - s_qemu_uri = filename; + s_qemu_uri = qemu_uri; s_format = Some "vmdk"; s_controller = controller; } in -- 2.10.1

..."json:%s" (JSON.string_of_doc ~fmt:JSON.Compact doc) in - debug "json: %s" uri; - uri - ) in - - let disk = { - s_disk_id = i; - s_qemu_uri = qemu_uri; - s_format = Some "vmdk"; - s_controller = controller; - } in - push_front disk disks; - ) else - error (f_"could not parse disk rasd:HostResource from OVF document") - done in - let disks = List.rev !disks in - - (* Floppies (ResourceType = 14), CDs (ResourceType = 15) and - *...

...\"filename\":\"%s\" } } }" + offset size ova + ) + in let disk = { s_disk_id = i; - s_qemu_uri = filename; + s_qemu_uri = qemu_uri; s_format = Some "vmdk"; s_controller = controller; } in -- 2.10.1

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

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

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

...e_controller = Source_IDE in - find_hdds vmx vmx_filename + find_hdds vmx vmx_source get_ide_controller_target is_ide_controller_target ide_device_types ide_controller -and find_hdds vmx vmx_filename +and find_hdds vmx vmx_source get_controller_target is_controller_target device_types controller = (* Find namespaces matching '(ide|scsi)X:Y' with suitable deviceType. *) @@ -101,9 +169,9 @@ and find_hdds vmx vmx_filename match path, v with | [ns; "filename"], Some filename -> let c, t = get...