From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzCFu-0007Dn-5x for qemu-devel@nongnu.org; Wed, 18 Nov 2015 18:35:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzCFq-00020f-5R for qemu-devel@nongnu.org; Wed, 18 Nov 2015 18:35:14 -0500 Received: from mx2.suse.de ([195.135.220.15]:58145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzCFp-0001zz-Vv for qemu-devel@nongnu.org; Wed, 18 Nov 2015 18:35:10 -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> <563B9C17.8050502@suse.de> <20151106093223.GB30803@redhat.com> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <564D0B29.9060600@suse.de> Date: Thu, 19 Nov 2015 00:35:05 +0100 MIME-Version: 1.0 In-Reply-To: <20151106093223.GB30803@redhat.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: 'Paolo Bonzini' , Pavel Fedin , qemu-devel@nongnu.org, 'Markus Armbruster' Am 06.11.2015 um 10:32 schrieb Daniel P. Berrange: > On Thu, Nov 05, 2015 at 07:12:39PM +0100, Andreas F=C3=A4rber wrote: >> 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 ObjectPro= pertyIterator; >>>> * 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 c= lasses >>> >>> 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 revie= w >> cycle; I could try to resolve the conflict myself if it's the only nit= . >=20 > Opps, I missed this comment. No, I've not sent a v5, but it looks like > it is just this comment that's the problem which is why I didn't catch > it during compilation. Fixed up and queued on qom-next for next merge window: https://github.com/afaerber/qemu-cpu/commits/qom-next Thanks, Andreas --=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)