summaryrefslogtreecommitdiff
path: root/hw/kdrive/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-09 09:28:46 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-09 10:47:11 +1000
commit1f24638985ce053b696ca3359cc50b5bc26ccb03 (patch)
treea80241078230e87f41cda2c41249d174531ab144 /hw/kdrive/src
parentae812bb79668e59cda1f851fb1fabe9db9ea705f (diff)
kdrive: output meaningful error message for HAL devices.
kdrive ignores all devices from hal as they don't have the 'type' option set. Instead of "Unrecognised device identifier!" print out "Ignoring device from HAL." to indicate that the errors surrounding the device don't really matter. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'hw/kdrive/src')
-rw-r--r--hw/kdrive/src/kinput.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 832b09c90..fb8ebd076 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2272,6 +2272,14 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
return BadValue;
}
}
+#ifdef CONFIG_HAL
+ else if (strcmp(option->key, "_source") == 0 &&
+ strcmp(option->value, "server/hal") == 0)
+ {
+ ErrorF("Ignoring device from HAL.\n");
+ return BadValue;
+ }
+#endif
}
if (!ki && !pi) {