search for: source_disks

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_...

Mixing the XML parsing with the other functions of this module made it very hard to understand. Splitting the XML parsing into another module simplifies the flow considerably. This is just code refactoring and should not affect the semantics. --- v2v/Makefile.am | 2 + v2v/input_ova.ml | 323 +++++++++++---------------------------------- v2v/parse_ovf_from_ova.ml | 226

..., 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 ins...

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_sup...

...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 5e44486...

...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 5e44486...

...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_...

Those will be useful when making decisions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 32

Those will be useful when making decisions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 27

Those will be useful when making decisions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- Notes: v2: - add catch-all string-valued variants for source network and video adapter models test-data/phony-guests/guests.xml.in | 8 ++++++++

...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 V...

On 10/13/2015 09:46 PM, Nathan Shearer wrote: > I have a script that performs a backup with the following steps: > > virsh dumpxml --inactive "$DOMAIN" > "$TMP/${DOMAIN}.xml" && \ > virsh dumpxml --inactive "$DOMAIN" > "$DESTINATION_XML" && \ > virsh undefine "$DOMAIN" && \

...>> 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 ( >&gt...

Virtio-SCSI offers a number of advantages over virtio-blk, in particular, it supports SCSI UNMAP (aka trim) which is crucial for keeping the virtual drive from wasting host disk space. This patch adds support for virtio-scsi as the virtual disk connection type both on input and on output of v2v. Virtio-blk remains the default, so for now virtio-scsi-based guests can only be produced in