From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:44805)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UK85G-0008St-8O
	for qemu-devel@nongnu.org; Mon, 25 Mar 2013 10:09:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UK85E-0006T0-Ms
	for qemu-devel@nongnu.org; Mon, 25 Mar 2013 10:09:10 -0400
Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:56696)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UK85E-0006So-GE
	for qemu-devel@nongnu.org; Mon, 25 Mar 2013 10:09:08 -0400
Received: by mail-wi0-f169.google.com with SMTP id c10so2144501wiw.4
	for <qemu-devel@nongnu.org>; Mon, 25 Mar 2013 07:09:07 -0700 (PDT)
Date: Mon, 25 Mar 2013 15:09:04 +0100
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20130325140904.GB3267@stefanha-thinkpad.redhat.com>
References: <1363867631-5859-1-git-send-email-pl@kamp.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1363867631-5859-1-git-send-email-pl@kamp.de>
Subject: Re: [Qemu-devel] [PATCH 1/2] vl.c: call bdrv_init_with_whitelist()
 before cmdline parsing
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Lieven <pl@kamp.de>
Cc: qemu-devel@nongnu.org

On Thu, Mar 21, 2013 at 01:07:10PM +0100, Peter Lieven wrote:
> 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 <pl@kamp.de>
> ---
>  vl.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

> diff --git a/vl.c b/vl.c
> index aeed7f4..315d43d 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2935,6 +2935,8 @@ int main(int argc, char **argv, char **envp)
>  
>      nb_numa_nodes = 0;
>      nb_nics = 0;
> +    

I removed the trailing whitespace here.  git-am(1) warns about it.