search for: source_disk

Patch supplied by Mikhail Gordeev, posting for review. I have compile tested it and checked the code and it looks all fine to me, so ACK from my point of view. I did not actually run it because I don't have an ALT Linux install, but it doesn't seem as if it would affect any other distro. Rich.

...++++++++++++++++ v2v/convert_linux.mli | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index a871d754f4..5ae83a2f66 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -52,6 +52,7 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ = | "rhel" | "centos" | "scientificlinux" | "redhat-based" | "oraclelinux" -> `RHEL_family | "sles" | "suse-based" | "opensuse" -> `SUSE_family + | "altlinux" -> `ALT...

..."filename", JSON.String ova] + ] + ] in + let uri = + sprintf "json:%s" (JSON.string_of_doc ~fmt:JSON.Compact doc) in + debug "json: %s" uri; + uri + ) in + + { disk.source_disk with s_qemu_uri = qemu_uri } + ) disks in let source = { s_hypervisor = VMware; @@ -481,7 +316,7 @@ object s_sound = None; s_disks = disks; s_removables = removables; - s_nics = List.rev !nics; + s_nics = nics; } in source diff --git a/v2...

..., and mentioning it in the documentation 3) the patch for the initrd work needed 4) the patch (if needed, see below) for the vmware tools libraries Also, in patch (2) could go also the addition of ALT Linux to docs/virt-v2v-support.pod. > @@ -372,6 +373,9 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ = > ); > ) libraries > ) > + else if family = `ALT_family then ( > + remove := libraries > + ) The "if" of this else is: (* We only support removal of libraries on systems which use yum. *) if in...

https://bugzilla.redhat.com/show_bug.cgi?id=1508874 Also avoids a warning. 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.

Hi, I was trying to migrate some VM's to Virtio-SCSI block devices, as this gives some advantages. While checking the virt-v2v code, I found out that it supported Virtio-SCSI, but some bits were missing. In attachment a small patch that adds the missing bits :) Best regards Jean-Louis

...ion no? > > (b) Now the problem is patch #3: > >> diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml >> index a871d754..a36cc21d 100644 >> --- a/v2v/convert_linux.ml >> +++ b/v2v/convert_linux.ml >> @@ -109,7 +109,7 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ = >> >> let block_type = >> match rcaps.rcaps_block_bus with >> - | None -> if kernel.ki_supports_virtio_blk then Virtio_blk else IDE >> + | None -> if kernel.ki_supports_virtio_scsi then Virtio_SCSI else if kernel.ki_su...

...uot; | IDE -> ide_block_prefix in let map = diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml index 54c9516b..d13340c7 100644 --- a/convert/target_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 5e4448...

...uot; | IDE -> ide_block_prefix in let map = diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml index 54c9516b..d13340c7 100644 --- a/convert/target_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 5e4448...

...refix in > > let map = > diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml > index 54c9516b..d13340c7 100644 > --- a/convert/target_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...

...l b/v2v/types.ml index a9d28e0..2cb67fb 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -32,6 +32,7 @@ type source = { s_features : string list; s_firmware : source_firmware; s_display : source_display option; + s_video : source_video option; s_sound : source_sound option; s_disks : source_disk list; s_removables : source_removable list; @@ -63,10 +64,12 @@ and source_removable = { and s_removable_type = CDROM | Floppy and source_nic = { s_mac : string option; + s_nic_model : s_nic_model option; s_vnet : string; s_vnet_orig : string; s_vnet_type : vnet_type; } +and s_ni...

...l b/v2v/types.ml index a9d28e0..a082c37 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -32,6 +32,7 @@ type source = { s_features : string list; s_firmware : source_firmware; s_display : source_display option; + s_video : source_video option; s_sound : source_sound option; s_disks : source_disk list; s_removables : source_removable list; @@ -63,10 +64,13 @@ and source_removable = { and s_removable_type = CDROM | Floppy and source_nic = { s_mac : string option; + s_nic_model : s_nic_model option; s_vnet : string; s_vnet_orig : string; s_vnet_type : vnet_type; } +and s_ni...

...l b/v2v/types.ml index a9d28e0..a082c37 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -32,6 +32,7 @@ type source = { s_features : string list; s_firmware : source_firmware; s_display : source_display option; + s_video : source_video option; s_sound : source_sound option; s_disks : source_disk list; s_removables : source_removable list; @@ -63,10 +64,13 @@ and source_removable = { and s_removable_type = CDROM | Floppy and source_nic = { s_mac : string option; + s_nic_model : s_nic_model option; s_vnet : string; s_vnet_orig : string; s_vnet_type : vnet_type; } +and s_ni...

...let map = >> diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml >> index 54c9516b..d13340c7 100644 >> --- a/convert/target_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 ->...

...but as a separate change from patch #1). (b) Now the problem is patch #3: > diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml > index a871d754..a36cc21d 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -109,7 +109,7 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ = > > let block_type = > match rcaps.rcaps_block_bus with > - | None -> if kernel.ki_supports_virtio_blk then Virtio_blk else IDE > + | None -> if kernel.ki_supports_virtio_scsi then Virtio_SCSI else if kernel.ki_supports_virtio_blk then...

...ot;$DOMAIN" > "$TMP/${DOMAIN}.xml" && \ > virsh dumpxml --inactive "$DOMAIN" > "$DESTINATION_XML" && \ > virsh undefine "$DOMAIN" && \ > virsh blockcopy "$DOMAIN" "$SOURCE_DISK" "$DESTINATION_DISK" > --wait --verbose --finish && \ > virsh define "$TMP/${DOMAIN}.xml" > > It's basic and did work for creating basic backups. Is there a way to do > this without undefining the domain? Not yet. Qemu doesn'...

...>> diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml >>> index 54c9516b..d13340c7 100644 >>> --- a/convert/target_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 ( >&g...

...: - /windows.img (raw) [virtio] + /windows.img (raw) [virtio-blk] removable media: NICs: Network \"default\" mac: 00:11:22:33:44:55 [virtio]" ]; then diff --git a/v2v/types.ml b/v2v/types.ml index 821b7ec..9a23b4a 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -55,7 +55,8 @@ and source_disk = { s_format : string option; s_controller : s_controller option; } -and s_controller = Source_IDE | Source_SCSI | Source_virtio_blk +and s_controller = Source_IDE | Source_SCSI | + Source_virtio_blk | Source_virtio_SCSI and source_removable = { s_removable_type : s_rem...