ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools: initialize main loop before block layer 

Tools were broken because they initialized the block layer while
qemu_aio_context was still NULL.

Reported-by: malc <av1474@comtv.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Paolo Bonzini 2012-11-03 18:10:17 +01:00 committed by malc
parent c878da3b27
commit 2592c59a66
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qemu-img.c
View File

@ -2001,14 +2001,13 @@ int main(int argc, char **argv)
error_set_progname(argv[0]); error_set_progname(argv[0]);
qemu_init_main_loop();
bdrv_init(); bdrv_init();
if (argc < 2) if (argc < 2)
help(); help();
cmdname = argv[1]; cmdname = argv[1];
argc--; argv++; argc--; argv++;
qemu_init_main_loop();
/* find the command */ /* find the command */
for(cmd = img_cmds; cmd->name != NULL; cmd++) { for(cmd = img_cmds; cmd->name != NULL; cmd++) {
if (!strcmp(cmdname, cmd->name)) { if (!strcmp(cmdname, cmd->name)) {

3
qemu-io.c
View File

@ -1892,9 +1892,8 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
bdrv_init();
qemu_init_main_loop(); qemu_init_main_loop();
bdrv_init();
/* initialize commands */ /* initialize commands */
quit_init(); quit_init();