search for: guestcap

.../convert.ml b/convert/convert.ml index 0aa0e5cd..084619c8 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = (* Did we manage to install virtio drivers? *) if not (quiet ()) then ( match guestcaps.gcaps_block_bus with - | Virtio_blk -> + | Virtio_blk | Virtio_SCSI -> info (f_"This guest has virtio drivers installed.") | IDE -> info (f_"This guest does not have virtio drivers installed.") diff --git a/convert/convert_linux.ml b/conver...

.../convert.ml b/convert/convert.ml index 0aa0e5cd..084619c8 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = (* Did we manage to install virtio drivers? *) if not (quiet ()) then ( match guestcaps.gcaps_block_bus with - | Virtio_blk -> + | Virtio_blk | Virtio_SCSI -> info (f_"This guest has virtio drivers installed.") | IDE -> info (f_"This guest does not have virtio drivers installed.") diff --git a/convert/convert_linux.ml b/conver...

...changed, 30 insertions(+), 29 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index a2b6f52..633c29f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -84,35 +84,8 @@ let rec main () = check_free_space mpstats; check_target_free_space mpstats source targets output; - (* Conversion. *) - let guestcaps = - (match inspect.i_product_name with - | "unknown" -> - message (f_"Converting the guest to run on KVM") - | prod -> - message (f_"Converting %s to run on KVM") prod - ); - - (* RHEV doesn't support serial console so remove any on...

...t; index 0aa0e5cd..084619c8 100644 > --- a/convert/convert.ml > +++ b/convert/convert.ml > @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = > (* Did we manage to install virtio drivers? *) > if not (quiet ()) then ( > match guestcaps.gcaps_block_bus with > - | Virtio_blk -> > + | Virtio_blk | Virtio_SCSI -> > info (f_"This guest has virtio drivers installed.") > | IDE -> > info (f_"This guest does not have virtio drivers installed.") > diff --git a/con...

...7 files changed, 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 Ue...

...9c8 100644 >> --- a/convert/convert.ml >> +++ b/convert/convert.ml >> @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = >> (* Did we manage to install virtio drivers? *) >> if not (quiet ()) then ( >> match guestcaps.gcaps_block_bus with >> - | Virtio_blk -> >> + | Virtio_blk | Virtio_SCSI -> >> info (f_"This guest has virtio drivers installed.") >> | IDE -> >> info (f_"This guest does not have virtio drivers installed.") &...

...--- a/convert/convert.ml >>> +++ b/convert/convert.ml >>> @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = >>> (* Did we manage to install virtio drivers? *) >>> if not (quiet ()) then ( >>> match guestcaps.gcaps_block_bus with >>> - | Virtio_blk -> >>> + | Virtio_blk | Virtio_SCSI -> >>> info (f_"This guest has virtio drivers installed.") >>> | IDE -> >>> info (f_"This guest does not have virtio drivers...

...-------------------- 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 + | Virt...

...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 guestcaps | Som...

.../convert.ml b/convert/convert.ml index 0aa0e5cd..084619c8 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -252,7 +252,7 @@ and do_convert g source inspect i_firmware keep_serial_console interfaces = (* Did we manage to install virtio drivers? *) if not (quiet ()) then ( match guestcaps.gcaps_block_bus with - | Virtio_blk -> + | Virtio_blk | Virtio_SCSI -> info (f_"This guest has virtio drivers installed.") | IDE -> info (f_"This guest does not have virtio drivers installed.") diff --git a/convert/convert_linux.ml b/conver...

...nux"), major -> + if major < 4 then I440FX else Q35 + + (* reasonable default for all modern Linux kernels *) + | ("i386"|"x86_64"), _, _ -> Q35 + | _ -> Virt in + (* Return guest capabilities from the convert () function. *) let guestcaps = { gcaps_block_bus = block_type; @@ -130,6 +149,7 @@ let convert (g : G.guestfs) inspect source output rcaps = gcaps_virtio_rng = kernel.ki_supports_virtio_rng; gcaps_virtio_balloon = kernel.ki_supports_virtio_balloon; gcaps_isa_pvpanic = kernel.ki_supports_isa_pvpanic...

...method supported_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...

...x_relabel.relabel g; + (* XXX Look up this information in libosinfo in future. *) + let machine = + match inspect.i_arch with + | "i386"|"x86_64" -> I440FX + | _ -> Virt in + (* Return guest capabilities from the convert () function. *) let guestcaps = { gcaps_block_bus = block_type; @@ -130,6 +136,7 @@ let convert (g : G.guestfs) inspect source output rcaps = gcaps_virtio_rng = kernel.ki_supports_virtio_rng; gcaps_virtio_balloon = kernel.ki_supports_virtio_balloon; gcaps_isa_pvpanic = kernel.ki_supports_isa_pvpanic...

...+ try Modules_list.find_convert_module inspect + with Not_found -> + error (f_"virt-v2v is unable to convert this guest type (%s/%s)") + inspect.i_type inspect.i_distro in + if verbose () then printf "picked conversion module %s\n%!" conversion_name; + let guestcaps = convert ~keep_serial_console g inspect source in + if verbose () then printf "%s%!" (string_of_guestcaps guestcaps); + + (* Did we manage to install virtio drivers? *) + if not (quiet ()) then ( + if guestcaps.gcaps_block_bus = Virtio_blk then + info (f_"This guest has...

...33 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f60ca9ed3..8d16cf175 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -269,7 +269,7 @@ let create_meta_files output_alloc sd_uuid image_uuids targets = (* Create the OVF file. *) let rec create_ovf source targets guestcaps inspect - output_alloc sd_uuid image_uuids vol_uuids vm_uuid = + output_alloc sd_uuid image_uuids vol_uuids vm_uuid rhv_export_flavor = assert (List.length targets = List.length vol_uuids); let memsize_mb = source.s_memory /^ 1024L /^ 1024L in @@ -288,12 +288,22 @@ let rec create_ovf...

...ta _ | Comment _ -> assert false | Element e -> e.e_children <- e.e_children @ [child] @@ -33,15 +69,48 @@ let append_attr attr = function | PCData _ | Comment _ -> assert false | Element e -> e.e_attrs <- e.e_attrs @ [attr] -let create_libvirt_xml ?pool source targets guestcaps = +let create_libvirt_xml ?pool source targets guestcaps target_features = let memory_k = source.s_memory /^ 1024L in + (* We have the machine features of the guest when it was on the + * source hypervisor (source.s_features). We have the acpi flag + * which tells us whether acpi is req...

...e target, because the target does not support %s firmware (supported firmware on target: %s)") - (string_of_target_firmware target_firmware) - (String.concat " " - (List.map string_of_target_firmware supported_firmware)); - - output#check_target_firmware guestcaps target_firmware; - - (match target_firmware with - | TargetBIOS -> () - | TargetUEFI -> info (f_"This guest requires UEFI on the target to boot.")); + let target_firmware = get_target_firmware inspect guestcaps source output in message (f_"Assigning disks to buses&q...

...or_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 ta...

Introduce a type to contain the guestcaps that are to be put in effect in the converted VM: options of the block type, net type, and video. It'll be populated by the caller and passed into convert function to affect its choice of of devices and drivers. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2v/types.ml | 47...

Introduce a type to contain the guestcaps that are to be put in effect in the converted VM: options of the block type, net type, and video. It'll be populated by the caller and passed into convert function to affect its choice of devices and drivers. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- v2v/types.ml | 47 +++...