Skip to contentSkip to conversation

qemu: backport a patch to optionally disable i8042 (AT and PS/2) hardware

PATCH New Ross Burton 1 participant 2 messages Apr 19, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qemu: backport a patch to optionally disable i8042 (AT and PS/2) hardware

Backport a patch from upstream (will be in qemu 7.0) to add an option to disable the legacy i8042 support (AT keyboard, PS/2 mouse). These devices are very historical and modern Linux environments use USB anyway.

---
 meta/recipes-devtools/qemu/qemu.inc          |   1 +
 meta/recipes-devtools/qemu/qemu/no-ps2.patch | 123 +++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/no-ps2.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
index 4e94c4b2bf4..09a2d470056 100644
@@ -33,6 +33,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://0001-vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch \
            file://0002-virtio-net-fix-map-leaking-on-error-during-receive.patch \
            file://pvrdma.patch \
+           file://no-ps2.patch \
            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/qemu/qemu/no-ps2.patch new file +123 -0

123 lines not on this page · raw message

Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 qemux86-64: disable legacy i8042 (AT keyboard, PS/2 mouse)

These devices are historical, modern Linux will just use the USB devices, and occasionally the init of these devices fails:

atkbd serio0: Failed to deactivate keyboard on isa0060/serio0 psmouse serio1: Failed to reset mouse on isa0060/serio1: -5

Explicitly add a USB keyboard to go with the USB tablet, and disable the i8042 entirely.

[ YOCTO #14718 ]
[ YOCTO #14743 ]

---
 meta/conf/machine/include/x86/qemuboot-x86.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
meta/conf/machine/include/x86/qemuboot-x86.inc +5 -6
index b7b6428e44c..3953679366d 100644
@@ -1,14 +1,13 @@
 # For runqemu
 IMAGE_CLASSES += "qemuboot"
 QB_SMP = "-smp 4"
-QB_CPU:x86 = "-cpu IvyBridge -machine q35"
-QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35"
+QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off"
+QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off"
 
-QB_CPU:x86-64 = "-cpu IvyBridge -machine q35"
-QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
+QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off"
+QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off"
 
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-device AC97"
 QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1"
-QB_OPT_APPEND = "-usb -device usb-tablet"
-
+QB_OPT_APPEND = "-usb -device usb-tablet -usb -device usb-kbd"
Signature · 1 line
2.25.1