From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzPxn-0004u9-2B for qemu-devel@nongnu.org; Thu, 19 Nov 2015 09:13:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzPxe-0007HH-PW for qemu-devel@nongnu.org; Thu, 19 Nov 2015 09:13:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzPxe-0007HD-H7 for qemu-devel@nongnu.org; Thu, 19 Nov 2015 09:13:18 -0500 Date: Thu, 19 Nov 2015 14:13:14 +0000 From: "Daniel P. Berrange" Message-ID: <20151119141314.GH9247@redhat.com> References: <1447879178-5440-1-git-send-email-afaerber@suse.de> <20151119115359.GD9247@redhat.com> <564DD82B.5070203@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <564DD82B.5070203@suse.de> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL for-2.5 00/10] QOM devices patch queue 2015-11-18 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: Peter Maydell , Pavel Fedin , QEMU Developers On Thu, Nov 19, 2015 at 03:09:47PM +0100, Andreas F=C3=A4rber wrote: > Am 19.11.2015 um 12:53 schrieb Daniel P. Berrange: > > On Thu, Nov 19, 2015 at 10:54:15AM +0000, Peter Maydell wrote: > >> On 18 November 2015 at 20:39, Andreas F=C3=A4rber = wrote: > >>> Hello Peter, > >>> > >>> This is my late QOM (devices) patch queue. Please pull. > >>> > >>> Regards, > >>> Andreas > >>> > >>> Cc: Peter Maydell > >>> Cc: Daniel P. Berrange > >>> Cc: Pavel Fedin > >>> > >>> The following changes since commit 74fcbd22d20a2fbc1a47a7b00cce5bf9= 8fd7be5f: > >>> > >>> hw/misc: Add support for ADC controller in Xilinx Zynq 7000 (2015= -11-12 21:30:42 +0000) > >>> > >>> are available in the git repository at: > >>> > >>> git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-peter > >>> > >>> for you to fetch changes up to c5760450796433621ccdc125866a84b892e2= d5b6: > >>> > >>> MAINTAINERS: Add check-qom-{interface,proplist} to QOM (2015-11-1= 8 21:13:50 +0100) > >>> > >>> ---------------------------------------------------------------- > >>> QOM infrastructure fixes and device conversions > >>> > >>> * Fix for properties on objects > 4 GiB > >>> * Performance improvements for QOM property handling > >>> * Assertion cleanups > >>> * MAINTAINERS additions > >> > >> Hi. Unfortunately this doesn't build with our minimum supported > >> glib version: > >> > >> /Users/pm215/src/qemu-for-merges/qom/object.c:921:9: warning: implic= it > >> declaration of function 'g_hash_table_contains' is invalid in C99 > >> [-Wimplicit-function-declaration] > >> if (g_hash_table_contains(obj->properties, name)) { > >> ^ > >> > >> g_hash_table_contains was only introduced in glib 2.32. > >=20 > > Since we never store NULL as a valid value in the hash tble, we > > can simply replace this with g_hash_table_lookup instead >=20 > Seems to work fine, too: >=20 > diff --git a/qom/object.c b/qom/object.c > index 19e7561..ff34c86 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -918,7 +918,7 @@ object_property_add(Object *obj, const char *name, > const char *type, > return ret; > } >=20 > - if (g_hash_table_contains(obj->properties, name)) { > + if (g_hash_table_lookup(obj->properties, name) !=3D NULL) { > error_setg(errp, "attempt to add duplicate property '%s'" > " to object (type '%s')", name, > object_get_typename(obj)); >=20 > Will respin. Reviewed-by: Daniel P. Berrange 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 :|