Attachment 585311 Details for Bug 821795 – backported fix from yonit

[patch] backported fix from yonit

0001-Fix-channel-caps-not-being-reset-correctly-and-causi.patch (text/plain), 4.96 KB, created by Marc-Andre Lureau on 2012-05-17 21:01:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2012-05-17 21:01:06 UTC

Size: 4.96 KB

patch

obsolete

>From 97898c6b38f061d9500700acd5d8512d31e5066c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
>Date: Thu, 17 May 2012 22:59:54 +0200
>Subject: [PATCH] Fix channel caps not being reset correctly, and causing migration to fail
> Resolves: rhbz#821795
>
>---
> 0028-Reset-correctly-channel-capabilities.patch |   70 +++++++++++++++++++++++
> spice-gtk.spec                                  |    8 ++-
> 2 files changed, 77 insertions(+), 1 deletions(-)
> create mode 100644 0028-Reset-correctly-channel-capabilities.patch
>
>diff --git a/0028-Reset-correctly-channel-capabilities.patch b/0028-Reset-correctly-channel-capabilities.patch
>new file mode 100644
>index 0000000..cb9b915
>--- /dev/null
>+++ b/0028-Reset-correctly-channel-capabilities.patch
>@@ -0,0 +1,70 @@
>+From 6b3e325abdd3f99b4b8553b6982006ae44ea33dc Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
>+Date: Thu, 17 May 2012 22:50:55 +0200
>+Subject: [PATCH] Reset correctly channel capabilities
>+
>+---
>+ gtk/channel-display.c  |    2 ++
>+ gtk/channel-main.c     |    3 +++
>+ gtk/channel-playback.c |    3 +++
>+ gtk/channel-record.c   |    3 +++
>+ 4 files changed, 11 insertions(+), 0 deletions(-)
>+
>+diff --git a/gtk/channel-display.c b/gtk/channel-display.c
>+index 6fcfd7a..e0963c2 100644
>+--- a/gtk/channel-display.c
>++++ b/gtk/channel-display.c
>+@@ -191,6 +191,8 @@ static void spice_display_channel_reset(SpiceChannel *channel, gboolean migratin
>+     clear_surfaces(channel, TRUE);
>+ 
>+     SPICE_CHANNEL_CLASS(spice_display_channel_parent_class)->channel_reset(channel, migrating);
>++
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_DISPLAY_CAP_SIZED_STREAM);
>+ }
>+ 
>+ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
>+diff --git a/gtk/channel-main.c b/gtk/channel-main.c
>+index 15ce929..48bbc85 100644
>+--- a/gtk/channel-main.c
>++++ b/gtk/channel-main.c
>+@@ -294,6 +294,9 @@ static void spice_main_channel_reset(SpiceChannel *channel, gboolean migrating)
>+     c->agent_msg_queue = g_queue_new();
>+ 
>+     SPICE_CHANNEL_CLASS(spice_main_channel_parent_class)->channel_reset(channel, migrating);
>++
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE);
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_MAIN_CAP_NAME_AND_UUID);
>+ }
>+ 
>+ static void spice_main_channel_class_init(SpiceMainChannelClass *klass)
>+diff --git a/gtk/channel-playback.c b/gtk/channel-playback.c
>+index 32f8b1a..85156ea 100644
>+--- a/gtk/channel-playback.c
>++++ b/gtk/channel-playback.c
>+@@ -170,6 +170,9 @@ static void spice_playback_channel_reset(SpiceChannel *channel, gboolean migrati
>+     }
>+ 
>+     SPICE_CHANNEL_CLASS(spice_playback_channel_parent_class)->channel_reset(channel, migrating);
>++
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_PLAYBACK_CAP_CELT_0_5_1);
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_PLAYBACK_CAP_VOLUME);
>+ }
>+ 
>+ static void spice_playback_channel_class_init(SpicePlaybackChannelClass *klass)
>+diff --git a/gtk/channel-record.c b/gtk/channel-record.c
>+index c5aded9..9ce0244 100644
>+--- a/gtk/channel-record.c
>++++ b/gtk/channel-record.c
>+@@ -181,6 +181,9 @@ static void channel_reset(SpiceChannel *channel, gboolean migrating)
>+     }
>+ 
>+     SPICE_CHANNEL_CLASS(spice_record_channel_parent_class)->channel_reset(channel, migrating);
>++
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_RECORD_CAP_CELT_0_5_1);
>++    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_RECORD_CAP_VOLUME);
>+ }
>+ 
>+ static void spice_record_channel_class_init(SpiceRecordChannelClass *klass)
>+-- 
>+1.7.1
>+
>diff --git a/spice-gtk.spec b/spice-gtk.spec
>index 47f557f..989dac1 100644
>--- a/spice-gtk.spec
>+++ b/spice-gtk.spec
>@@ -8,7 +8,7 @@
> 
> Name:           spice-gtk
> Version:        0.11
>-Release:        9%{?dist}
>+Release:        10%{?dist}
> Summary:        A GTK+ widget for SPICE clients
> 
> Group:          System Environment/Libraries
>@@ -44,6 +44,7 @@ Patch24:        0024-gtk-scroll-event-are-not-received-with-recent-gtk.patch
> Patch25:        0025-Set-new-cert-subject-when-switching-host.patch
> Patch26:        0026-Clear-cache-and-glz-dictionnary-on-switch-host.patch
> Patch27:        0027-video-streaming-add-support-for-frames-of-different-sizes.patch
>+Patch28:        0028-Reset-correctly-channel-capabilities.patch
> 
> BuildRequires: intltool
> BuildRequires: gtk2-devel >= 2.14
>@@ -160,6 +161,7 @@ pushd spice-gtk-%{version}
> %patch25 -p1
> %patch26 -p1
> %patch27 -p1
>+%patch28 -p1
> 
> find . -name '*.stamp' | xargs touch
> 
>@@ -230,6 +232,10 @@ cd ..
> %{_bindir}/spicy-stats
> 
> %changelog
>+* Thu May 17 2012 Marc-AndrÃ© Lureau <marcandre.lureau@redhat.com> - 0.11-10
>+- Fix channel caps not being reset correctly, and causing migration to fail
>+  Resolves: rhbz#821795
>+
> * Sun May 6 2012 Yonit Halperin     <yhalperi@redhat.com> - 0.11-9
> - Introduce sized video frames, for fixing glitches in youtube movies.
>   Resolves: rhbz#815426
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 821795: 584674 | 585311