[Qemu-commits] [qemu/qemu] fba958: gtk: implement set_echo

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fba958c692e47a373d15c1fd3d72b255bf76adbd
      
https://github.com/qemu/qemu/commit/fba958c692e47a373d15c1fd3d72b255bf76adbd
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M include/ui/gtk.h
    M ui/gtk.c

  Log Message:
  -----------
  gtk: implement set_echo

Even without line editing, this makes -qmp vc more pleasant with the
GTK+ backend.  The only issue is that set_echo is invoked very early,
long before a vc is actually associated with a VirtualConsole.  To work
around this, create a temporary VirtualConsole until then.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 67c4c2bd958b0074ffbcde12cb434cd064adab12
      
https://github.com/qemu/qemu/commit/67c4c2bd958b0074ffbcde12cb434cd064adab12
  Author: Wolfgang Bumiller <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: clear vs->tlscreds after unparenting it

This pointer should be cleared in vnc_display_close()
otherwise a use-after-free can happen when when using the
old style 'x509' and 'tls' options rather than a persistent
tls-creds -object, by issuing monitor commands to change
the vnc server like so:

Start with: -vnc unix:test.socket,x509,tls
Then use the following monitor command:
  change vnc unix:test.socket

After this the pointer is still set but invalid and a crash
can be triggered for instance by issuing the same command a
second time which will try to object_unparent() the same
pointer again.

Signed-off-by: Wolfgang Bumiller <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 06bb88145cb977fe699a80df82b619eadbc29b28
      
https://github.com/qemu/qemu/commit/06bb88145cb977fe699a80df82b619eadbc29b28
  Author: Christophe Fergeau <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M ui/spice-core.c

  Log Message:
  -----------
  Fix corner-case when using VNC+SASL+SPICE

Similarly to the commit 764eb39d1b6 fixing VNC+SASL+QXL, when starting
QEMU with SPICE but no SASL, and at the same time VNC with SASL, then
spice_server_init() will get called without a previous call to
spice_server_set_sasl_appname(), which will cause cyrus-sasl to
try to use /etc/sasl2/spice.conf (spice-server uses "spice" as its
default appname) rather than the expected /etc/sasl2/qemu.conf.

This commit unconditionally calls spice_server_set_sasl_appname()
before calling spice_server_init() in order to use the correct appname
even if SPICE without SASL was requested on qemu command line.

Signed-off-by: Christophe Fergeau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c62e90af8c2e8b1a89d973963db2bb817702bf42
      
https://github.com/qemu/qemu/commit/c62e90af8c2e8b1a89d973963db2bb817702bf42
  Author: Wolfgang Bumiller <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix tls-creds error message

The parameter is called 'tls-creds', 'credid' is just the
variable name in the code.

Signed-off-by: Wolfgang Bumiller <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 46188349ad7e23abef0e453d2b0406985f6552a1
      
https://github.com/qemu/qemu/commit/46188349ad7e23abef0e453d2b0406985f6552a1
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M include/ui/gtk.h
    M ui/gtk.c
    M ui/spice-core.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160118-1' into 
staging

ui: misc small gtk/spice/vnc patches.

# gpg: Signature made Mon 18 Jan 2016 15:52:13 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-ui-20160118-1:
  vnc: fix tls-creds error message
  Fix corner-case when using VNC+SASL+SPICE
  vnc: clear vs->tlscreds after unparenting it
  gtk: implement set_echo

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4aaddc2976bf...46188349ad7e