From patchwork Tue Oct 27 06:10:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 536627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AD83214136A for ; Wed, 28 Oct 2015 00:32:46 +1100 (AEDT) Received: from localhost ([::1]:59662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr4Mm-0004nd-Aw for incoming@patchwork.ozlabs.org; Tue, 27 Oct 2015 09:32:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqy89-0005pu-Qe for qemu-devel@nongnu.org; Tue, 27 Oct 2015 02:53:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqy83-0001wL-Mh for qemu-devel@nongnu.org; Tue, 27 Oct 2015 02:53:13 -0400 Received: from mr213139.mail.yeah.net ([223.252.213.139]:42911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqy83-0001uy-6X for qemu-devel@nongnu.org; Tue, 27 Oct 2015 02:53:07 -0400 Received: from localhost.localdomain (unknown [103.10.86.234]) by mr213139.mail.yeah.net (HMail) with ESMTPSA id B0A1C1C1BFE; Tue, 27 Oct 2015 14:13:21 +0800 (CST) From: Yang Hongyang To: qemu-devel@nongnu.org Date: Tue, 27 Oct 2015 14:10:52 +0800 Message-Id: <1445926252-14830-1-git-send-email-hongyang.yang@easystack.cn> X-Mailer: git-send-email 2.5.0 X-HM-Spam-Status: e1koWUFPN1dZCBgUCR5ZQUxVTk5LS0tLSkJLTEhPQ01IV1kJDhceCFlBWS grPSQ1NDU#JDI1JDM#Oj8#KUFLVUtANiMkIj4oJDI1JDM#Oj8#KUFLVUtAKy8pJDU0JDI1JDM#Oj 8#KUFJVUtAKT48MjQ1JC41MDU0LDVBSVVLQD8iNTo2MjgkMiskNTQkMjUkMz46Pz4pQUtVS0A2Lj cvMiQpOCsvJD8yPT0#KT41LyQyNSQzPjo*PilBSVVLQDIrJE4kNjI1Li8#JDg1LyRLJEpLQUtVS0 AyKyRKJDM0LikkODUvJEskSktLQUtVS0AyKyQvND86IiQ4NS8kSyRKS0tBS1VLQDIrJEokNjI1Li 8#JDg1LyRLJEpLQUtVS0AyKyRISyQ2MjUuLz4kODUvJEskTktBS1VLQCguOTE#OC8kTiQ2MjUuLz 4kODUvJEskSktBS1VLQCguOTE#OC8kLzQ*OiIkODUvJEskSktLQUtVS0AoLjkxPjgvJEokMzQuKS Q4NS8kSyRKS0tBS1VLQCguOSQ#QUpVTk5ZBg++ X-HM-Sender-Digest: e1kSHx4VD1lBWUc6OCI6Cgw4OjozPy8TNC0OIk0cHBUKCjhVSlVKT09O QklNT0tKQkNKVTMWGhIXVRMUFRwCGhUcVQIaFRw7HhoIAggPGhgQVRgVRVlXWQweGVlBHRoXCB5X WQgBWUFKQktON1dZEgtZQVlKS0hVSktVQ01VSUhPWQY+ X-HM-Tid: 0a50a7edf76c7d8bb0a1c1c1bfe X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 223.252.213.139 X-Mailman-Approved-At: Tue, 27 Oct 2015 09:31:34 -0400 Cc: Gerd Hoffmann , Yang Hongyang Subject: [Qemu-devel] [PATCH] vnc: fix bug: vnc server can't start when 'to' is specified 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 commit e0d03b8ceb52 converted VNC startup to use SocketAddress, the interface socket_listen don't have a port_offset param, so we need to add the port offset (5900) to both 'port' and 'to' opts. currently only 'port' is added by offset. This patch add the port offset to 'to' opts. Signed-off-by: Yang Hongyang Cc: Daniel P. Berrange Cc: Eric Blake Cc: Gerd Hoffmann --- ui/vnc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index faff054..db24545 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3545,7 +3545,7 @@ void vnc_display_open(const char *id, Error **errp) if (to) { saddr->inet->has_to = true; - saddr->inet->to = to; + saddr->inet->to = to + 5900; } saddr->inet->ipv4 = saddr->inet->has_ipv4 = has_ipv4; saddr->inet->ipv6 = saddr->inet->has_ipv6 = has_ipv6;