diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-16 18:28:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-16 18:28:31 +0100 |
| commit | 5f3fb5a2e259322d50d289f180ac7e452ad1b6f8 (patch) | |
| tree | 7df8395a5ab1a4ac16cf92f5555fc7dd1c77cec9 /ui | |
| parent | cc35a44cf7b522b1fd0b786562b7de4b881c41b0 (diff) | |
| parent | 07d49a53b6394941ed833486a3acb5c480d87db2 (diff) | |
| download | qemu-5f3fb5a2e259322d50d289f180ac7e452ad1b6f8.tar.gz | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140916-2' into staging
spice: call qemu_spice_set_passwd() during init
# gpg: Signature made Tue 16 Sep 2014 07:11:22 BST using RSA key ID D3E87138
# 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>"
* remotes/spice/tags/pull-spice-20140916-2:
spice: call qemu_spice_set_passwd() during init
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/spice-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 17a2ed3782..6467fa4776 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -733,7 +733,7 @@ void qemu_spice_init(void) tls_ciphers); } if (password) { - spice_server_set_ticket(spice_server, password, 0, 0, 0); + qemu_spice_set_passwd(password, false, false); } if (qemu_opt_get_bool(opts, "sasl", 0)) { if (spice_server_set_sasl_appname(spice_server, "qemu") == -1 || |