From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFss-0005ND-8M for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULFsl-0002AJ-AD for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFsk-0002AE-UN for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:40:55 -0400 From: Stefan Hajnoczi Date: Thu, 28 Mar 2013 17:40:15 +0100 Message-Id: <1364488837-15916-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1364488837-15916-1-git-send-email-stefanha@redhat.com> References: <1364488837-15916-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 01/23] vl.c: call bdrv_init_with_whitelist() before cmdline parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Peter Lieven , Stefan Hajnoczi From: Peter Lieven 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(-) diff --git a/vl.c b/vl.c index 7643f16..7f86a40 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 */ -- 1.8.1.4