From ea261c2e84aacaca4b3612c400117cb0e4929b36 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 30 Sep 2022 14:04:44 +0200 Subject: [PATCH] convert_linux: include the BOCHS DRM driver in the initial ram disk UEFI RHEL-7 guests cannot be successfully converted from VMWare without including the BOCHS DRM driver -- Plymouth ("rhgb") crashes during early boot in the converted domain. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2131123 Signed-off-by: Laszlo Ersek Message-Id: <20220930120444.11883-1-lersek@redhat.com> Reviewed-by: Richard W.M. Jones (cherry picked from commit aa69d64cd4526f1f7e3ddffd25a81f404936f853) --- convert/convert_linux.ml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml index b8e9ad15..5bfdac5a 100644 --- a/convert/convert_linux.ml +++ b/convert/convert_linux.ml @@ -731,8 +731,13 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = match kernel.ki_initrd with | None -> () | Some initrd -> - (* Enable the basic virtio modules in the kernel. *) - (* Also forcibly include the "xts" module; see RHBZ#1658126. *) + (* Enable the basic virtio modules in the kernel. + * + * Also forcibly include the "xts" module; see RHBZ#1658126. + * + * Include the BOCHS DRM paravirt video driver; see RHBZ#2131123. This + * driver is known under two names -- "bochs-drm" and "bochs". + *) let modules = let modules = (* The order of modules here is deliberately the same as the @@ -743,7 +748,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = *) List.filter (fun m -> List.mem m kernel.ki_modules) [ "virtio"; "virtio_ring"; "virtio_blk"; - "virtio_scsi"; "virtio_net"; "virtio_pci"; "xts" ] in + "virtio_scsi"; "virtio_net"; "virtio_pci"; "xts"; + "bochs-drm"; "bochs" ] in if modules <> [] then modules else (* Fallback copied from old virt-v2v. XXX Why not "ide"? *)