summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-01-25 15:51:07 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-01-25 16:14:04 +0100
commit4e54f5334e130dc8f627c96ef2179ff4262b7791 (patch)
tree64fdde91c48b465c8c4ab2fbb9481fb4269a50b1
parent2514465f6a4ab61617482f068e475b945438c1f1 (diff)
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 <kraxel@redhat.com>
-rw-r--r--Makefile.am5
-rw-r--r--extras/qemu/42-qemu-usb.rules13
-rw-r--r--rules/misc/30-kernel-compat.rules5
3 files changed, 23 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 2e3fe39425..b2300ce778 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 0000000000..4fd53c7477
--- /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 2c545dcca5..2a6a97c5f3 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"