From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZudNn-0006VN-L1 for qemu-devel@nongnu.org; Fri, 06 Nov 2015 04:32:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZudNj-0005lF-UM for qemu-devel@nongnu.org; Fri, 06 Nov 2015 04:32:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZudNj-0005l9-Pg for qemu-devel@nongnu.org; Fri, 06 Nov 2015 04:32:27 -0500 Date: Fri, 6 Nov 2015 09:32:23 +0000 From: "Daniel P. Berrange" Message-ID: <20151106093223.GB30803@redhat.com> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <563B9C17.8050502@suse.de> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 7/7] qom: allow properties to be registered against classes Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?utf-8?Q?F=C3=A4rber?= Cc: 'Paolo Bonzini' , Pavel Fedin , qemu-devel@nongnu.org, 'Markus Armbruster' 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 > >=20 > > Conflict markers slipped in the comment >=20 > 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. 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. Regards, Daniel --=20 |: http://berrange.com -o- http://www.flickr.com/photos/dberrange= / :| |: http://libvirt.org -o- http://virt-manager.or= g :| |: http://autobuild.org -o- http://search.cpan.org/~danberr= / :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vn= c :|