From 554903483acb4af402feaba013366388db89e36b Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Date: Thu, 7 Sep 2017 11:30:17 -0700 Subject: 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] (From OE-Core rev: 261f9c382121c73b72556a151fdd4c7938b32a92) Signed-off-by: Alejandro Hernandez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 0596e2ed3f..1456bf7e8b 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -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}" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index ff6e5491bb..fcc44595e8 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -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" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index f8b09c37f2..c53f7a92ce 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -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" -- cgit 1.2.3-korg