From: Ian Jackson Date: Thu, 29 May 2008 16:42:39 +0000 (+0100) Subject: move case QEMU_OPTION_vncunused to right spot (undo merge damage) X-Git-Tag: xen-3.3.0-rc1~149 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ef5a21b55ae91a42511a89bf22f4e64f7f88cf5c;p=qemu-xen-4.4-testing.git move case QEMU_OPTION_vncunused to right spot (undo merge damage) --- diff --git a/vl.c b/vl.c index 3edb30dee..dc7455226 100644 --- a/vl.c +++ b/vl.c @@ -5599,11 +5599,6 @@ int qemu_set_fd_handler2(int fd, if (ioh->fd == fd) { ioh->deleted = 1; break; - case QEMU_OPTION_vncunused: - vncunused++; - if (vnc_display == -1) - vnc_display = -2; - break; } pioh = &ioh->next; } @@ -8292,6 +8287,11 @@ int main(int argc, char **argv) case QEMU_OPTION_vnc: vnc_display = optarg; break; + case QEMU_OPTION_vncunused: + vncunused++; + if (vnc_display == -1) + vnc_display = -2; + break; case QEMU_OPTION_no_acpi: acpi_enabled = 0; break;