From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuI8e-0005rn-Mw for qemu-devel@nongnu.org; Thu, 05 Nov 2015 05:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuI8Z-0000GG-N1 for qemu-devel@nongnu.org; Thu, 05 Nov 2015 05:51:28 -0500 Received: from m199-177.yeah.net ([123.58.177.199]:35135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuI8Z-00005R-88 for qemu-devel@nongnu.org; Thu, 05 Nov 2015 05:51:23 -0500 References: <1446714738-22400-1-git-send-email-kraxel@redhat.com> From: Yang Hongyang Message-ID: <563B348E.9040002@easystack.cn> Date: Thu, 5 Nov 2015 18:50:54 +0800 MIME-Version: 1.0 In-Reply-To: <1446714738-22400-1-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] vnc: fix mismerge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: armbru@redhat.com On 2015=E5=B9=B411=E6=9C=8805=E6=97=A5 17:12, Gerd Hoffmann wrote: > 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 **err= p) > > if (to) { > saddr->u.inet->has_to =3D true; > - saddr->u.inet->to =3D to; > - saddr->u.inet->has_to =3D true; > saddr->u.inet->to =3D to + 5900; > } > saddr->u.inet->ipv4 =3D saddr->u.inet->has_ipv4 =3D has_i= pv4; > Reviewed-by: Yang Hongyang --=20 Thanks, Yang