From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 29 May 2008 16:54:07 +0000 (+0100)
Subject: fix up more broken merge results for vncunused patch
X-Git-Tag: xen-3.3.0-rc1~146
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d2656b1fa0d9434b9e741727e0e3e07901f979be;p=qemu-xen-3.4-testing.git

fix up more broken merge results for vncunused patch
---

diff --git a/vl.c b/vl.c
index dc745522..f7cbb982 100644
--- a/vl.c
+++ b/vl.c
@@ -8288,9 +8288,7 @@ int main(int argc, char **argv)
 		vnc_display = optarg;
 		break;
             case QEMU_OPTION_vncunused:
-                vncunused++;
-                if (vnc_display == -1)
-                    vnc_display = -2;
+                vncunused = 1;
                 break;
             case QEMU_OPTION_no_acpi:
                 acpi_enabled = 0;
@@ -8589,9 +8587,10 @@ int main(int argc, char **argv)
         }
         /* nearly nothing to do */
         dumb_display_init(ds);
-    } else if (vnc_display != NULL) {
+    } else if (vnc_display != NULL || vncunused != 0) {
+	int vnc_display_port;
         vnc_display_init(ds);
-        vnc_display = vnc_display_open(ds, vnc_display, vncunused);
+        vnc_display_port = vnc_display_open(ds, vnc_display, vncunused);
         if (vnc_display < 0)
             exit(1);
     } else