qemu-irix/ui
Peter Maydell 01b601f061 Merge qio 2016/10/27 v1
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYEfjrAAoJEL6G67QVEE/fdU4P/i7yBJo436OpkdgeWS8AWuFr
 ptZ+Fj/weGka5GU9E3KQu36kbSgrtfcgwTHphCMXnZ0YCeKQDuM57f7LNiN6qheB
 nqgJvJioLbUvLTQvCHOISM7bWOnYvASBmYtLJFtUcP/jhdOy61KaADnJ+7MbliNv
 yJSW2RN+s/y9nUb+dxEpIXXUVMRa6BX+wHW3O44c1oLn6/Pe20aJeHTyDx3qiBhD
 8RYXUgRZopH2bouBSzXgMQTbn/QMD/dC81WQlHKlt4swffyei2D/1pciOcuc0SXz
 +SZdkTre5JB5Kd6DU8zQ6PrrIt1nPmLSptSyhQvNxm+uWNWHnFcW1s2aYmf/ikjl
 4boW37ayJx09mns8yv7TerzEPbL5qJvVX8Dsnb6telkvrS9hy9S1xuIB5xHbt6/h
 vwFmCdwaZoGpDDaoXRL+9k9TOI9BbEMKX33nAPDqvEXLMIf+og4fmweTKcY4XTRL
 /Fdg1H71v8Ayv+r5TJOKwFg3PNNjnvqkbk1psS+aaW7dup43iaYGIKWy+VFaCufk
 hPXLOtR5lUsYC2qm+nkjPIgoP7D8oZx4AGkCHbYsqzi+l1lynZH3rBIs8ggLr72o
 FFk4g0sNYe1ccAa89jFEgWIQbS0N6ckUXCv12g3eyF/UIC1F35/mGGugSRnTXuc2
 a/WsvgU7pGBrtqXcg7lF
 =gsxL
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging

Merge qio 2016/10/27 v1

# gpg: Signature made Thu 27 Oct 2016 13:54:03 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2016-10-27-1:
  main: set names for main loop sources created
  vnc: set name for all I/O channels created
  migration: set name for all I/O channels created
  char: set name for all I/O channels created
  nbd: set name for all I/O channels created
  io: add ability to set a name for IO channels
  io: Add a QIOChannelSocket cleanup test
  io: set LISTEN flag explicitly for listen sockets
  io: Introduce a qio_channel_set_feature() helper
  io: Use qio_channel_has_feature() where applicable
  io: Fix double shift usages on QIOChannel features

Conflicts:
	qemu-char.c

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2016-10-28 15:30:55 +01:00
..
shader
Makefile.objs
cocoa.m qemu-doc: merge qemu-tech and qemu-doc 2016-10-07 10:05:54 +02:00
console-gl.c
console.c char: remove explicit_be_open from CharDriverState 2016-10-24 15:46:11 +02:00
curses.c ui/curses.c: Clean up nextchr logic 2016-09-13 08:01:39 +02:00
curses_keys.h Clean up decorations and whitespace around header guards 2016-07-12 16:20:46 +02:00
cursor.c
cursor_hidden.xpm
cursor_left_ptr.xpm
egl-context.c
egl-helpers.c
gtk-egl.c virgl: pass whole GL scanout dimensions 2016-07-06 10:32:14 +02:00
gtk-gl-area.c gtk: fix build 2016-07-11 10:40:29 +01:00
gtk.c char: remove explicit_be_open from CharDriverState 2016-10-24 15:46:11 +02:00
input-keymap.c
input-legacy.c
input-linux.c input-linux: initialize key state 2016-10-13 09:25:24 +02:00
input.c
keymaps.c
keymaps.h Clean up ill-advised or unusual header guards 2016-07-12 16:20:46 +02:00
qemu-pixman.c
qemu-x509.h
sdl.c
sdl2-2d.c
sdl2-gl.c virgl: pass whole GL scanout dimensions 2016-07-06 10:32:14 +02:00
sdl2-input.c
sdl2-keymap.h
sdl2.c
sdl_keysym.h
sdl_zoom.c
sdl_zoom.h Clean up ill-advised or unusual header guards 2016-07-12 16:20:46 +02:00
sdl_zoom_template.h
shader.c
spice-core.c vl: Switch qemu_uuid to QemuUUID 2016-09-23 11:42:52 +08:00
spice-display.c spice/gl: render DisplaySurface via opengl 2016-09-28 12:49:36 +02:00
spice-input.c
trace-events trace-events: fix first line comment in trace-events 2016-08-12 10:36:01 +01:00
vgafont.h
vnc-auth-sasl.c
vnc-auth-sasl.h Clean up ill-advised or unusual header guards 2016-07-12 16:20:46 +02:00
vnc-auth-vencrypt.c vnc: set name for all I/O channels created 2016-10-27 09:13:10 +02:00
vnc-auth-vencrypt.h Clean up ill-advised or unusual header guards 2016-07-12 16:20:46 +02:00
vnc-enc-hextile-template.h
vnc-enc-hextile.c
vnc-enc-tight.c ui/vnc-enc-tight: remove switch and have single return 2016-09-28 12:55:09 +02:00
vnc-enc-tight.h Clean up header guards that don't match their file name 2016-07-12 16:19:16 +02:00
vnc-enc-zlib.c
vnc-enc-zrle-template.c
vnc-enc-zrle.c
vnc-enc-zrle.h Clean up header guards that don't match their file name 2016-07-12 16:19:16 +02:00
vnc-enc-zywrle-template.c
vnc-enc-zywrle.h Clean up header guards that don't match their file name 2016-07-12 16:19:16 +02:00
vnc-jobs.c
vnc-jobs.h
vnc-palette.c
vnc-palette.h
vnc-ws.c vnc: set name for all I/O channels created 2016-10-27 09:13:10 +02:00
vnc-ws.h Clean up ill-advised or unusual header guards 2016-07-12 16:20:46 +02:00
vnc.c vnc: set name for all I/O channels created 2016-10-27 09:13:10 +02:00
vnc.h ui: rename vnc_init_state to vnc_start_protocol 2016-10-13 09:22:31 +02:00
vnc_keysym.h
x_keymap.c
x_keymap.h