Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-9' into staging

input: add event routing and multiseat support.
input: misc bugfixes and minor improvements.

# gpg: Signature made Mon 26 May 2014 07:44:29 BST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

* remotes/kraxel/tags/pull-input-9:
  docs: add multiseat.txt
  usb: add input routing support for tablet and keyboard
  sdl: pass key event source to input layer
  input: bind devices and input routing
  input: switch hid mouse and tablet to the new input layer api.
  input: switch hid keyboard to new input layer api.
  input: keymap: add meta keys
  input: add name to input_event_key_number
  input: add qemu_input_key_number_to_qcode
  input (curses): mask keycodes to remove modifier bits

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined trace-events
index 7a415d952a0585bdb0b2740d98acf6debea26e37,08702047364d3703c5391cdaaad42e5143fbf1b8..ea56d5281e93d8a7343d9f4f7d76d43fecc806ee
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -627,6 -627,9 +627,6 @@@ lm32_uart_memory_write(uint32_t addr, u
  lm32_uart_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
  lm32_uart_irq_state(int level) "irq state %d"
  
 -# hw/misc/lm32_sys.c
 -lm32_sys_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
 -
  # hw/scsi/megasas.c
  megasas_init_firmware(uint64_t pa) "pa %" PRIx64 " "
  megasas_init_queue(uint64_t queue_pa, int queue_len, uint64_t head, uint64_t tail, uint32_t flags) "queue at %" PRIx64 " len %d head %" PRIx64 " tail %" PRIx64 " flags %x"
@@@ -1047,7 -1050,7 +1047,7 @@@ gd_update(int x, int y, int w, int h) "
  gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)"
  
  # ui/input.c
- input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%x, down %d"
+ input_event_key_number(int conidx, int number, const char *qcode, bool down) "con %d, key number 0x%x [%s], down %d"
  input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d"
  input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d"
  input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d"