[Libguestfs] [virt-v2v RFC wave 2 04/10] convert/windows_virtio: handle Standard_VGA in the requested guest caps

Permit the conversion to request standard VGA display in the requested guest capabilities structure. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/windows_virtio.ml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml index 11b34a03f876..ee887fa8f715 100644 --- a/convert/windows_virtio.ml +++ b/convert/windows_virtio.ml @@ -51,7 +51,6 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = if not (copy_drivers g inspect driverdir) then ( match rcaps with - | { rcaps_video = Some Standard_VGA } -> assert false | { rcaps_block_bus = Some Virtio_blk | Some Virtio_SCSI } | { rcaps_net_bus = Some Virtio_net } | { rcaps_video = Some QXL } -> @@ -61,7 +60,7 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = | { rcaps_block_bus = ((Some IDE | None) as block_type); rcaps_net_bus = ((Some E1000 | Some RTL8139 | None) as net_type); - rcaps_video = ((Some Cirrus | None) as video_type) } -> + rcaps_video = ((Some Standard_VGA | Some Cirrus | None) as video_type) } -> if block_type = None || net_type = None || video_type = None then warning (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s). virt-v2v looks for drivers in %s\n\nThe guest will be configured to use slower emulated devices.") inspect.i_major_version inspect.i_minor_version inspect.i_arch @@ -70,8 +69,12 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = let net_type = match net_type with | Some model -> model - | None -> RTL8139 in - (IDE, net_type, Cirrus, false, false, false, false) + | None -> RTL8139 + and video_type = + match video_type with + | Some model -> model + | None -> Cirrus in + (IDE, net_type, video_type, false, false, false, false) ) else ( (* Can we install the block driver? *) @@ -162,7 +165,6 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = g#exists (driverdir // "qxl.inf") || g#exists (driverdir // "qxldod.inf") in match rcaps.rcaps_video, has_qxl with - | Some Standard_VGA, _ -> assert false | Some QXL, false -> error (f_"there is no QXL driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s") inspect.i_major_version inspect.i_minor_version @@ -177,8 +179,8 @@ let rec install_drivers ((g, _) as reg) inspect rcaps = | (Some QXL | None), true -> QXL - | Some Cirrus, _ -> - Cirrus in + | Some (Cirrus | Standard_VGA as video_type), _ -> + video_type in (* Did we install the miscellaneous drivers? *) let virtio_rng_supported = g#exists (driverdir // "viorng.inf") in -- 2.19.1.3.g30247aa5d201