Commit 139f84da authored by Victor Toso's avatar Victor Toso
Browse files

Revert "channel-usbredir: Fix crash on channel-up"

This reverts commit 291f3e44.

Follow up patch should address rhbz#1399838 mentioned in commit above
in a different way.

Major reason to revert is that the SpiceUsbDeviceManager object is
kept in SpiceSession as an easy way to share it between different
SpiceUsbredirChannel while SpiceSession itself does not use it. This
causes problems on migration as we start a new session with a new
SpiceUsbDeviceManager object while the previous one still exists.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1558043

Signed-off-by: Victor Toso's avatarVictor Toso <victortoso@redhat.com>
Acked-by: Christophe Fergeau's avatarChristophe Fergeau <cfergeau@redhat.com>
parent 9978577a
......@@ -276,7 +276,6 @@ static void spice_session_init(SpiceSession *session)
{
SpiceSessionPrivate *s;
gchar *channels;
GError *err = NULL;
SPICE_DEBUG("New session (compiled from package " PACKAGE_STRING ")");
s = session->priv = spice_session_get_instance_private(session);
......@@ -289,12 +288,6 @@ static void spice_session_init(SpiceSession *session)
s->images = cache_image_new((GDestroyNotify)pixman_image_unref);
s->glz_window = glz_decoder_window_new();
update_proxy(session, NULL);
s->usb_manager = spice_usb_device_manager_get(session, &err);
if (err != NULL) {
SPICE_DEBUG("Could not initialize SpiceUsbDeviceManager - %s", err->message);
g_clear_error(&err);
}
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment