search for: ide_bus

...changed, 119 insertions(+) diff --git a/v2v/types.ml b/v2v/types.ml index 34e169c..522814e 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -350,6 +350,35 @@ gcaps_acpi = %b gcaps.gcaps_arch gcaps.gcaps_acpi +type target_buses = { + target_virtio_blk_bus : target_bus_slot array; + target_ide_bus : target_bus_slot array; + target_scsi_bus : target_bus_slot array; +} + +and target_bus_slot = + | BusSlotEmpty + | BusSlotTarget of target + | BusSlotRemovable of source_removable + +let string_of_target_bus_slots bus_name slots = + let slots = + Array.mapi ( + fun slot_nr slot ->...

...quot; ] []; e "target" [ "dev", drive_prefix ^ drive_name i; - "bus", bus_name ] [] ] in @@ -185,7 +184,10 @@ let create_libvirt_xml ?pool source target_buses guestcaps target_buses.target_ide_bus); Array.to_list (Array.mapi (make_disk "scsi" "sd") - target_buses.target_scsi_bus) + target_buses.target_scsi_bus); + Array.to_list + (Array.mapi (make_disk "floppy" "fd") +...

...ename - ) overlays - ); + if debug_overlays then preserve_overlays overlays source.s_name; message (f_"Finishing off"); delete_target_on_exit := false (* Don't delete target on exit. *) @@ -916,4 +906,15 @@ and target_bus_assignment source targets guestcaps = target_ide_bus = !ide_bus; target_scsi_bus = !scsi_bus } +and preserve_overlays overlays src_name = + (* Save overlays if --debug-overlays option was used. *) + let overlay_dir = (new Guestfs.guestfs ())#get_cachedir () in + List.iter ( + fun ov -> + let saved_filename = + sprintf &quo...

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

...;) ); guestcaps @@ -939,6 +940,7 @@ and target_bus_assignment source targets guestcaps = let t = BusSlotTarget t in match guestcaps.gcaps_block_bus with | Virtio_blk -> insert virtio_blk_bus i t + | Virtio_SCSI -> insert scsi_bus i t | IDE -> insert ide_bus i t ) targets; @@ -952,7 +954,7 @@ and target_bus_assignment source targets guestcaps = | 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...

...;) ); guestcaps @@ -939,6 +940,7 @@ and target_bus_assignment source targets guestcaps = let t = BusSlotTarget t in match guestcaps.gcaps_block_bus with | Virtio_blk -> insert virtio_blk_bus i t + | Virtio_SCSI -> insert scsi_bus i t | IDE -> insert ide_bus i t ) targets; @@ -952,7 +954,7 @@ and target_bus_assignment source targets guestcaps = | 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...

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.

...;) ); guestcaps @@ -939,6 +940,7 @@ and target_bus_assignment source targets guestcaps = let t = BusSlotTarget t in match guestcaps.gcaps_block_bus with | Virtio_blk -> insert virtio_blk_bus i t + | Virtio_SCSI -> insert scsi_bus i t | IDE -> insert ide_bus i t ) targets; @@ -952,7 +954,7 @@ and target_bus_assignment source targets guestcaps = | 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...

..._assignment.ml +++ b/convert/target_bus_assignment.ml @@ -35,6 +35,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = let bus = match guestcaps.gcaps_block_bus with | Virtio_blk -> virtio_blk_bus + | Virtio_SCSI -> scsi_bus | IDE -> ide_bus in List.iteri ( fun i d -> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml index 5e444868..f0b32e01 100644 --- a/lib/create_ovf.ml +++ b/lib/create_ovf.ml @@ -920,6 +920,7 @@ and add_disks sizes guestcaps output_alloc output_format "ovf:disk-interface",...

..._assignment.ml +++ b/convert/target_bus_assignment.ml @@ -35,6 +35,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = let bus = match guestcaps.gcaps_block_bus with | Virtio_blk -> virtio_blk_bus + | Virtio_SCSI -> scsi_bus | IDE -> ide_bus in List.iteri ( fun i d -> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml index 5e444868..f0b32e01 100644 --- a/lib/create_ovf.ml +++ b/lib/create_ovf.ml @@ -920,6 +920,7 @@ and add_disks sizes guestcaps output_alloc output_format "ovf:disk-interface",...

...arget_bus_assignment.ml > @@ -35,6 +35,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = > let bus = > match guestcaps.gcaps_block_bus with > | Virtio_blk -> virtio_blk_bus > + | Virtio_SCSI -> scsi_bus > | IDE -> ide_bus in > List.iteri ( > fun i d -> > diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml > index 5e444868..f0b32e01 100644 > --- a/lib/create_ovf.ml > +++ b/lib/create_ovf.ml > @@ -920,6 +920,7 @@ and add_disks sizes guestcaps output_alloc output_format >...

...>> @@ -35,6 +35,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = >> let bus = >> match guestcaps.gcaps_block_bus with >> | Virtio_blk -> virtio_blk_bus >> + | Virtio_SCSI -> scsi_bus >> | IDE -> ide_bus in >> List.iteri ( >> fun i d -> >> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml >> index 5e444868..f0b32e01 100644 >> --- a/lib/create_ovf.ml >> +++ b/lib/create_ovf.ml >> @@ -920,6 +920,7 @@ and add_disks sizes guestcaps output_alloc...

...;) ); guestcaps @@ -939,6 +940,7 @@ and target_bus_assignment source targets guestcaps = let t = BusSlotTarget t in match guestcaps.gcaps_block_bus with | Virtio_blk -> insert virtio_blk_bus i t + | Virtio_SCSI -> insert scsi_bus i t | IDE -> insert ide_bus i t ) targets; @@ -952,7 +954,7 @@ and target_bus_assignment source targets guestcaps = | 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...

...5,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = >>> let bus = >>> match guestcaps.gcaps_block_bus with >>> | Virtio_blk -> virtio_blk_bus >>> + | Virtio_SCSI -> scsi_bus >>> | IDE -> ide_bus in >>> List.iteri ( >>> fun i d -> >>> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml >>> index 5e444868..f0b32e01 100644 >>> --- a/lib/create_ovf.ml >>> +++ b/lib/create_ovf.ml >>> @@ -920,6 +920,7 @@ and add_disks s...

..._assignment.ml +++ b/convert/target_bus_assignment.ml @@ -35,6 +35,7 @@ let rec target_bus_assignment source_disks source_removables guestcaps = let bus = match guestcaps.gcaps_block_bus with | Virtio_blk -> virtio_blk_bus + | Virtio_SCSI -> scsi_bus | IDE -> ide_bus in List.iteri ( fun i d -> diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml index 5e444868..f0b32e01 100644 --- a/lib/create_ovf.ml +++ b/lib/create_ovf.ml @@ -920,6 +920,7 @@ and add_disks sizes guestcaps output_alloc output_format "ovf:disk-interface",...

This series is a second attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. The first 14 patches are just refactoring and rearrangement of the code, factoring the implementation

Since commits b28cd1dc ("Remove requested_guestcaps / rcaps"), f0afc439 ("Remove guestcaps_block_type Virtio_SCSI") support for installing virtio-scsi driver is missing in virt-v2v. AFAIU plans and demands for bringing this feature back have been out there for a while. E.g. I've found a corresponding issue which is still open [1]. The code in b28cd1dc, f0afc439 was

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

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"