Commit 025573be authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180827-v4-pull-request' into staging 



ui: misc fixes which piled up during 3.0 release freeze

# gpg: Signature made Mon 27 Aug 2018 09:53:07 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180827-v4-pull-request:
  util: promote qemu_egl_rendernode_open() to libqemuutil
  dmabuf: add y0_top, pass it to spice
  ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro
  ui/sdl2: Fix broken -full-screen CLI option
  spice-display: fix qemu_spice_cursor_refresh_bh locking
  spice-display: access ptr_x/ptr_y under Mutex
  vnc: remove support for deprecated tls, x509, x509verify options
  doc: switch to modern syntax for VNC TLS setup
  sdl2: redraw correctly when scanout_mode enabled.
  ui: use enum to string helpers
  vnc: fix memleak of the "vnc-worker-output" name
  ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 235c82ac b1d38037

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,7 @@ S: Odd Fixes 
F: ui/

F: include/ui/

F: qapi/ui.json

F: util/drm.c



Cocoa graphics

M: Peter Maydell <peter.maydell@linaro.org>

include/qemu/drm.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef QEMU_DRM_H_

#define QEMU_DRM_H_



int qemu_drm_rendernode_open(const char *rendernode);



#endif

include/ui/console.h

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ struct QemuDmaBuf { 
    uint32_t  stride;

    uint32_t  fourcc;

    uint32_t  texture;

    bool      y0_top;

};



typedef struct DisplayChangeListenerOps {

qemu-deprecated.texi

+0 −20
Original line number Diff line number Diff line
@@ -40,26 +40,6 @@ which is the default. 
The ``-no-kvm'' argument is now a synonym for setting

``-machine accel=tcg''.



@subsection -vnc tls (since 2.5.0)



The ``-vnc tls'' argument is now a synonym for setting

``-object tls-creds-anon,id=tls0'' combined with

``-vnc tls-creds=tls0'



@subsection -vnc x509 (since 2.5.0)



The ``-vnc x509=/path/to/certs'' argument is now a

synonym for setting

``-object tls-creds-x509,dir=/path/to/certs,id=tls0,verify-peer=no''

combined with ``-vnc tls-creds=tls0'



@subsection -vnc x509verify (since 2.5.0)



The ``-vnc x509verify=/path/to/certs'' argument is now a

synonym for setting

``-object tls-creds-x509,dir=/path/to/certs,id=tls0,verify-peer=yes''

combined with ``-vnc tls-creds=tls0'



@subsection -tftp (since 2.6.0)



The ``-tftp /some/dir'' argument is replaced by either

qemu-doc.texi

+15 −5
Original line number Diff line number Diff line
@@ -1103,7 +1103,9 @@ support provides a secure session, but no authentication. This allows any 
client to connect, and provides an encrypted session.



@example

qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio

qemu-system-i386 [...OPTIONS...] \

  -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=no \

  -vnc :1,tls-creds=tls0 -monitor stdio

@end example



In the above example @code{/etc/pki/qemu} should contain at least three files,
@@ -1118,10 +1120,14 @@ only be readable by the user owning it. 
Certificates can also provide a means to authenticate the client connecting.

The server will request that the client provide a certificate, which it will

then validate against the CA certificate. This is a good choice if deploying

in an environment with a private internal certificate authority.

in an environment with a private internal certificate authority. It uses the

same syntax as previously, but with @code{verify-peer} set to @code{yes}

instead.



@example

qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio

qemu-system-i386 [...OPTIONS...] \

  -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \

  -vnc :1,tls-creds=tls0 -monitor stdio

@end example
@@ -1132,7 +1138,9 @@ Finally, the previous method can be combined with VNC password authentication 
to provide two layers of authentication for clients.



@example

qemu-system-i386 [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio

qemu-system-i386 [...OPTIONS...] \

  -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \

  -vnc :1,tls-creds=tls0,password -monitor stdio

(qemu) change vnc password

Password: ********

(qemu)
@@ -1169,7 +1177,9 @@ credentials. This can be enabled, by combining the 'sasl' option 
with the aforementioned TLS + x509 options:



@example

qemu-system-i386 [...OPTIONS...] -vnc :1,tls,x509,sasl -monitor stdio

qemu-system-i386 [...OPTIONS...] \

  -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=yes \

  -vnc :1,tls-creds=tls0,sasl -monitor stdio

@end example



@node vnc_setup_sasl