summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2006-12-22 02:09:07 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2006-12-22 02:09:07 +0000
commit73fc97427b6410b9ebd38b8d88831be050ce189b (patch)
tree962c1bc7f39ba0d7410e2420a7eefd3e40601b35 /vl.c
parentffd843bcdc46768f26507f0889c92f4bda287986 (diff)
downloadqemu-73fc97427b6410b9ebd38b8d88831be050ce189b.tar.gz
Unix domain socket support for VNC, by Anthony Liguori.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2260 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/vl.c b/vl.c
index 5c379c2909..929d2a938c 100644
--- a/vl.c
+++ b/vl.c
@@ -152,7 +152,7 @@ int win2k_install_hack = 0;
int usb_enabled = 0;
static VLANState *first_vlan;
int smp_cpus = 1;
-int vnc_display = -1;
+const char *vnc_display;
#if defined(TARGET_SPARC)
#define MAX_CPUS 16
#elif defined(TARGET_I386)
@@ -6818,11 +6818,7 @@ int main(int argc, char **argv)
}
break;
case QEMU_OPTION_vnc:
- vnc_display = atoi(optarg);
- if (vnc_display < 0) {
- fprintf(stderr, "Invalid VNC display\n");
- exit(1);
- }
+ vnc_display = optarg;
break;
case QEMU_OPTION_no_acpi:
acpi_enabled = 0;
@@ -6946,7 +6942,7 @@ int main(int argc, char **argv)
/* terminal init */
if (nographic) {
dumb_display_init(ds);
- } else if (vnc_display != -1) {
+ } else if (vnc_display != NULL) {
vnc_display_init(ds, vnc_display);
} else {
#if defined(CONFIG_SDL)