search for: target_bus

...stro; + i_major_version = major; i_minor_version = minor; i_arch = arch; + i_product_name = product } -> + warning (f_"unknown guest operating system: %s %s %d.%d %s (%s)") + typ distro major minor arch product; + None + let create_libvirt_xml ?pool source targets target_buses guestcaps - target_features target_firmware = + target_features target_firmware inspect = (* The main body of the libvirt XML document. *) let body = ref [] in @@ -49,6 +143,19 @@ let create_libvirt_xml ?pool source targets target_buses guestcap...

...major; i_minor_version = minor; i_arch = arch; > + i_product_name = product } -> > + warning (f_"unknown guest operating system: %s %s %d.%d %s (%s)") > + typ distro major minor arch product; > + None > + > let create_libvirt_xml ?pool source targets target_buses guestcaps > - target_features target_firmware = > + target_features target_firmware inspect = > (* The main body of the libvirt XML document. *) > let body = ref [] in > > @@ -49,6 +143,19 @@ let create_libvirt_xml ?pool source...

...stro; + i_major_version = major; i_minor_version = minor; i_arch = arch; + i_product_name = product } -> + warning (f_"unknown guest operating system: %s %s %d.%d %s (%s)") + typ distro major minor arch product; + None + let create_libvirt_xml ?pool source targets target_buses guestcaps - target_features target_firmware = + target_features target_firmware inspect = (* The main body of the libvirt XML document. *) let body = ref [] in @@ -49,6 +153,19 @@ let create_libvirt_xml ?pool source targets target_buses guestcap...

...Miscellaneous other changes were required in the code. There is also a regression test (see following commit). Note this ignores floppy disks in '-o qemu' mode. --- v2v/input_libvirtxml.ml | 1 + v2v/output_libvirt.ml | 6 ++++-- v2v/output_qemu.ml | 4 ++++ v2v/target_bus_assignment.ml | 20 ++++++++++++-------- v2v/test-v2v-i-ova.xml | 2 +- v2v/types.ml | 1 + v2v/types.mli | 10 +++++++--- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml index 24e3b74..552bd9f...

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.

...| 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files 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_n...

...s.ml b/v2v/types.ml index 77f879200a26..2780f05fdfbf 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -521,6 +521,21 @@ class virtual output = object method override_output_format (_ : overlay) = (None : string option) method virtual prepare_targets : source -> (string * overlay) list -> target_buses -> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copy target compressed = + let filename = + match target.target_file with + | TargetFile filename -> qemu_input_filename filename +...

...get_firmware inspect guestcaps source output in + (match conversion_mode with + | In_place -> () + | Copying (overlays, targets) -> + let target_firmware = + get_target_firmware inspect guestcaps source output in - message (f_"Assigning disks to buses"); - let target_buses = target_bus_assignment source targets guestcaps in - if verbose () then - printf "%s%!" (string_of_target_buses target_buses); + message (f_"Assigning disks to buses"); + let target_buses = target_bus_assignment source targets guestcaps in + if verbose (...

...n in + (* Parse the capabilities XML in order to get the supported features. *) let doc = match capabilities_doc with @@ -436,7 +451,7 @@ class output_libvirt oc output_pool = object (* Create the metadata. *) let doc = - create_libvirt_xml ~pool:output_pool source target_buses + create_libvirt_xml ~pool:pool_name source target_buses guestcaps target_features target_firmware in let tmpfile, chan = Filename.open_temp_file "v2vlibvirt" ".xml" in -- 2.7.4

...2v/types.ml b/v2v/types.ml index 77f879200..714b30014 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -521,6 +521,7 @@ class virtual output = object method override_output_format (_ : overlay) = (None : string option) method virtual prepare_targets : source -> (string * overlay) list -> target_buses -> guestcaps -> inspect -> target_firmware -> target_file list method disk_create = (open_guestfs ())#disk_create + method disk_copied (_ : target) (_ : int) (_ : int) = () method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspec...

..."/domain/devices/controller[@model='virtio-scsi']" in + Xml.xpathobj_nr_nodes obj > 0 in + (* Non-removable disk devices. *) let disks = let get_disks, add_disk = @@ -208,12 +214,13 @@ let parse_libvirt_xml ?conn xml = let controller = let target_bus = xpath_string "target/@bus" in - match target_bus with - | None -> None - | Some "ide" -> Some Source_IDE - | Some "scsi" -> Some Source_SCSI - | Some "virtio" -> Some Source_virtio_blk - | Some _ -> N...

...string = function + | "unknown" -> JSON.Null + | v -> JSON.String v + +let find_target_disk targets { s_disk_id = id } = + try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets + with Not_found -> assert false + +let create_json_metadata source targets target_buses + guestcaps inspect target_firmware = + let doc = ref [ + "version", JSON.Int 1L; + "name", JSON.String source.s_name; + "memory", JSON.Int source.s_memory; + "vcpu", JSON.Int (Int64.of_int source.s_vcpu); + ] in + + (...

...string = function + | "unknown" -> JSON.Null + | v -> JSON.String v + +let find_target_disk targets { s_disk_id = id } = + try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets + with Not_found -> assert false + +let create_json_metadata source targets target_buses + guestcaps inspect target_firmware = + let doc = ref [ + "version", JSON.Int 1L; + "name", JSON.String source.s_name; + "memory", JSON.Int source.s_memory; + "vcpu", JSON.Int (Int64.of_int source.s_vcpu); + ] in + + (...

..."/domain/devices/controller[@model='virtio-scsi']" in + Xml.xpathobj_nr_nodes obj > 0 in + (* Non-removable disk devices. *) let disks = let get_disks, add_disk = @@ -208,12 +214,13 @@ let parse_libvirt_xml ?conn xml = let controller = let target_bus = xpath_string "target/@bus" in - match target_bus with - | None -> None - | Some "ide" -> Some Source_IDE - | Some "scsi" -> Some Source_SCSI - | Some "virtio" -> Some Source_virtio_blk - | Some _ -> N...

This series is an 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. Roman Kagan (3): v2v: add --in-place mode v2v: document --in-place v2v: add test for --in-place ---

..."/domain/devices/controller[@model='virtio-scsi']" in + (Xml.xpathobj_nr_nodes obj) > 0 in + (* Non-removable disk devices. *) let disks = let get_disks, add_disk = @@ -208,12 +214,13 @@ let parse_libvirt_xml ?conn xml = let controller = let target_bus = xpath_string "target/@bus" in - match target_bus with - | None -> None - | Some "ide" -> Some Source_IDE - | Some "scsi" -> Some Source_SCSI - | Some "virtio" -> Some Source_virtio_blk - | Some _ -> N...

..."/domain/devices/controller[@model='virtio-scsi']" in + Xml.xpathobj_nr_nodes obj > 0 in + (* Non-removable disk devices. *) let disks = let get_disks, add_disk = @@ -208,12 +214,13 @@ let parse_libvirt_xml ?conn xml = let controller = let target_bus = xpath_string "target/@bus" in - match target_bus with - | None -> None - | Some "ide" -> Some Source_IDE - | Some "scsi" -> Some Source_SCSI - | Some "virtio" -> Some Source_virtio_blk - | Some _ -> N...

This code is needed to check whether virtio-scsi driver was installed. This reverts commit f0afc439524853508938b2bfc758896f053462e3. --- convert/convert.ml | 2 +- convert/convert_linux.ml | 9 +++++++-- convert/target_bus_assignment.ml | 1 + lib/create_ovf.ml | 1 + lib/types.ml | 3 ++- lib/types.mli | 2 +- output/openstack_image_properties.ml | 7 +++++++ 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/convert/convert.ml b/conv...

This code is needed to check whether virtio-scsi driver was installed. This reverts commit f0afc439524853508938b2bfc758896f053462e3. --- convert/convert.ml | 2 +- convert/convert_linux.ml | 9 +++++++-- convert/target_bus_assignment.ml | 1 + lib/create_ovf.ml | 1 + lib/types.ml | 3 ++- lib/types.mli | 2 +- output/openstack_image_properties.ml | 7 +++++++ 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/convert/convert.ml b/conv...

...rey Drobyshev wrote: > This code is needed to check whether virtio-scsi driver was installed. > > This reverts commit f0afc439524853508938b2bfc758896f053462e3. > --- > convert/convert.ml | 2 +- > convert/convert_linux.ml | 9 +++++++-- > convert/target_bus_assignment.ml | 1 + > lib/create_ovf.ml | 1 + > lib/types.ml | 3 ++- > lib/types.mli | 2 +- > output/openstack_image_properties.ml | 7 +++++++ > 7 files changed, 20 insertions(+), 5 deletions(-) > > dif...