From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54168)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <wdongxu@linux.vnet.ibm.com>) id 1VErMm-0006Bt-VP
	for qemu-devel@nongnu.org; Wed, 28 Aug 2013 21:49:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wdongxu@linux.vnet.ibm.com>) id 1VErMe-0003JL-2m
	for qemu-devel@nongnu.org; Wed, 28 Aug 2013 21:49:44 -0400
Received: from e36.co.us.ibm.com ([32.97.110.154]:56127)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <wdongxu@linux.vnet.ibm.com>) id 1VErMd-0003J7-SC
	for qemu-devel@nongnu.org; Wed, 28 Aug 2013 21:49:35 -0400
Received: from /spool/local
	by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only!
	Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <wdongxu@linux.vnet.ibm.com>;
	Wed, 28 Aug 2013 19:49:35 -0600
Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com
	[9.17.195.227])
	by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 504C43E40030
	for <qemu-devel@nongnu.org>; Wed, 28 Aug 2013 19:49:32 -0600 (MDT)
Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245])
	by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	r7T1nW7h180940
	for <qemu-devel@nongnu.org>; Wed, 28 Aug 2013 19:49:32 -0600
Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1])
	by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP
	id r7T1qOBk025861
	for <qemu-devel@nongnu.org>; Wed, 28 Aug 2013 19:52:24 -0600
Message-ID: <521EA8A8.10302@linux.vnet.ibm.com>
Date: Thu, 29 Aug 2013 09:49:28 +0800
From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
MIME-Version: 1.0
References: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com>
	<1376368326-7433-3-git-send-email-wdongxu@linux.vnet.ibm.com>
	<521DF3B0.5010008@redhat.com>
In-Reply-To: <521DF3B0.5010008@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH V18 02/25] qemu-option: avoid duplication
 of default value in QemuOpts
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: Eric Blake <eblake@redhat.com>
Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, qemu-devel@nongnu.org, stefanha@redhat.com

On 2013/8/28 20:57, Eric Blake wrote:
> On 08/12/2013 10:31 PM, Dong Xu Wang wrote:
>> This patch moves the default value entirely to QemuOptDesc.
>>
>> When getting the value of an option that hasn't been set, and
>> QemuOptDesc has a default value, return that.  Else, behave as
>> before.
>>
> ...
>>     Else, return NULL.
>>
>> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>>
>> v13->v14:
>> 1) change code style.
>> 2) assert errors.
>>
>> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
>>
>> Conflicts:
>> 	util/qemu-option.c
>> ---
>
> Awkward.  You should never have a 'Conflicts:' section on an upstream
> patch (except for maintainers resolving trivial conflicts during a merge
> operation); and this is another case of needing to move your submission
> changelog after the ---.
>
Okay, thank you, Eric.