yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
Blob Blame History Raw
From 3d38cb5a412b18287684cd52579afe8034294d53 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 18 Nov 2014 13:35:20 +0100
Subject: [PATCH 34/41] spice: call qemu_spice_set_passwd() during init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Message-id: <1416317720-17906-2-git-send-email-kraxel@redhat.com>
Patchwork-id: 62433
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] spice: call qemu_spice_set_passwd() during init
Bugzilla: 1138639
RH-Acked-by: Amos Kong <akong@redhat.com>
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Marc-André Lureau <marcandre.lureau@gmail.com>

Don't call SPICE API directly to set password given in command line, but
use the internal API, saving password for later calls.

This solves losing password when changing expiration in qemu monitor.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit 07d49a53b6394941ed833486a3acb5c480d87db2)
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 ui/spice-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 99a76d2..141afd1 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -721,7 +721,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 ||
-- 
1.8.3.1