mirror of https://github.com/xemu-project/xemu.git
vnc: fix mismerge
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> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn> Message-id: 1446714738-22400-1-git-send-email-kraxel@redhat.com
This commit is contained in:
parent
f14c3d85b0
commit
382e1737d3
2
ui/vnc.c
2
ui/vnc.c
|
@ -3616,8 +3616,6 @@ void vnc_display_open(const char *id, Error **errp)
|
||||||
"%d", (int)baseport + 5900);
|
"%d", (int)baseport + 5900);
|
||||||
|
|
||||||
if (to) {
|
if (to) {
|
||||||
saddr->u.inet->has_to = true;
|
|
||||||
saddr->u.inet->to = to;
|
|
||||||
saddr->u.inet->has_to = true;
|
saddr->u.inet->has_to = true;
|
||||||
saddr->u.inet->to = to + 5900;
|
saddr->u.inet->to = to + 5900;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue