[Spice-commits] 11 commits - AUTHORS configure.ac maint.mk NEWS server/char_device.c server/char_device.h server/Makefile.am server/red_parse_qxl.c server/reds.c server/red_worker.c server/spice_timer_queue.c server/tests spice-common
Uri Lublin
uril at kemper.freedesktop.org
Wed Jul 17 09:21:17 PDT 2013
AUTHORS | 6 ++++++
NEWS | 13 +++++++++++++
configure.ac | 4 ++--
maint.mk | 2 ++
server/Makefile.am | 2 +-
server/char_device.c | 6 +++---
server/char_device.h | 2 +-
server/red_parse_qxl.c | 13 ++++---------
server/red_worker.c | 6 +++---
server/reds.c | 2 +-
server/spice_timer_queue.c | 1 +
server/tests/.gitignore | 2 +-
server/tests/test_display_base.c | 3 ++-
server/tests/test_vdagent.c | 2 +-
spice-common | 2 +-
15 files changed, 42 insertions(+), 24 deletions(-)
New commits:
commit b270fb010a3ddb432dfe6b15e4bdffa6ac086cd0
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 10 00:57:08 2013 +0300
Release 0.12.4
diff --git a/NEWS b/NEWS
index acfffb8..1afe711 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Major changes in 0.12.4:
+========================
+* log actual address spice-server binds to
+* main_channel: fix double release of migration target data (rhbz#859027)
+* red_channel: replace an assert upon threads mismatch with a warning (rhbz#823472)
+* support for filtering out agent file-xfer msgs (rhbz#961848)
+** new library export spice_server_set_agent_file_xfer
+* mjpeg encoder statistics (mjpeg_encoder_get_stats)
+* improve stream stats readability and ease of parsing
+* fix for stuck display_channel over WAN (jpeg_enabled=true) (rhbz#977998)
+* Use RING_FOREACH_SAFE and other SAFE macros (rhbz#887775)
+* Some server/tests fixes.
+
Major changes in 0.12.3:
========================
* monitor client bandwidth and latency.
diff --git a/configure.ac b/configure.ac
index 78896cb..edda8e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,9 @@ AC_PREREQ([2.57])
# 4. Follow the libtool manual for the so version:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-m4_define([SPICE_CURRENT], [8])
+m4_define([SPICE_CURRENT], [9])
m4_define([SPICE_REVISION], [0])
-m4_define([SPICE_AGE], [7])
+m4_define([SPICE_AGE], [8])
# Note on the library name on linux (SONAME) produced by libtool (for reference, gleaned
# from looking at libtool 2.4.2)
commit 51d50dca002b424641b97a630a49f6105efdb0f1
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 10 01:20:29 2013 +0300
Update spice-common submodule (get spice-protocol 0.12.6)
diff --git a/spice-common b/spice-common
index 30e8478..fe93908 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 30e84783cad7a5d4cd345367a267cafbfd0571af
+Subproject commit fe93908238196bd632287fc9875e6f2e11105d04
commit 118671c9a7e3f94a337b4e56bb13ba6143d317be
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 17 01:49:15 2013 +0300
syntax-check: trailing whitespaces -- ignore binary files
diff --git a/maint.mk b/maint.mk
index 405c6d0..fa2fe74 100644
--- a/maint.mk
+++ b/maint.mk
@@ -696,6 +696,8 @@ sc_require_test_exit_idiom:
exit 1; } || :; \
fi
+exclude_file_name_regexp--sc_trailing_blank = \.ico$$|\.bmp$$|\.odt$$
+
sc_trailing_blank:
@prohibit='[ ]$$' \
halt='found trailing blank(s)' \
commit d6092f11b69e84e5d088b9feabb972fad705b4f4
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 10 00:21:40 2013 +0300
syntax-check: remove trailing whitespaces
Only whitespace changes in this commit.
diff --git a/server/char_device.c b/server/char_device.c
index 792ab9c..660a788 100644
--- a/server/char_device.c
+++ b/server/char_device.c
@@ -554,7 +554,7 @@ SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get(SpiceCharDeviceSt
RedClient *client,
int size)
{
- return __spice_char_device_write_buffer_get(dev, client, size,
+ return __spice_char_device_write_buffer_get(dev, client, size,
client ? WRITE_BUFFER_ORIGIN_CLIENT : WRITE_BUFFER_ORIGIN_SERVER,
0);
}
@@ -562,7 +562,7 @@ SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get(SpiceCharDeviceSt
SpiceCharDeviceWriteBuffer *spice_char_device_write_buffer_get_server_no_token(
SpiceCharDeviceState *dev, int size)
{
- return __spice_char_device_write_buffer_get(dev, NULL, size,
+ return __spice_char_device_write_buffer_get(dev, NULL, size,
WRITE_BUFFER_ORIGIN_SERVER_NO_TOKEN, 0);
}
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 7d4d4a1..6c0b065 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -663,14 +663,13 @@ static bool get_transform(RedMemSlotInfo *slots,
int group_id,
QXLPHYSICAL qxl_transform,
SpiceTransform *dst_transform)
-
{
const uint32_t *t = NULL;
int error;
if (qxl_transform == 0)
return FALSE;
-
+
t = (uint32_t *)get_virt(slots, qxl_transform, sizeof(*dst_transform), group_id, &error);
if (!t || error)
@@ -688,7 +687,7 @@ static void red_get_composite_ptr(RedMemSlotInfo *slots, int group_id,
red->src_bitmap = red_get_image(slots, group_id, qxl->src, flags, FALSE);
if (get_transform(slots, group_id, qxl->src_transform, &red->src_transform))
red->flags |= SPICE_COMPOSITE_HAS_SRC_TRANSFORM;
-
+
if (qxl->mask) {
red->mask_bitmap = red_get_image(slots, group_id, qxl->mask, flags, FALSE);
red->flags |= SPICE_COMPOSITE_HAS_MASK;
diff --git a/server/red_worker.c b/server/red_worker.c
index 597008e..73fe866 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -11033,7 +11033,7 @@ static void red_wait_all_sent(RedChannel *channel)
end_time = red_now() + DETACH_TIMEOUT;
red_channel_push(channel);
- while (((max_pipe_size = red_channel_max_pipe_size(channel)) ||
+ while (((max_pipe_size = red_channel_max_pipe_size(channel)) ||
(blocked = red_channel_any_blocked(channel))) &&
red_now() < end_time) {
spice_debug("pipe-size %u blocked %d", max_pipe_size, blocked);
@@ -11047,7 +11047,7 @@ static void red_wait_all_sent(RedChannel *channel)
spice_printerr("timeout: pending out messages exist (pipe-size %u, blocked %d)",
max_pipe_size, blocked);
red_channel_apply_clients(channel, rcc_shutdown_if_pending_send);
- } else {
+ } else {
spice_assert(red_channel_no_item_being_sent(channel));
}
}
@@ -11534,7 +11534,7 @@ void handle_dev_stop(void *opaque, void *payload)
red_display_clear_glz_drawables(worker->display_channel);
flush_all_surfaces(worker);
/* todo: when the waiting is expected to take long (slow connection and
- * overloaded pipe), don't wait, and in case of migration,
+ * overloaded pipe), don't wait, and in case of migration,
* purge the pipe, send destroy_all_surfaces
* to the client (there is no such message right now), and start
* from scratch on the destination side */
commit d45f3bdc6b4624afca1e2d5ecf7badbfb147363c
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 10 00:19:05 2013 +0300
syntax-check: make sure config.h is the first included .h file
diff --git a/server/char_device.c b/server/char_device.c
index 721bd8d..792ab9c 100644
--- a/server/char_device.c
+++ b/server/char_device.c
@@ -20,6 +20,7 @@
*/
+#include <config.h>
#include "char_device.h"
#include "red_channel.h"
#include "reds.h"
diff --git a/server/spice_timer_queue.c b/server/spice_timer_queue.c
index 690ab83..833ab1d 100644
--- a/server/spice_timer_queue.c
+++ b/server/spice_timer_queue.c
@@ -15,6 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <pthread.h>
#include "red_common.h"
#include "spice_timer_queue.h"
diff --git a/server/tests/test_vdagent.c b/server/tests/test_vdagent.c
index bb267dd..af33145 100644
--- a/server/tests/test_vdagent.c
+++ b/server/tests/test_vdagent.c
@@ -2,8 +2,8 @@
* Test vdagent guest to server messages
*/
-#include <string.h>
#include <config.h>
+#include <string.h>
#include <stdlib.h>
#include <stdio.h>
commit 8b4dde347b2ca27da6f38d2de6f3521eae050510
Author: Uri Lublin <uril at redhat.com>
Date: Wed Jul 10 00:10:07 2013 +0300
syntax-check: use test A && test B instead of test A -a B
diff --git a/server/Makefile.am b/server/Makefile.am
index 7a52b17..d351dae 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -135,4 +135,4 @@ EXTRA_DIST = \
BUILT_SOURCES = $(spice_built_sources)
dist-hook:
- if [ -e ./tests/test_spice_version.sh -a ! ./tests/test_spice_version.sh ] ; then exit 1; fi
+ if test ./tests/test_spice_version.sh && ! test ./tests/test_spice_version.sh; then exit 1; fi
commit bc77805b5fa6f874d5b441a33b5e66a4ec9350e3
Author: Uri Lublin <uril at redhat.com>
Date: Tue Jul 9 23:38:40 2013 +0300
syntax-check: fix no-newline or empty line at EOF
diff --git a/server/char_device.c b/server/char_device.c
index f500f04..721bd8d 100644
--- a/server/char_device.c
+++ b/server/char_device.c
@@ -977,4 +977,3 @@ int spice_char_device_state_restore(SpiceCharDeviceState *dev,
spice_char_device_read_from_device(dev);
return TRUE;
}
-
diff --git a/server/tests/.gitignore b/server/tests/.gitignore
index 74687d1..b163cda 100644
--- a/server/tests/.gitignore
+++ b/server/tests/.gitignore
@@ -4,4 +4,4 @@ test_empty_success
test_just_sockets_no_ssl
test_fail_on_null_core_interface
test_playback
-test_display_resolution_changes
\ No newline at end of file
+test_display_resolution_changes
commit cfe81e1a98552eec9aa90ceff735d3a8303ec8e2
Author: Uri Lublin <uril at redhat.com>
Date: Tue Jul 9 23:35:49 2013 +0300
syntax-check: s/the the/the/ in a comment
diff --git a/server/char_device.h b/server/char_device.h
index 99bdb2e..c17a40d 100644
--- a/server/char_device.h
+++ b/server/char_device.h
@@ -138,7 +138,7 @@ int spice_char_device_state_restore(SpiceCharDeviceState *dev,
* Instead, it would have been more appropriate to reset them upon AGEN_CONNECT.
* The client tokens are tracked as part of the SpiceCharDeviceClientState. Thus,
* in order to be backwartd compatible with the client, we need to track the tokens
- * event when the agent is detached. We don't destroy the the char_device state, and
+ * event when the agent is detached. We don't destroy the char_device state, and
* instead we just reset it.
* In addition, there is a misshandling of AGENT_TOKENS message in spice-gtk: it
* overrides the amount of tokens, instead of adding the given amount.
diff --git a/server/reds.c b/server/reds.c
index b3dfb25..30d0652 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -502,7 +502,7 @@ static void reds_reset_vdp(void)
* Instead, it would have been more appropriate to reset them upon AGEN_CONNECT.
* The client tokens are tracked as part of the SpiceCharDeviceClientState. Thus,
* in order to be backward compatible with the client, we need to track the tokens
- * even if the agent is detached. We don't destroy the the char_device state, and
+ * even if the agent is detached. We don't destroy the char_device state, and
* instead we just reset it.
* In addition, there used to be a misshandling of AGENT_TOKENS message in spice-gtk: it
* overrides the amount of tokens, instead of adding the given amount.
commit c0c78346ff0009ff2e82439b04b791ea7a5a5ad6
Author: Uri Lublin <uril at redhat.com>
Date: Tue Jul 9 23:32:34 2013 +0300
syntax-check: update AUTHORS
diff --git a/AUTHORS b/AUTHORS
index 230387e..a516469 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,22 +18,28 @@ Previous Spice maintainers were
Patches also contributed by
Alexander Larsson <alexl at redhat.com>
+ Andrew Eikum <aeikum at codeweavers.com>
Aric Stewart <aric at codeweavers.com>
Arnon Gilboa <agilboa at redhat.com>
Daniel P. Berrange <berrange at redhat.com>
Dan Kenigsberg <danken at redhat.com>
Dan McGee <dpmcgee at gmail.com>
+ David Gibson <david at gibson.dropbear.id.au>
Erlon Cruz <erlon.cruz at br.flextronics.com>
Fabiano Fidêncio <fabiano at fidencio.org>
+ Jeremy White <jwhite at codeweavers.com>
Gal Hammer <ghammer at redhat.com>
Hans de Goede <hdegoede at redhat.com>
Jürg Billeter <j at bitron.ch>
Liang Guo <bluestonechina at gmail.com>
Michael Tokarev <mjt at tls.msk.ru>
Nahum Shalman <nshalman at elys.com>
+ Nikolay Orlyuk <virkony at gmail.com>
+ Peter Robinson <pbrobinson at gmail.com>
Søren Sandmann Pedersen <ssp at redhat.com>
Thomas Tyminski <thomast at cs.tu-berlin.de>
Tiziano Mueller <dev-zero at gentoo.org>
+ Yann E. MORIN <yann.morin.1998 at free.fr>
Zeeshan Ali (Khattak) <zeeshanak at gnome.org>
....send patches to get your name here...
commit 413883ecf8f2e9e51ca2347ba471c72df351433b
Author: Uri Lublin <uril at redhat.com>
Date: Tue Jul 9 23:24:31 2013 +0300
syntax-check: fix cast_of_argument_to_free
In this case, make syntax-check is wrong, and we actually do
need the cast.
A cast is needed when types are uint64_t <--> pointer
Using a local "ptr" variable makes both gcc and syntax-check happy.
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c
index d8ff8d1..20c0e47 100644
--- a/server/tests/test_display_base.c
+++ b/server/tests/test_display_base.c
@@ -42,7 +42,8 @@ static void test_spice_destroy_update(SimpleSpiceUpdate *update)
return;
}
if (update->drawable.clip.type != SPICE_CLIP_TYPE_NONE) {
- free((uint8_t*)update->drawable.clip.data);
+ uint8_t *ptr = (uint8_t*)update->drawable.clip.data;
+ free(ptr);
}
free(update->bitmap);
free(update);
commit a89b1b5543e65f483764556eab17d70f20f72a84
Author: Uri Lublin <uril at redhat.com>
Date: Tue Jul 9 23:21:07 2013 +0300
syntax-check: fix avoid_if_before_free
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 65781e7..7d4d4a1 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -490,12 +490,8 @@ static SpiceImage *red_get_image(RedMemSlotInfo *slots, int group_id,
}
return red;
error:
- if (red) {
- free(red);
- }
- if (rp) {
- free(rp);
- }
+ free(red);
+ free(rp);
return NULL;
}
More information about the Spice-commits
mailing list