[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] vnc: fix mismerge
|
From: |
Markus Armbruster |
|
Subject: |
Re: [Qemu-devel] [PATCH] vnc: fix mismerge |
|
Date: |
Thu, 05 Nov 2015 10:41:04 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Gerd Hoffmann <address@hidden> writes:
> Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is
> specified" was rebased incorrectly, fix it.
>
> Reported-by: Markus Armbruster <address@hidden>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
> 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 <address@hidden>