From 142c6b1a89c3af769fbab6a22f51eefa7a3b0330 Mon Sep 17 00:00:00 2001 From: Peter Lieven Date: Thu, 21 Mar 2013 13:07:10 +0100 Subject: vl.c: call bdrv_init_with_whitelist() before cmdline parsing commit 4d454574 "qemu-option: move standard option definitions out of qemu-config.c" broke support for commandline option groups that where registered during bdrv_init(). In particular support for -iscsi options was broken since that commit. Fix by moving the bdrv_init_with_whitelist() before command line argument parsing. Signed-off-by: Peter Lieven Signed-off-by: Stefan Hajnoczi --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 7643f16351..7f86a40f6f 100644 --- a/vl.c +++ b/vl.c @@ -2941,6 +2941,8 @@ int main(int argc, char **argv, char **envp) nb_numa_nodes = 0; nb_nics = 0; + bdrv_init_with_whitelist(); + autostart= 1; /* first pass of option parsing */ @@ -4199,8 +4201,6 @@ int main(int argc, char **argv, char **envp) cpu_exec_init_all(); - bdrv_init_with_whitelist(); - blk_mig_init(); /* open the virtual block devices */ -- cgit v1.2.1