|
 |
d25db3 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
d25db3 |
From: Victor Toso <me@victortoso.com>
|
|
|
d25db3 |
Date: Mon, 11 Jun 2018 12:14:30 +0200
|
|
|
d25db3 |
Subject: [PATCH] Revert "channel-usbredir: Fix crash on channel-up"
|
|
|
d25db3 |
|
|
|
d25db3 |
This reverts commit 291f3e4419e6fb4077ae43a5e09eb1c37b9dd729.
|
|
|
d25db3 |
|
|
|
d25db3 |
Follow up patch should address rhbz#1399838 mentioned in commit above
|
|
|
d25db3 |
in a different way.
|
|
|
d25db3 |
|
|
|
d25db3 |
Major reason to revert is that the SpiceUsbDeviceManager object is
|
|
|
d25db3 |
kept in SpiceSession as an easy way to share it between different
|
|
|
d25db3 |
SpiceUsbredirChannel while SpiceSession itself does not use it. This
|
|
|
d25db3 |
causes problems on migration as we start a new session with a new
|
|
|
d25db3 |
SpiceUsbDeviceManager object while the previous one still exists.
|
|
|
d25db3 |
|
|
|
d25db3 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1558043
|
|
|
d25db3 |
Signed-off-by: Victor Toso <victortoso@redhat.com>
|
|
|
d25db3 |
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
d25db3 |
---
|
|
|
d25db3 |
src/spice-session.c | 7 -------
|
|
|
d25db3 |
1 file changed, 7 deletions(-)
|
|
|
d25db3 |
|
|
|
d25db3 |
diff --git a/src/spice-session.c b/src/spice-session.c
|
|
|
d25db3 |
index a729cc3..094dc41 100644
|
|
|
d25db3 |
--- a/src/spice-session.c
|
|
|
d25db3 |
+++ b/src/spice-session.c
|
|
|
d25db3 |
@@ -281,7 +281,6 @@ static void spice_session_init(SpiceSession *session)
|
|
|
d25db3 |
{
|
|
|
d25db3 |
SpiceSessionPrivate *s;
|
|
|
d25db3 |
gchar *channels;
|
|
|
d25db3 |
- GError *err = NULL;
|
|
|
d25db3 |
|
|
|
d25db3 |
SPICE_DEBUG("New session (compiled from package " PACKAGE_STRING ")");
|
|
|
d25db3 |
s = session->priv = SPICE_SESSION_GET_PRIVATE(session);
|
|
|
d25db3 |
@@ -294,12 +293,6 @@ static void spice_session_init(SpiceSession *session)
|
|
|
d25db3 |
s->images = cache_image_new((GDestroyNotify)pixman_image_unref);
|
|
|
d25db3 |
s->glz_window = glz_decoder_window_new();
|
|
|
d25db3 |
update_proxy(session, NULL);
|
|
|
d25db3 |
-
|
|
|
d25db3 |
- s->usb_manager = spice_usb_device_manager_get(session, &err;;
|
|
|
d25db3 |
- if (err != NULL) {
|
|
|
d25db3 |
- SPICE_DEBUG("Could not initialize SpiceUsbDeviceManager - %s", err->message);
|
|
|
d25db3 |
- g_clear_error(&err;;
|
|
|
d25db3 |
- }
|
|
|
d25db3 |
}
|
|
|
d25db3 |
|
|
|
d25db3 |
static void
|