From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1IQX-0001hx-0S for qemu-devel@nongnu.org; Thu, 09 Jan 2014 11:25:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1IQR-0002XC-De for qemu-devel@nongnu.org; Thu, 09 Jan 2014 11:25:48 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:53000 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1IQR-0002Wr-00 for qemu-devel@nongnu.org; Thu, 09 Jan 2014 11:25:43 -0500 Message-ID: <52CECD82.4030809@kamp.de> Date: Thu, 09 Jan 2014 17:25:38 +0100 From: Peter Lieven MIME-Version: 1.0 References: <1389172118-25402-1-git-send-email-pl@kamp.de> <1389172118-25402-7-git-send-email-pl@kamp.de> <52CE5DF0.2040806@linux.vnet.ibm.com> In-Reply-To: <52CE5DF0.2040806@linux.vnet.ibm.com> Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCHv4 6/6] ui/vnc: disable adaptive update calculations if not needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wenchao Xia , qemu-devel@nongnu.org Cc: sw@weilnetz.de, aliguori@amazon.com Am 09.01.2014 09:29, schrieb Wenchao Xia: > ÓÚ 2014/1/8 17:08, Peter Lieven дµÀ: >> Signed-off-by: Peter Lieven >> --- >> ui/vnc.c | 9 +++++++++ >> 1 file changed, 9 insertions(+) >> >> diff --git a/ui/vnc.c b/ui/vnc.c >> index da552fe..a742d32 100644 >> --- a/ui/vnc.c >> +++ b/ui/vnc.c >> @@ -3170,7 +3170,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) >> acl = 1; >> #endif >> } else if (strncmp(options, "lossy", 5) == 0) { >> +#ifdef CONFIG_VNC_JPEG >> vs->lossy = true; >> +#endif >> } else if (strncmp(options, "non-adaptive", 12) == 0) { >> vs->non_adaptive = true; >> } else if (strncmp(options, "share=", 6) == 0) { >> @@ -3187,6 +3189,13 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) >> } >> } >> >> + /* adaptive updates are only used with tight encoding and >> + * if lossy updates are enabled so we can disable all the >> + * calculations otherwise */ >> + if (!vs->lossy) { >> + vs->non_adaptive = true; >> + } >> + > The code seems: if vs->loosy == false, then vs->non_adaptive = true, > translate as: if loosy update is not used, then don't do adaptive > update., which doesn't conform with the comments. I am not sure if this > is on expectation. It don't see the logic break. The option means non_adaptive, not adaptive. I write "adaptive updates are only used ... with lossy updates...". Which is the same as "without lossy updates we don't need adaptive updates". Peter > > >> #ifdef CONFIG_VNC_TLS >> if (acl && x509 && vs->tls.x509verify) { >> if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { >>