qemu conf: Fix kernel module autoloading for uvesafb on genericx86

PATCH New Alejandro Hernandez 1 participant 1 message Sep 7, 2017

Share & tools

Alejandro Hernandez

author

2017-09-07 18:30 UTC #0 lore raw

PATCH v2 1/1 qemu conf: Fix kernel module autoloading for uvesafb on genericx86

After commit e8b1c653946ef921b65d47e52aea0dc530ef4286, we started seeing errors like the following during boot on genericx86 machines:

uvesafb: failed to execute /sbin/v86d
uvesafb: probe of uvesafb.0 failed with error -22
uvesafb: vbe_init() failed with -22
uvesafb: Getting VBE info block failed (eax=0x4f00, err=-2)

These were caused because the uvesa module was being loaded during boot, when it is only meant to be loaded on qemu according to:
6af89812e8a9931ffed63768ed85367519bf7aef

Since genericx86-common.inc includes qemuboot-x86, the module also tries to be loaded on genericx86 machines, this patch removes the instruction from qemuboot-x86 and adds it in specific to both qemux86 machines confs so it is correctly loaded only on those.

[YOCTO #11879]

Signed-off-by Alejandro Hernandez <[email protected]>

---
 meta/conf/machine/include/qemuboot-x86.inc | 3 ---
 meta/conf/machine/qemux86-64.conf          | 4 ++++
 meta/conf/machine/qemux86.conf             | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

meta/conf/machine/include/qemuboot-x86.inc +0 -3

index 0596e2ed3fb..1456bf7e8bc 100644
@@ -14,7 +14,4 @@ QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.tim
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci"
 
-KERNEL_MODULE_AUTOLOAD += "uvesafb"
-KERNEL_MODULE_PROBECONF += "uvesafb"
 UVESA_MODE ?= "640x480-32"
-module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"

meta/conf/machine/qemux86-64.conf +4 -0

index ff6e5491bbc..fcc44595e8c 100644
@@ -29,5 +29,9 @@ MACHINE_FEATURES += "x86 pci"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
+KERNEL_MODULE_AUTOLOAD += "uvesafb"
+KERNEL_MODULE_PROBECONF += "uvesafb"
+module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
+
 WKS_FILE ?= "directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

meta/conf/machine/qemux86.conf +4 -0

index f8b09c37f29..c53f7a92ce5 100644
@@ -28,5 +28,9 @@ MACHINE_FEATURES += "x86 pci"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
+KERNEL_MODULE_AUTOLOAD += "uvesafb"
+KERNEL_MODULE_PROBECONF += "uvesafb"
+module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
+
 WKS_FILE ?= "directdisk.wks"
 do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

Signature · 1 line

2.12.3