From: Alon Levy <[email protected]>
Signed-off-by: Alon Levy <[email protected]>
Signed-off-by: Frediano Ziglio <[email protected]>
---
server/red-worker.c | 7 +++----
server/reds.c | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/red-worker.c b/server/red-worker.c
index 1b2bb77..baa8458 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -177,7 +177,7 @@ static int red_process_cursor(RedWorker *worker, uint32_t
max_pipe_size, int *ri
*ring_is_empty = FALSE;
while (!cursor_is_connected(worker) ||
- red_channel_min_pipe_size(RED_CHANNEL(worker->cursor_channel)) <=
max_pipe_size) {
+ red_channel_max_pipe_size(RED_CHANNEL(worker->cursor_channel)) <=
max_pipe_size) {
if (!worker->qxl->st->qif->get_cursor_command(worker->qxl, &ext_cmd)) {
*ring_is_empty = TRUE;
if (worker->cursor_poll_tries < CMD_RING_POLL_RETRIES) {
@@ -238,8 +238,7 @@ static int red_process_display(RedWorker *worker, uint32_t
max_pipe_size, int *r
worker->process_display_generation++;
*ring_is_empty = FALSE;
while (!display_is_connected(worker) ||
- // TODO: change to average pipe size?
- red_channel_min_pipe_size(RED_CHANNEL(worker->display_channel)) <=
max_pipe_size) {
+ red_channel_max_pipe_size(RED_CHANNEL(worker->display_channel)) <=
max_pipe_size) {
if (!worker->qxl->st->qif->get_command(worker->qxl, &ext_cmd)) {
*ring_is_empty = TRUE;;
if (worker->display_poll_tries < CMD_RING_POLL_RETRIES) {
@@ -447,7 +446,7 @@ static void flush_cursor_commands(RedWorker *worker)
for (;;) {
red_channel_push(RED_CHANNEL(worker->cursor_channel));
if (!cursor_is_connected(worker)
- || red_channel_min_pipe_size(cursor_red_channel) <=
MAX_PIPE_SIZE) {
+ || red_channel_max_pipe_size(cursor_red_channel) <=
MAX_PIPE_SIZE) {
break;
}
RedChannel *channel = (RedChannel *)worker->cursor_channel;
diff --git a/server/reds.c b/server/reds.c
index f3d1b24..d890616 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3347,7 +3347,7 @@ static int do_spice_init(SpiceCoreInterface
*core_interface)
reds->allow_multiple_clients = getenv(SPICE_DEBUG_ALLOW_MC_ENV) != NULL;
if (reds->allow_multiple_clients) {
- spice_warning("spice: allowing multiple client connections (crashy)");
+ spice_warning("spice: allowing multiple client connections");
}
atexit(reds_exit);
return 0;
--
2.4.3
_______________________________________________
Spice-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/spice-devel
