search for: guestcaps_video_typ

...index 2cb67fb..ab27510 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -357,10 +357,29 @@ type guestcaps = { gcaps_arch : string; gcaps_acpi : bool; } +and requested_guestcaps = { + rcaps_block_bus : guestcaps_block_type option; + rcaps_net_bus : guestcaps_net_type option; + rcaps_video : guestcaps_video_type option; +} and guestcaps_block_type = Virtio_blk | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +let string_of_block_type block_type = + (match block_type with + | Virtio_blk -> "virtio-blk" + | IDE -> "ide")...

...index a082c37..821b7ec 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -361,10 +361,29 @@ type guestcaps = { gcaps_arch : string; gcaps_acpi : bool; } +and requested_guestcaps = { + rcaps_block_bus : guestcaps_block_type option; + rcaps_net_bus : guestcaps_net_type option; + rcaps_video : guestcaps_video_type option; +} and guestcaps_block_type = Virtio_blk | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +let string_of_block_type block_type = + (match block_type with + | Virtio_blk -> "virtio-blk" + | IDE -> "ide")...

...s virtio drivers. *) val install_drivers - : Guestfs.guestfs -> Types.inspect -> string -> string -> int64 -> string -> + : Guestfs.guestfs -> Types.inspect -> string -> int64 -> string -> Types.guestcaps_block_type * Types.guestcaps_net_type * Types.guestcaps_video_type (** [install_drivers g inspect systemroot virtio_win root current_cs] installs virtio drivers from the driver directory or driver -- 2.5.0

...inspect.i_major_version inspect.i_minor_version - inspect.i_arch virtio_win; - RTL8139 - ) - else - (* It will be installed at firstboot. *) - Virtio_net in - - (* Can we install the QXL driver? *) - let video : guestcaps_video_type = - if not (List.exists - (fun { vwd_filename = filename } -> filename = "qxl.inf") - drivers) then ( - warning (f_"there is no QXL driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe gu...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...; + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_block_type block_type = (match block_type with | Virtio_blk -&g...

...; + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_block_type block_type = (match block_type with | Virtio_blk -&g...

...; + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_block_type block_type = (match block_type with | Virtio_blk -&g...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

..._balloon : bool; gcaps_isa_pvpanic : bool; + gcaps_machine : guestcaps_machine; gcaps_arch : string; gcaps_acpi : bool; } @@ -409,6 +410,7 @@ and requested_guestcaps = { and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +and guestcaps_machine = I440FX | Q35 | Virt let string_of_block_type = function | Virtio_blk -> "virtio-blk" @@ -421,17 +423,23 @@ let string_of_net_type = function let string_of_video = function | QXL -> "qxl" | Cirrus -> "cirrus&quot...

...; + | Source_virtio_SCSI -> "virtio-scsi" and string_of_source_removable { s_removable_type = typ; s_removable_controller = controller; @@ -366,13 +368,14 @@ and requested_guestcaps = { rcaps_net_bus : guestcaps_net_type option; rcaps_video : guestcaps_video_type option; } -and guestcaps_block_type = Virtio_blk | IDE +and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus let string_of_block_type block_type = (match block_type with | Virtio_blk -&g...

...inspect.i_major_version inspect.i_minor_version - inspect.i_arch virtio_win; - RTL8139 - ) - else - (* It will be installed at firstboot. *) - Virtio_net in - - (* Can we install the QXL driver? *) - let video : guestcaps_video_type = - if not (List.exists - (fun { vwd_filename = filename } -> filename = "qxl.inf") - drivers) then ( - warning (f_"there is no QXL driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe gu...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

..._balloon : bool; gcaps_isa_pvpanic : bool; + gcaps_machine : guestcaps_machine; gcaps_arch : string; gcaps_acpi : bool; } @@ -422,6 +423,7 @@ and requested_guestcaps = { and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE and guestcaps_net_type = Virtio_net | E1000 | RTL8139 and guestcaps_video_type = QXL | Cirrus +and guestcaps_machine = I440FX | Q35 | Virt let string_of_block_type = function | Virtio_blk -> "virtio-blk" @@ -434,17 +436,23 @@ let string_of_net_type = function let string_of_video = function | QXL -> "qxl" | Cirrus -> "cirrus&quot...

...bool; > + gcaps_machine : guestcaps_machine; > gcaps_arch : string; > gcaps_acpi : bool; > } > @@ -409,6 +410,7 @@ and requested_guestcaps = { > and guestcaps_block_type = Virtio_blk | Virtio_SCSI | IDE > and guestcaps_net_type = Virtio_net | E1000 | RTL8139 > and guestcaps_video_type = QXL | Cirrus > +and guestcaps_machine = I440FX | Q35 | Virt > > let string_of_block_type = function > | Virtio_blk -> "virtio-blk" > @@ -421,17 +423,23 @@ let string_of_net_type = function > let string_of_video = function > | QXL -> "qxl"...

Yaniv pointed out in https://bugzilla.redhat.com/show_bug.cgi?id=1438794 that virt-v2v both doesn't install the virtio-rng driver for Windows, and doesn't give the guest a virtio-rng PCI device either. There are two problems here: Firstly the Windows virtio-rng driver isn't included in the exploded tree (/usr/share/virtio-win) so it doesn't get copied into the guest. The solution

...> val install_drivers > - : Guestfs.guestfs -> Types.inspect -> string -> string -> int64 -> string -> > + : Guestfs.guestfs -> Types.inspect -> string -> int64 -> string -> > Types.guestcaps_block_type * Types.guestcaps_net_type * Types.guestcaps_video_type > (** [install_drivers g inspect systemroot virtio_win root current_cs] > installs virtio drivers from the driver directory or driver I made a minor additional change - fixing the documentation here. ACKed and pushed. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat...

v1 was posted here: https://www.redhat.com/archives/libguestfs/2017-April/msg00031.html v1 -> v2: - Add support for -o glance. - Add support for -o qemu. - Fix the -o libvirt support for balloon as pointed out by Dan. - Fix a test failure caused by changing libvirt XML output. Rich.

...win; RTL8139 - ) - else - (* It will be installed at firstboot. *) - Virtio_net in + + | (Some Virtio_net | None), true -> + Virtio_net + + | Some net_type, _ -> + net_type in (* Can we install the QXL driver? *) let video : guestcaps_video_type = - if not (g#exists (driverdir // "qxl.inf")) then ( + let has_qxl = g#exists (driverdir // "qxl.inf") in + match rcaps.rcaps_video, has_qxl with + | Some QXL, false -> + error (f_"there is no QXL driver for this version of Windows (%d.%d %s)...