From: Yang Hongyang <hongyang.yang@easystack.cn>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: armbru@redhat.com
Subject: Re: [Qemu-devel] [PATCH] vnc: fix mismerge
Date: Thu, 5 Nov 2015 18:50:54 +0800 [thread overview]
Message-ID: <563B348E.9040002@easystack.cn> (raw)
In-Reply-To: <1446714738-22400-1-git-send-email-kraxel@redhat.com>
On 2015年11月05日 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 <armbru@redhat.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> 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: Yang Hongyang <hongyang.yang@easystack.cn>
--
Thanks,
Yang
prev parent reply other threads:[~2015-11-05 10:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 9:12 [Qemu-devel] [PATCH] vnc: fix mismerge Gerd Hoffmann
2015-11-05 9:41 ` Markus Armbruster
2015-11-05 10:50 ` Yang Hongyang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=563B348E.9040002@easystack.cn \
--to=hongyang.yang@easystack.cn \
--cc=armbru@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).