On Thu, Oct 20, 2016 at 11:44:47AM +0100, Peter Maydell wrote: > On 19 October 2016 at 12:17, Daniel P. Berrange <berra...@redhat.com> wrote: > > The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e: > > > > Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' > > into staging (2016-10-18 09:29:44 +0100) > > > > are available in the git repository at: > > > > git://github.com/berrange/qemu tags/pull-qio-2016-10-19-1 > > > > for you to fetch changes up to 0bb954c2725206507f49430e77e7dd2ab2681108: > > > > main: set names for main loop sources created (2016-10-19 11:51:29 +0100) > > > > ---------------------------------------------------------------- > > Merge qio 2016/10/19 v1 > > > > ---------------------------------------------------------------- > > Daniel P. Berrange (6): > > io: add ability to set a name for IO channels > > nbd: set name for all I/O channels created > > char: set name for all I/O channels created > > migration: set name for all I/O channels created > > vnc: set name for all I/O channels created > > main: set names for main loop sources created > > > > Felipe Franciosi (4): > > io: Fix double shift usages on QIOChannel features > > io: Use qio_channel_has_feature() where applicable > > io: Introduce a qio_channel_set_feature() helper > > io: Add a QIOChannelSocket cleanup test > > I'm afraid this doesn't build with our minimum glib version: > > /Users/pm215/src/qemu-for-merges/main-loop.c:164:5: error: implicit > declaration of function 'g_source_set_name' is invalid in C99 > [-Werror,-Wimplicit-function-declaration] > g_source_set_name(src, "aio-context"); > ^ > > g_source_set_name() only came in in glib 2.26.
Ok, since this is merely a debug aid, i'll just stub it out as a no-op for older glib. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|