search for: target_firmwar

...a/v2v/v2v.ml b/v2v/v2v.ml index 633c29f..afffde2 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -103,26 +103,7 @@ let rec main () = g#shutdown (); g#close (); - (* Does the guest require UEFI on the target? *) - message (f_"Checking if the guest needs BIOS or UEFI to boot"); - let target_firmware = - match source.s_firmware with - | BIOS -> TargetBIOS - | UEFI -> TargetUEFI - | UnknownFirmware -> - if inspect.i_uefi then TargetUEFI else TargetBIOS in - let supported_firmware = output#supported_firmware in - if not (List.mem target_firmware supported_firmware) t...

...anged, 28 insertions(+), 12 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 2cf610333..1cab11dfd 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -462,6 +462,22 @@ let origin_of_source_hypervisor = function *) | _ -> None +let get_ovirt_biostype guestcaps target_firmware = + let uefi_firmware = + match target_firmware with + | TargetBIOS -> None + | TargetUEFI -> Some (find_uefi_firmware guestcaps.gcaps_arch) in + let secure_boot_required = + match uefi_firmware with + | Some { Uefi.flags = flags } + when List.mem Uefi.UEFI_FLAG_SEC...

...+++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index c6a567a..c1bce1b 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -399,6 +399,30 @@ let do_convert g inspect source keep_serial_console = guestcaps +let get_target_firmware inspect guestcaps source output = + (* Does the guest require UEFI on the target? *) + message (f_"Checking if the guest needs BIOS or UEFI to boot"); + let target_firmware = + match source.s_firmware with + | BIOS -> TargetBIOS + | UEFI -> TargetUEFI + | UnknownFirm...

...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 guestcaps | Some genid -> List.push_back body (e "genid" [...

...t_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 guestcaps > | Some genid -> List.push_ba...

...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 guestcaps | Some genid -> List.push_back body (e "genid" [...

...Get the capabilities from libvirt. *) let xml = Libvirt_utils.capabilities ?conn:oc () in @@ -140,6 +138,8 @@ class output_libvirt oc output_pool = object { t with target_file = target_file } ) targets + method supported_firmware = [ TargetBIOS; TargetUEFI ] + method check_target_firmware guestcaps target_firmware = match target_firmware with | TargetBIOS -> () diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 9ba1d6f..9c105ef 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -30,8 +30,6 @@ class output_local dir = object method as_options =...

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

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.

..._firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] method prepare_targets source targets = (* This does nothing useful except to check that the user has @@ -66,9 +66,6 @@ object ) targets method create_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); - (* The first disk, assumed to be the system disk, will be called * "guestname". Subsequent disks, assumed to be data disks, * will be called "guestname-disk2" etc. The m...

...fbf 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 + | TargetURI uri -> uri in + let cmd = + [...

...new element in the OVF, this also enables the conversion of UEFI guests to oVirt. It is tested? Does it require other changes? I'd split the addition of <BiosType> to the OVF in an own patch, and the enablement of UEFI for oVirt in a different one. > +let get_ovirt_biostype guestcaps target_firmware = > + let uefi_firmware = > + match target_firmware with > + | TargetBIOS -> None > + | TargetUEFI -> Some (find_uefi_firmware guestcaps.gcaps_arch) in > + let secure_boot_required = > + match uefi_firmware with > + | Some { Uefi.flags = flags } > +...

...0014 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 -> inspect -> target_firmware -> unit method keep_ser...

...cript.error_unless_python_interpreter_found (); @@ -374,23 +376,21 @@ If the messages above are not sufficient to diagnose the problem then add the TargetURI ("json:" ^ JSON.string_of_doc json_params) ) overlays - method create_metadata source targets _ guestcaps inspect target_firmware = - (* Get the UUIDs of each disk image. These files are written - * out by the nbdkit plugins on successful finalization of the + method disk_copied t i nr_disks = + (* Get the UUID of the disk image. This file is written + * out by the nbdkit plugin on successful finalization of...

...rride v2v-supplied compat option, because RHEL 6 * nodes cannot handle qcow2 v3 (RHBZ#1145582). diff --git a/v2v/types.ml b/v2v/types.ml index a295172..038d259 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -401,7 +401,7 @@ class virtual output = object method virtual supported_firmware : target_firmware list method check_target_firmware (_ : guestcaps) (_ : target_firmware) = () method check_target_free_space (_ : source) (_ : target list) = () - method disk_create = (new Guestfs.guestfs ())#disk_create + method disk_create = (open_guestfs ())#disk_create method virtual create_metadata...

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

...-- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index cfb19b4..3feb2e4 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -66,6 +66,78 @@ object ) targets method create_metadata source targets _ guestcaps inspect target_firmware = + (* Collect the common properties for all the disks. *) + let min_ram = source.s_memory /^ 1024L /^ 1024L in + let common_properties = + let properties = ref [ + "hw_disk_bus", + (match guestcaps.gcaps_block_bus with + | Virtio_blk -> "virti...

...I440FX | Q35 | Virt diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml index c75d72fe..c76ad913 100644 --- a/output/openstack_image_properties.ml +++ b/output/openstack_image_properties.ml @@ -35,6 +35,7 @@ let create source inspect { target_buses; guestcaps; target_firmware } = "hw_disk_bus", (match guestcaps.gcaps_block_bus with | Virtio_blk -> "virtio" + | Virtio_SCSI -> "scsi" | IDE -> "ide"); "hw_vif_model", (match guestcaps.gcaps_net_bus with @@ -69,6 +70,12 @@ let cre...

...I440FX | Q35 | Virt diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml index c75d72fe..c76ad913 100644 --- a/output/openstack_image_properties.ml +++ b/output/openstack_image_properties.ml @@ -35,6 +35,7 @@ let create source inspect { target_buses; guestcaps; target_firmware } = "hw_disk_bus", (match guestcaps.gcaps_block_bus with | Virtio_blk -> "virtio" + | Virtio_SCSI -> "scsi" | IDE -> "ide"); "hw_vif_model", (match guestcaps.gcaps_net_bus with @@ -69,6 +70,12 @@ let cre...

...; diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml > index c75d72fe..c76ad913 100644 > --- a/output/openstack_image_properties.ml > +++ b/output/openstack_image_properties.ml > @@ -35,6 +35,7 @@ let create source inspect { target_buses; guestcaps; target_firmware } = > "hw_disk_bus", > (match guestcaps.gcaps_block_bus with > | Virtio_blk -> "virtio" > + | Virtio_SCSI -> "scsi" > | IDE -> "ide"); > "hw_vif_model", > (match guestcaps.gcaps_net_...