From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuH2c-0004yH-Pc for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:41:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuH2Z-0000X3-JJ for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:41:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuH2Z-0000Wq-Dy for qemu-devel@nongnu.org; Thu, 05 Nov 2015 04:41:07 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id F1740A2C02 for ; Thu, 5 Nov 2015 09:41:06 +0000 (UTC) From: Markus Armbruster References: <1446714738-22400-1-git-send-email-kraxel@redhat.com> Date: Thu, 05 Nov 2015 10:41:04 +0100 In-Reply-To: <1446714738-22400-1-git-send-email-kraxel@redhat.com> (Gerd Hoffmann's message of "Thu, 5 Nov 2015 10:12:18 +0100") Message-ID: <87egg4yea7.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] vnc: fix mismerge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Gerd Hoffmann writes: > Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is > specified" was rebased incorrectly, fix it. > > Reported-by: Markus Armbruster > Signed-off-by: Gerd Hoffmann > --- > ui/vnc.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/ui/vnc.c b/ui/vnc.c > index a47f2b3..a4fc024 100644 > --- a/ui/vnc.c > +++ b/ui/vnc.c > @@ -3571,8 +3571,6 @@ void vnc_display_open(const char *id, Error **errp) > > if (to) { > saddr->u.inet->has_to = true; > - saddr->u.inet->to = to; > - saddr->u.inet->has_to = true; > saddr->u.inet->to = to + 5900; > } > saddr->u.inet->ipv4 = saddr->u.inet->has_ipv4 = has_ipv4; Reviewed-by: Markus Armbruster