]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qemu-nbd: initialize main loop before block layer
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 3 Nov 2012 17:06:26 +0000 (18:06 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 12 Nov 2012 10:33:29 +0000 (11:33 +0100)
qemu-nbd was broken because they initialized the block layer while
qemu_aio_context was still NULL.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
qemu-nbd.c

index 15bcd08123983db3088724c153db9cdc64c64dd5..80f08d8464749a01c62b6798f6ee951df3445ca6 100644 (file)
@@ -539,6 +539,7 @@ int main(int argc, char **argv)
         snprintf(sockpath, 128, SOCKET_PATH, basename(device));
     }
 
+    qemu_init_main_loop();
     bdrv_init();
     atexit(bdrv_close_all);
 
@@ -584,7 +585,6 @@ int main(int argc, char **argv)
         memset(&client_thread, 0, sizeof(client_thread));
     }
 
-    qemu_init_main_loop();
     qemu_set_fd_handler2(fd, nbd_can_accept, nbd_accept, NULL,
                          (void *)(uintptr_t)fd);