From patchwork Wed Sep 21 15:51:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonit Halperin X-Patchwork-Id: 115821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 53086B6F90 for ; Thu, 22 Sep 2011 02:51:19 +1000 (EST) Received: from localhost ([::1]:34968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6P5X-0000sj-EX for incoming@patchwork.ozlabs.org; Wed, 21 Sep 2011 11:51:55 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6P5L-0000fE-B3 for qemu-devel@nongnu.org; Wed, 21 Sep 2011 11:51:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6P5H-0000Aw-3F for qemu-devel@nongnu.org; Wed, 21 Sep 2011 11:51:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6P5G-0000Al-Kb for qemu-devel@nongnu.org; Wed, 21 Sep 2011 11:51:38 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8LFpbgY032752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Sep 2011 11:51:37 -0400 Received: from dhcp-0-9.tlv.redhat.com (dhcp-3-166.tlv.redhat.com [10.35.3.166]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8LFpKuE029127; Wed, 21 Sep 2011 11:51:35 -0400 From: Yonit Halperin To: spice-devel@freedesktop.org Date: Wed, 21 Sep 2011 18:51:17 +0300 Message-Id: <1316620283-8330-8-git-send-email-yhalperi@redhat.com> In-Reply-To: <1316620283-8330-1-git-send-email-yhalperi@redhat.com> References: <1316620283-8330-1-git-send-email-yhalperi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: Yonit Halperin , alevy@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com Subject: [Qemu-devel] [PATCH spice-server 07/13] server: move SPICE_MSG_MAIN_INIT sending code to a separate routine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Yonit Halperin --- server/reds.c | 56 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/server/reds.c b/server/reds.c index e088b08..bea0eb0 100644 --- a/server/reds.c +++ b/server/reds.c @@ -2078,6 +2078,35 @@ static int test_capability(uint32_t *caps, uint32_t num_caps, uint32_t cap) return (caps[index] & (1 << (cap % 32))) != 0; } +static void reds_main_channel_init(int do_net_test) +{ + RedsOutItem *item; + SpiceMsgMainInit init; + + item = new_out_item(SPICE_MSG_MAIN_INIT); + init.session_id = reds->link_id; + init.display_channels_hint = red_dispatcher_count(); + init.current_mouse_mode = reds->mouse_mode; + init.supported_mouse_modes = SPICE_MOUSE_MODE_SERVER; + if (reds->is_client_mouse_allowed) { + init.supported_mouse_modes |= SPICE_MOUSE_MODE_CLIENT; + } + init.agent_connected = !!vdagent; + init.agent_tokens = REDS_AGENT_WINDOW_SIZE; + reds->agent_state.num_client_tokens = REDS_AGENT_WINDOW_SIZE; + init.multi_media_time = reds_get_mm_time() - MM_TIME_DELTA; + init.ram_hint = red_dispatcher_qxl_ram_size(); + + spice_marshall_msg_main_init(item->m, &init); + + reds_push_pipe_item(item); + if (do_net_test) { + reds_start_net_test(); + } + /* Now that we have a client, forward any pending agent data */ + while (read_from_vdi_port()); +} + static void reds_handle_main_link(RedLinkInfo *link) { SpiceLinkMess *link_mess = link->link_mess; @@ -2144,29 +2173,10 @@ static void reds_handle_main_link(RedLinkInfo *link) reds_main_event, NULL); if (!reds->mig_target) { - RedsOutItem *item; - SpiceMsgMainInit init; - - item = new_out_item(SPICE_MSG_MAIN_INIT); - init.session_id = connection_id; - init.display_channels_hint = red_dispatcher_count(); - init.current_mouse_mode = reds->mouse_mode; - init.supported_mouse_modes = SPICE_MOUSE_MODE_SERVER; - if (reds->is_client_mouse_allowed) { - init.supported_mouse_modes |= SPICE_MOUSE_MODE_CLIENT; - } - init.agent_connected = !!vdagent; - init.agent_tokens = REDS_AGENT_WINDOW_SIZE; - reds->agent_state.num_client_tokens = REDS_AGENT_WINDOW_SIZE; - init.multi_media_time = reds_get_mm_time() - MM_TIME_DELTA; - init.ram_hint = red_dispatcher_qxl_ram_size(); - - spice_marshall_msg_main_init(item->m, &init); - - reds_push_pipe_item(item); - reds_start_net_test(); - /* Now that we have a client, forward any pending agent data */ - while (read_from_vdi_port()); + reds_main_channel_init(TRUE); + } + else { + ASSERT(reds->client_semi_mig_cap); } }