From patchwork Sat Nov 3 17:10:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: tools: initialize main loop before block layer Date: Sat, 03 Nov 2012 07:10:17 -0000 From: Paolo Bonzini X-Patchwork-Id: 196891 Message-Id: <1351962617-13680-1-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Tools were broken because they initialized the block layer while qemu_aio_context was still NULL. Reported-by: malc Signed-off-by: Paolo Bonzini --- qemu-img.c | 3 +-- qemu-io.c | 3 +-- 2 file modificati, 2 inserzioni(+), 4 rimozioni(-) diff --git a/qemu-img.c b/qemu-img.c index b17bddd..e29e01b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2001,14 +2001,13 @@ int main(int argc, char **argv) error_set_progname(argv[0]); + qemu_init_main_loop(); bdrv_init(); if (argc < 2) help(); cmdname = argv[1]; argc--; argv++; - qemu_init_main_loop(); - /* find the command */ for(cmd = img_cmds; cmd->name != NULL; cmd++) { if (!strcmp(cmdname, cmd->name)) { diff --git a/qemu-io.c b/qemu-io.c index d0f4fb7..1ad7d3a 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -1892,9 +1892,8 @@ int main(int argc, char **argv) exit(1); } - bdrv_init(); - qemu_init_main_loop(); + bdrv_init(); /* initialize commands */ quit_init();