* [Qemu-devel] [PATCH] vnc: fix mismerge
@ 2015-11-05 9:12 Gerd Hoffmann
2015-11-05 9:41 ` Markus Armbruster
2015-11-05 10:50 ` Yang Hongyang
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2015-11-05 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: armbru, Gerd Hoffmann
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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] vnc: fix mismerge
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
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2015-11-05 9:41 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
Gerd Hoffmann <kraxel@redhat.com> writes:
> 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: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] vnc: fix mismerge
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
1 sibling, 0 replies; 3+ messages in thread
From: Yang Hongyang @ 2015-11-05 10:50 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel; +Cc: armbru
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-05 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).