qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] vnc: fix mismerge


From: Gerd Hoffmann
Subject: [Qemu-devel] [PATCH] vnc: fix mismerge
Date: Thu, 5 Nov 2015 10:12:18 +0100

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;
-- 
1.8.3.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]