From: Gerd Hoffmann Date: Tue, 25 Jan 2011 14:51:07 +0000 (+0100) Subject: extras: add rules for qemu guests X-Git-Tag: 174~264 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4e54f5334e130dc8f627c96ef2179ff4262b7791;ds=sidebyside extras: add rules for qemu guests These patches enable usb autosuspend for the qemu emulated HID devices. This reduces the cpu load for idle guests with a hid device attached because the linux kernel will suspend the usb bus then and qemu can stop running a 1000 Hz to emulate the (active) UHCI controller. Signed-off-by: Gerd Hoffmann --- diff --git a/Makefile.am b/Makefile.am index 2e3fe3942..b2300ce77 100644 --- a/Makefile.am +++ b/Makefile.am @@ -317,6 +317,11 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la libexec_PROGRAMS += extras/v4l_id/v4l_id dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules +# ------------------------------------------------------------------------------ +# qemu -- qemu/kvm guest tweaks +# ------------------------------------------------------------------------------ +dist_udevrules_DATA += extras/qemu/99-qemu-usb.rules + if ENABLE_EXTRAS # ------------------------------------------------------------------------------ # conditional extras (need glib, libusb, libacl, ...) diff --git a/extras/qemu/42-qemu-usb.rules b/extras/qemu/42-qemu-usb.rules new file mode 100644 index 000000000..4fd53c747 --- /dev/null +++ b/extras/qemu/42-qemu-usb.rules @@ -0,0 +1,13 @@ +# +# Enable autosuspend for qemu emulated usb hid devices. +# +# Note that there are buggy qemu versions which advertise remote +# wakeup support but don't actually implement it correctly. This +# is the reason why we need a match for the serial number here. +# The serial number "42" is used to tag the implementations where +# remote wakeup is working. +# + +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" +CTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" diff --git a/rules/misc/30-kernel-compat.rules b/rules/misc/30-kernel-compat.rules index 2c545dcca..2a6a97c5f 100644 --- a/rules/misc/30-kernel-compat.rules +++ b/rules/misc/30-kernel-compat.rules @@ -97,4 +97,9 @@ SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block" SUBSYSTEM=="pnp", DRIVER!="?*", \ RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" +# see extras/qemu/42-qemu-usb.rules, version for 2.6.32 + older. +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto" +ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto" + LABEL="kernel_compat_end"