On Wed, May 27, 2015 at 08:16:01PM +0200, Andreas Färber 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ärber <afaer...@suse.de> wrote:
> >>> Hello Peter,
> >>>
> >>> This is my QOM (devices) patch queue. Please pull.
> >>>
> >>> Regards,
> >>> Andreas
> >>>
> >>> Cc: Peter Maydell <peter.mayd...@linaro.org>
> >>> Cc: Eduardo Habkost <ehabk...@redhat.com>
> >>> Cc: Paolo Bonzini <pbonz...@redhat.com>
> >>> Cc: Daniel P. Berrange <berra...@redhat.com>
> >>>
> >>> The following changes since commit
> >>> faa261a7fb254866bdd5b6a25ad94677945f21b4:
> >>>
> >>> Merge remote-tracking branch
> >>> 'remotes/pmaydell/tags/pull-cocoa-20150519' 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 28b86c32afbc53f9f06a5655da65f9d06fac1a3e:
> >>>
> >>> qom: Add object_property_add_const_link() (2015-05-20 17:40:47 +0200)
> >>
> >> 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=unused-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
> >
> > Agreed, looks gcc version related not ARM/32-bit.
> >
> > I'm thinking the following change applied to the patch
> > "qom: add a object_property_add_enum helper method" will probably
> > fix it
> >
> > 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 = NULL;
> > Object *parent = object_get_objects_root();
> > - DUMMY_OBJECT(
> > + Object *dobj =
> > 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);
> >
> > + g_assert(dobj == NULL);
> > g_assert(err != NULL);
> > g_assert_cmpstr(error_get_pretty(err), ==,
> > "Invalid parameter 'yeti'");
>
> Thanks, I've used this instead:
>
> - g_assert(err != NULL);
> + g_assert_null(dobj);
> + g_assert_nonnull(err);
>
> 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
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
