]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
move case QEMU_OPTION_vncunused to right spot (undo merge damage)
authorIan Jackson <iwj@mariner.uk.xensource.com>
Thu, 29 May 2008 16:42:39 +0000 (17:42 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 29 May 2008 16:42:39 +0000 (17:42 +0100)
vl.c

diff --git a/vl.c b/vl.c
index 3edb30dee415043e8f6380b639c5470d5190a263..dc7455226b0a69b214b192c332367d0276391017 100644 (file)
--- 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;