From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44262)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1ZuP1g-0008Rm-8k
	for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1ZuP1d-0003vj-FG
	for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:44 -0500
Received: from mx2.suse.de ([195.135.220.15]:60937)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1ZuP1d-0003vY-9e
	for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:41 -0500
References: <1444739866-14798-1-git-send-email-berrange@redhat.com>
	<1444739866-14798-8-git-send-email-berrange@redhat.com>
	<013c01d105b9$a6ef8a20$f4ce9e60$@samsung.com>
From: =?UTF-8?Q?Andreas_F=c3=a4rber?= <afaerber@suse.de>
Message-ID: <563B9C17.8050502@suse.de>
Date: Thu, 5 Nov 2015 19:12:39 +0100
MIME-Version: 1.0
In-Reply-To: <013c01d105b9$a6ef8a20$f4ce9e60$@samsung.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v4 7/7] qom: allow properties to be
 registered against classes
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: Pavel Fedin <p.fedin@samsung.com>, "'Daniel P. Berrange'" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: 'Paolo Bonzini' <pbonzini@redhat.com>, 'Markus Armbruster' <armbru@redhat.com>

Am 13.10.2015 um 15:18 schrieb Pavel Fedin:
>> diff --git a/include/qom/object.h b/include/qom/object.h
>> index 2a54515..38f41d3 100644
>> --- a/include/qom/object.h
>> +++ b/include/qom/object.h
[...]
>> @@ -964,8 +975,14 @@ typedef struct ObjectPropertyIterator ObjectPrope=
rtyIterator;
>>   * object_property_iter_init:
>>   * @obj: the object
>>   *
>> +<<<<<<< HEAD
>>   * Initializes an iterator for traversing all properties
>>   * registered against an object instance.
>> +=3D=3D=3D=3D=3D=3D=3D
>> + * Iterates over all properties defined against the object
>> + * instance, its class and all parent classes, calling
>> + * @iter for each property.
>> +>>>>>>> 0ca9307... qom: allow properties to be registered against cla=
sses
>=20
>  Conflict markers slipped in the comment

There is no v5 fixing this yet? If agreement has been reached, I would
at least start applying from the front, to avoid another lengthy review
cycle; I could try to resolve the conflict myself if it's the only nit.

Regards,
Andreas

P.S. Pavel, please delete unneeded quotation from your reply, I only
found that one line of inline comment.

--=20
SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Felix Imend=C3=B6rffer, Jane Smithard, Graham Norton; HRB 21284 (AG N=
=C3=BCrnberg)