[Spice-commits] 4 commits - configure.ac server/red_dispatcher.c server/reds.c server/reds.h server/tests

[Marc-André Lureau]

 configure.ac                    |    8 ++++----
 server/red_dispatcher.c         |    4 ++--
 server/reds.c                   |    8 ++------
 server/reds.h                   |    1 -
 server/tests/regression_test.py |    6 +++---
 5 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 5eb9967dbc508d99a4b2bec49a51f3510c91e022
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Nov 18 11:28:27 2013 +0100

    clean-up: remove unused function

diff --git a/server/reds.c b/server/reds.c
index 605b023..6864d36 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2794,11 +2794,6 @@ uint32_t reds_get_mm_time(void)
     return time_space.tv_sec * 1000 + time_space.tv_nsec / 1000 / 1000;
 }
 
-void reds_update_mm_timer(uint32_t mm_time)
-{
-    red_dispatcher_set_mm_time(mm_time);
-}
-
 void reds_enable_mm_timer(void)
 {
     core->timer_start(reds->mm_timer, MM_TIMER_GRANULARITY_MS);
diff --git a/server/reds.h b/server/reds.h
index eabe0af..371ba96 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -56,7 +56,6 @@ void reds_handle_channel_event(int event, SpiceChannelEventInfo *info);
 
 void reds_disable_mm_timer(void);
 void reds_enable_mm_timer(void);
-void reds_update_mm_timer(uint32_t mm_time);
 uint32_t reds_get_mm_time(void);
 void reds_set_client_mouse_allowed(int is_client_mouse_allowed,
                                    int x_res, int y_res);
commit 004744fd2f94bfded9037d459965330629cc8805
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Nov 18 11:28:26 2013 +0100

    build-sys: check for spicy-screenshot

diff --git a/configure.ac b/configure.ac
index 657dc7d..cedeb40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ AS_IF([test x"$enable_client" != "xno"], [enable_client="yes"])
 AM_CONDITIONAL(SUPPORT_CLIENT, test "x$enable_client" = "xyes")
 
 AC_ARG_ENABLE(automated_tests,
-[  --enable-automated-tests     Enable automated tests using snappy (part of spice--gtk)],,
+[  --enable-automated-tests     Enable automated tests using spicy-screenshot (part of spice--gtk)],,
 [enable_automated_tests="no"])
 AS_IF([test x"$enable_automated_tests" != "xno"], [enable_automated_tests="yes"])
 AM_CONDITIONAL(SUPPORT_AUTOMATED_TESTS, test "x$enable_automated_tests" != "xno")
@@ -399,11 +399,11 @@ AC_SUBST([SASL_CFLAGS])
 AC_SUBST([SASL_LIBS])
 
 if test "x$enable_automated_tests" = "xyes"; then
-    AC_MSG_CHECKING([for snappy/spicy-screenshot])
-    snappy --help >/dev/null 2>&1 || spicy-screenshot --help >/dev/null 2>&1
+    AC_MSG_CHECKING([for spicy-screenshot])
+    spicy-screenshot --help >/dev/null 2>&1
     if test $? -ne 0 ; then
         AC_MSG_RESULT([not found])
-        AC_MSG_ERROR([snappy/spicy-screenshot was not found, this module is part of spice-gtk and is required to compile this package])
+        AC_MSG_ERROR([spicy-screenshot was not found, this module is part of spice-gtk and is required to compile this package])
     fi
     AC_MSG_RESULT([found])
 fi
diff --git a/server/tests/regression_test.py b/server/tests/regression_test.py
index e53bf87..5aad1a7 100755
--- a/server/tests/regression_test.py
+++ b/server/tests/regression_test.py
@@ -4,8 +4,8 @@ import Image
 import ImageChops
 
 
-def snappy():
-    cmd = "snappy -h localhost -p 5912 -o output.ppm"
+def spicy_screenshot():
+    cmd = "spicy-screenshot -h localhost -p 5912 -o output.ppm"
     p = Popen(cmd, shell=True)
     p.wait()
 
@@ -15,7 +15,7 @@ def verify():
     return ImageChops.difference(base, output).getbbox()
 
 if __name__ == "__main__":
-    snappy()
+    spicy_screenshot()
     diff = verify()
 
     if diff is None:
commit a434543eb1243db1e52ca6a4e0cdfb425c277e56
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon Nov 18 11:28:25 2013 +0100

    reds: lookup corresponding channel id
    
    In reds_send_link_ack(), lookup the channel with the same id as the link
    message.
    
    The bug was found during code review a while ago.
    
    A reproducer bug was later reported:
    https://bugzilla.redhat.com/show_bug.cgi?id=1058625

diff --git a/server/reds.c b/server/reds.c
index 2c437ac..605b023 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1342,7 +1342,8 @@ static int reds_send_link_ack(RedLinkInfo *link)
 
     ack.error = SPICE_LINK_ERR_OK;
 
-    channel = reds_find_channel(link->link_mess->channel_type, 0);
+    channel = reds_find_channel(link->link_mess->channel_type,
+                                link->link_mess->channel_id);
     if (!channel) {
         spice_assert(link->link_mess->channel_type == SPICE_CHANNEL_MAIN);
         spice_assert(reds->main_channel);
commit 5972452b287a7b1831411595896e69db2ea991ac
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Fri Aug 29 13:14:08 2014 +0200

    dispatcher: lower a monitor-config warning to a debug level
    
    Some QXLInterface implementations might not have or succeed
    with client_monitors_config(). Thus, lower warning to debug
    level.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1119220

diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c
index fd6c2e1..a6ffe7b 100644
--- a/server/red_dispatcher.c
+++ b/server/red_dispatcher.c
@@ -332,8 +332,8 @@ void red_dispatcher_client_monitors_config(VDAgentMonitorsConfig *monitors_confi
         if (!now->qxl->st->qif->client_monitors_config ||
             !now->qxl->st->qif->client_monitors_config(now->qxl,
                                                        monitors_config)) {
-            spice_warning("spice bug: QXLInterface::client_monitors_config"
-                          " failed/missing unexpectedly\n");
+            /* this is a normal condition, some qemu devices might not implement it */
+            spice_debug("QXLInterface::client_monitors_config failed\n");
         }
         now = now->next;
     }