From: Gonglei <arei.gonglei@huawei.com>
Date: Fri, 30 Jan 2015 02:14:34 +0000 (+0800)
Subject: vnc: fix qemu crash when not configure vnc option
X-Git-Tag: v2.3.0-rc0~59^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88428b7a93347efc51be015cc12cb71fab3976a3;p=thirdparty%2Fqemu.git

vnc: fix qemu crash when not configure vnc option

Add missing vnc options: to, ipv4, ipv6 and fix
qemu crash.

Reproducer:
$ x86_64-softmmu/qemu-system-x86_64
qemu-system-x86_64: Invalid parameter 'to'
Segmentation fault (core dumped)

BTW the patch fix the below bug:
https://bugs.launchpad.net/qemu/+bug/1414222

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Don Slutz <dslutz@verizon.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/vnc.c b/ui/vnc.c
index 02552ee27b2..90e8a882e3c 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3271,6 +3271,15 @@ static QemuOptsList qemu_vnc_opts = {
         },{
             .name = "connections",
             .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "to",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "ipv4",
+            .type = QEMU_OPT_BOOL,
+        },{
+            .name = "ipv6",
+            .type = QEMU_OPT_BOOL,
         },{
             .name = "password",
             .type = QEMU_OPT_BOOL,