From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyKgr-0000Q8-EZ for qemu-devel@nongnu.org; Fri, 29 May 2015 09:51:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyKgm-00027s-C6 for qemu-devel@nongnu.org; Fri, 29 May 2015 09:51:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyKgm-00026v-5A for qemu-devel@nongnu.org; Fri, 29 May 2015 09:51:08 -0400 Date: Fri, 29 May 2015 14:51:00 +0100 From: "Daniel P. Berrange" Message-ID: <20150529135100.GA14821@redhat.com> References: <1432137106-8295-1-git-send-email-afaerber@suse.de> <20150521115346.GJ23116@redhat.com> <556609E1.2000004@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <556609E1.2000004@suse.de> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 00/12] QOM devices patch queue 2015-05-20 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 , Paolo Bonzini , QEMU Developers , Eduardo Habkost On Wed, May 27, 2015 at 08:16:01PM +0200, Andreas F=C3=A4rber wrote: > Am 21.05.2015 um 13:53 schrieb Daniel P. Berrange: > > On Thu, May 21, 2015 at 12:18:30PM +0100, Peter Maydell wrote: > >> On 20 May 2015 at 16:51, Andreas F=C3=A4rber wrot= e: > >>> Hello Peter, > >>> > >>> This is my QOM (devices) patch queue. Please pull. > >>> > >>> Regards, > >>> Andreas > >>> > >>> Cc: Peter Maydell > >>> Cc: Eduardo Habkost > >>> Cc: Paolo Bonzini > >>> Cc: Daniel P. Berrange > >>> > >>> The following changes since commit faa261a7fb254866bdd5b6a25ad94677= 945f21b4: > >>> > >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20= 150519' into staging (2015-05-19 10:25:59 +0100) > >>> > >>> 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 28b86c32afbc53f9f06a5655da65f9d06fac= 1a3e: > >>> > >>> qom: Add object_property_add_const_link() (2015-05-20 17:40:47 +0= 200) > >> > >> Fails to build on my 32-bit ARM box, I'm afraid: > >> > >> tests/check-qom-proplist.c: In function 'test_dummy_badenum': > >> tests/check-qom-proplist.c:225:6: error: value computed is not used > >> [-Werror=3Dunused-value] > >> > >> My guess is this is a gcc-version-dependent thing rather > >> than particularly 32-bit or ARM related. It's using > >> gcc (Ubuntu/Linaro 4.7.2-2ubuntu1) 4.7.2 > >=20 > > Agreed, looks gcc version related not ARM/32-bit. > >=20 > > I'm thinking the following change applied to the patch > > "qom: add a object_property_add_enum helper method" will probably > > fix it > >=20 > > diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c > > index 8b764a1..7400b1f 100644 > > --- a/tests/check-qom-proplist.c > > +++ b/tests/check-qom-proplist.c > > @@ -222,7 +222,7 @@ static void test_dummy_badenum(void) > > { > > Error *err =3D NULL; > > Object *parent =3D object_get_objects_root(); > > - DUMMY_OBJECT( > > + Object *dobj =3D > > object_new_with_props(TYPE_DUMMY, > > parent, > > "dummy0", > > @@ -230,8 +230,9 @@ static void test_dummy_badenum(void) > > "bv", "yes", > > "sv", "Hiss hiss hiss", > > "av", "yeti", > > - NULL)); > > + NULL); > > =20 > > + g_assert(dobj =3D=3D NULL); > > g_assert(err !=3D NULL); > > g_assert_cmpstr(error_get_pretty(err), =3D=3D, > > "Invalid parameter 'yeti'"); >=20 > Thanks, I've used this instead: >=20 > - g_assert(err !=3D NULL); > + g_assert_null(dobj); > + g_assert_nonnull(err); >=20 > More places could be cleaned up that way... Since that caused failure with glib 2.22 could you revert that switch to g_assert_null/nonnull. 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 :|