From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUhMo-0007xK-ML for qemu-devel@nongnu.org; Sat, 03 Nov 2012 13:18:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUhMn-0003s0-FF for qemu-devel@nongnu.org; Sat, 03 Nov 2012 13:18:42 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:40687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUhMn-0003rt-8W for qemu-devel@nongnu.org; Sat, 03 Nov 2012 13:18:41 -0400 Received: by mail-ee0-f45.google.com with SMTP id b47so2382269eek.4 for ; Sat, 03 Nov 2012 10:18:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 3 Nov 2012 18:10:17 +0100 Message-Id: <1351962617-13680-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] tools: initialize main loop before block layer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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(); -- 1.7.12.1