[v2v 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 <lersek@redhat.com> --- 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 b8e9ad15e22d..5bfdac5aa6d9 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"? *)
On Fri, Sep 30, 2022 at 02:04:44PM +0200, Laszlo Ersek wrote:
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 <lersek@redhat.com> --- 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 b8e9ad15e22d..5bfdac5aa6d9 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
Reviewed-by: Richard W.M. Jones <rjones@redhat.com> A much simpler change than I thought it would be :-) Rich.
if modules <> [] then modules else (* Fallback copied from old virt-v2v. XXX Why not "ide"? *) _______________________________________________ Libguestfs mailing list Libguestfs@redhat.com https://listman.redhat.com/mailman/listinfo/libguestfs
-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
On 09/30/22 14:16, Richard W.M. Jones wrote:
On Fri, Sep 30, 2022 at 02:04:44PM +0200, Laszlo Ersek wrote:
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 <lersek@redhat.com> --- 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 b8e9ad15e22d..5bfdac5aa6d9 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
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Thanks! Commit aa69d64cd452.
A much simpler change than I thought it would be :-)
Indeed :) Laszlo
participants (2)
-
Laszlo Ersek -
Richard W.M. Jones