Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Daniel P . Berrangé
On Thu, Feb 07, 2019 at 03:29:35PM +0200, Samuel Thibault wrote:
> Peter Maydell, le jeu. 07 févr. 2019 11:46:23 +, a ecrit:
> > On Tue, 5 Feb 2019 at 18:28, Samuel Thibault
> >  wrote:
> > >
> > > The following changes since commit 
> > > 01a9a51ffaf4699827ea6425cb2b834a356e159d:
> > >
> > >   Merge remote-tracking branch 
> > > 'remotes/kraxel/tags/ui-20190205-pull-request' into staging (2019-02-05 
> > > 14:01:29 +)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> > >
> > > for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:
> > >
> > >   slirp: API is extern C (2019-02-05 20:27:27 +0200)
> > >
> > > 
> > > More work towards libslirp
> > >
> > 
> > Format string issues for the Windows build:
> 
> Oh, I am not getting these errors with make docker-test-mingw@fedora,
> perhaps something would need to be fixed there to test as much as you do?

You're seeing a difference due to the version of glib2 that's built.

Previously the GLIB_*_FORMAT macros would contain the win32 platform
specific formats, and the g_critical function would be annotated
with 'printf'.

Now GLib2's  GLIB_*_FORMAT macros will contain the GNU compatible 
formats, and the g_critical function would be annotated 'gnu_printf'.

So your Fedora build test used the gnu_printf based glib2 and so
didn't trigger the warnings.

Peter's build probably uses an older glib.

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Peter Maydell
On Thu, 7 Feb 2019 at 13:53, Marc-André Lureau
 wrote:
> I am also unable to reproduce yet. Any hint on how to reproduce?
>
> I wonder if this is related to __USE_MINGW_ANSI_STDIO somehow (could
> be, although glib doesn't use the same functions, the compiler might
> not know the difference)

I do the windows builds using the https://mxe.cc/ cross tools and
libs.

thanks
-- PMM



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Marc-André Lureau
Hi

On Thu, Feb 7, 2019 at 2:31 PM Samuel Thibault  wrote:
>
> Peter Maydell, le jeu. 07 févr. 2019 11:46:23 +, a ecrit:
> > On Tue, 5 Feb 2019 at 18:28, Samuel Thibault
> >  wrote:
> > >
> > > The following changes since commit 
> > > 01a9a51ffaf4699827ea6425cb2b834a356e159d:
> > >
> > >   Merge remote-tracking branch 
> > > 'remotes/kraxel/tags/ui-20190205-pull-request' into staging (2019-02-05 
> > > 14:01:29 +)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> > >
> > > for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:
> > >
> > >   slirp: API is extern C (2019-02-05 20:27:27 +0200)
> > >
> > > 
> > > More work towards libslirp
> > >
> >
> > Format string issues for the Windows build:
>
> Oh, I am not getting these errors with make docker-test-mingw@fedora,
> perhaps something would need to be fixed there to test as much as you do?
>
> > All the other builds went OK.
>
> Good :) I'll have a look at these formatting issues.
>

I am also unable to reproduce yet. Any hint on how to reproduce?

I wonder if this is related to __USE_MINGW_ANSI_STDIO somehow (could
be, although glib doesn't use the same functions, the compiler might
not know the difference)

In any case, we should replace %PRI & %z with glib equivalents under slirp/.




--
Marc-André Lureau



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Samuel Thibault
Peter Maydell, le jeu. 07 févr. 2019 11:46:23 +, a ecrit:
> On Tue, 5 Feb 2019 at 18:28, Samuel Thibault
>  wrote:
> >
> > The following changes since commit 01a9a51ffaf4699827ea6425cb2b834a356e159d:
> >
> >   Merge remote-tracking branch 
> > 'remotes/kraxel/tags/ui-20190205-pull-request' into staging (2019-02-05 
> > 14:01:29 +)
> >
> > are available in the Git repository at:
> >
> >   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> >
> > for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:
> >
> >   slirp: API is extern C (2019-02-05 20:27:27 +0200)
> >
> > 
> > More work towards libslirp
> >
> 
> Format string issues for the Windows build:

Oh, I am not getting these errors with make docker-test-mingw@fedora,
perhaps something would need to be fixed there to test as much as you do?

> All the other builds went OK.

Good :) I'll have a look at these formatting issues.

Samuel



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Daniel P . Berrangé
On Thu, Feb 07, 2019 at 11:46:23AM +, Peter Maydell wrote:
> On Tue, 5 Feb 2019 at 18:28, Samuel Thibault
>  wrote:
> >
> > The following changes since commit 01a9a51ffaf4699827ea6425cb2b834a356e159d:
> >
> >   Merge remote-tracking branch 
> > 'remotes/kraxel/tags/ui-20190205-pull-request' into staging (2019-02-05 
> > 14:01:29 +)
> >
> > are available in the Git repository at:
> >
> >   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> >
> > for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:
> >
> >   slirp: API is extern C (2019-02-05 20:27:27 +0200)
> >
> > 
> > More work towards libslirp
> >
> 
> Format string issues for the Windows build:
> 
> /home/petmay01/qemu-for-merges/slirp/slirp.c: In function
> 'slirp_send_packet_all':
> /home/petmay01/qemu-for-merges/slirp/slirp.c:1116:20: error: unknown
> conversion type character 'z' in format [-Werror=format=]
>  g_critical("Failed to send packet, ret: %zd", ret);
> ^

Note that with any of the glib functions that take a format string,
you *must* use the glib format macros, not the system provided
format macros.  ie  G_*_FORMAT, not any of the PRI*  macros
from stdint.h.   This is because you can't assume that the glib
functions call through to the platform's own printf impl. See:

  https://developer.gnome.org/glib/stable/glib-Basic-Types.html

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-07 Thread Peter Maydell
On Tue, 5 Feb 2019 at 18:28, Samuel Thibault
 wrote:
>
> The following changes since commit 01a9a51ffaf4699827ea6425cb2b834a356e159d:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190205-pull-request' 
> into staging (2019-02-05 14:01:29 +)
>
> are available in the Git repository at:
>
>   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:
>
>   slirp: API is extern C (2019-02-05 20:27:27 +0200)
>
> 
> More work towards libslirp
>

Format string issues for the Windows build:

/home/petmay01/qemu-for-merges/slirp/slirp.c: In function
'slirp_send_packet_all':
/home/petmay01/qemu-for-merges/slirp/slirp.c:1116:20: error: unknown
conversion type character 'z' in format [-Werror=format=]
 g_critical("Failed to send packet, ret: %zd", ret);
^
/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmessages.h:333:32:
note: in definition of macro 'g_critical'
__VA_ARGS__)
^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1116:20: error: too many
arguments for format [-Werror=format-extra-args]
 g_critical("Failed to send packet, ret: %zd", ret);
^
/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmessages.h:333:32:
note: in definition of macro 'g_critical'
__VA_ARGS__)
^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:21: error: unknown
conversion type character 'z' in format [-Werror=format=]
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmessages.h:342:32:
note: in definition of macro 'g_debug'
__VA_ARGS__)
^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:9: note: in
expansion of macro 'DEBUG_ERROR'
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:21: error: unknown
conversion type character 'z' in format [-Werror=format=]
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmessages.h:342:32:
note: in definition of macro 'g_debug'
__VA_ARGS__)
^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:9: note: in
expansion of macro 'DEBUG_ERROR'
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:21: error: too many
arguments for format [-Werror=format-extra-args]
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmessages.h:342:32:
note: in definition of macro 'g_debug'
__VA_ARGS__)
^
/home/petmay01/qemu-for-merges/slirp/slirp.c:1118:9: note: in
expansion of macro 'DEBUG_ERROR'
 DEBUG_ERROR("send_packet() didn't send all data: %zd < %zu", ret, len);
 ^
cc1: all warnings being treated as errors


All the other builds went OK.

thanks
-- PMM



Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-05 Thread no-reply
Patchew URL: 
https://patchew.org/QEMU/20190205182848.29887-1-samuel.thiba...@ens-lyon.org/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [Qemu-devel] [PULLv3 00/32] More work towards libslirp
Message-id: 20190205182848.29887-1-samuel.thiba...@ens-lyon.org
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
   9669c97..47994e1  master -> master
 - [tag update]  patchew/1549371525-29899-1-git-send-email-th...@redhat.com 
-> patchew/1549371525-29899-1-git-send-email-th...@redhat.com
 * [new tag] 
patchew/20190205182848.29887-1-samuel.thiba...@ens-lyon.org -> 
patchew/20190205182848.29887-1-samuel.thiba...@ens-lyon.org
Submodule 'capstone' (https://git.qemu.org/git/capstone.git) registered for 
path 'capstone'
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Submodule 'roms/QemuMacDrivers' (https://git.qemu.org/git/QemuMacDrivers.git) 
registered for path 'roms/QemuMacDrivers'
Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 
'roms/SLOF'
Submodule 'roms/ipxe' (https://git.qemu.org/git/ipxe.git) registered for path 
'roms/ipxe'
Submodule 'roms/openbios' (https://git.qemu.org/git/openbios.git) registered 
for path 'roms/openbios'
Submodule 'roms/openhackware' (https://git.qemu.org/git/openhackware.git) 
registered for path 'roms/openhackware'
Submodule 'roms/qemu-palcode' (https://git.qemu.org/git/qemu-palcode.git) 
registered for path 'roms/qemu-palcode'
Submodule 'roms/seabios' (https://git.qemu.org/git/seabios.git/) registered for 
path 'roms/seabios'
Submodule 'roms/seabios-hppa' (https://github.com/hdeller/seabios-hppa.git) 
registered for path 'roms/seabios-hppa'
Submodule 'roms/sgabios' (https://git.qemu.org/git/sgabios.git) registered for 
path 'roms/sgabios'
Submodule 'roms/skiboot' (https://git.qemu.org/git/skiboot.git) registered for 
path 'roms/skiboot'
Submodule 'roms/u-boot' (https://git.qemu.org/git/u-boot.git) registered for 
path 'roms/u-boot'
Submodule 'roms/u-boot-sam460ex' (https://git.qemu.org/git/u-boot-sam460ex.git) 
registered for path 'roms/u-boot-sam460ex'
Submodule 'tests/fp/berkeley-softfloat-3' 
(https://github.com/cota/berkeley-softfloat-3) registered for path 
'tests/fp/berkeley-softfloat-3'
Submodule 'tests/fp/berkeley-testfloat-3' 
(https://github.com/cota/berkeley-testfloat-3) registered for path 
'tests/fp/berkeley-testfloat-3'
Submodule 'ui/keycodemapdb' (https://git.qemu.org/git/keycodemapdb.git) 
registered for path 'ui/keycodemapdb'
Cloning into 'capstone'...
Submodule path 'capstone': checked out 
'22ead3e0bfdb87516656453336160e0a37b066bf'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '88f18909db731a627456f26d779445f84e449536'
Cloning into 'roms/QemuMacDrivers'...
Submodule path 'roms/QemuMacDrivers': checked out 
'90c488d5f4a407342247b9ea869df1c2d9c8e266'
Cloning into 'roms/SLOF'...
Submodule path 'roms/SLOF': checked out 
'a5b428e1c1eae703bdd62a3f527223c291ee3fdc'
Cloning into 'roms/ipxe'...
Submodule path 'roms/ipxe': checked out 
'de4565cbe76ea9f7913a01f331be3ee901bb6e17'
Cloning into 'roms/openbios'...
Submodule path 'roms/openbios': checked out 
'441a84d3a642a10b948369c63f32367e8ff6395b'
Cloning into 'roms/openhackware'...
Submodule path 'roms/openhackware': checked out 
'c559da7c8eec5e45ef1f67978827af6f0b9546f5'
Cloning into 'roms/qemu-palcode'...
Submodule path 'roms/qemu-palcode': checked out 
'51c237d7e20d05100eacadee2f61abc17e6bc097'
Cloning into 'roms/seabios'...
Submodule path 'roms/seabios': checked out 
'a698c8995ffb2838296ec284fe3c4ad33dfca307'
Cloning into 'roms/seabios-hppa'...
Submodule path 'roms/seabios-hppa': checked out 
'1ef99a01572c2581c30e16e6fe69e9ea2ef92ce0'
Cloning into 'roms/sgabios'...
Submodule path 'roms/sgabios': checked out 
'cbaee52287e5f32373181cff50a00b6c4ac9015a'
Cloning into 'roms/skiboot'...
Submodule path 'roms/skiboot': checked out 
'e0ee24c27a172bcf482f6f2bc905e6211c134bcc'
Cloning into 'roms/u-boot'...
Submodule path 'roms/u-boot': checked out 
'd85ca029f257b53a96da6c2fb421e78a003a9943'
Cloning into 'roms/u-boot-sam460ex'...
Submodule path 'roms/u-boot-sam460ex': checked out 
'60b3916f33e617a815973c5a6df77055b2e3a588'
Cloning into 'tests/fp/berkeley-softfloat-3'...
Submodule path 'tests/fp/berkeley-softfloat-3': checked out 
'b64af41c3276f97f0e181920400ee056b9c88037'
Cloning into 'tests/fp/berkeley-testfloat-3'...
Submodule path 'tests/fp/berkeley-testfloat-3': checked out 
'5a59dcec19327396a011a17fd924aed4fec416b3'
Cloning into 'ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out 
'6b3d716e2b6472eb7189d3220552280ef3d832ce'
Switched to a new branch 'test'
48788f3 slirp: API is

Re: [Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-05 Thread no-reply
Patchew URL: 
https://patchew.org/QEMU/20190205182848.29887-1-samuel.thiba...@ens-lyon.org/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [Qemu-devel] [PULLv3 00/32] More work towards libslirp
Type: series
Message-id: 20190205182848.29887-1-samuel.thiba...@ens-lyon.org

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
   9669c97562..47994e16b1  master -> master
 t [tag update]
patchew/1549371525-29899-1-git-send-email-th...@redhat.com -> 
patchew/1549371525-29899-1-git-send-email-th...@redhat.com
 * [new tag]   
patchew/20190205181218.8995-1-peter.mayd...@linaro.org -> 
patchew/20190205181218.8995-1-peter.mayd...@linaro.org
 * [new tag]   
patchew/20190205182848.29887-1-samuel.thiba...@ens-lyon.org -> 
patchew/20190205182848.29887-1-samuel.thiba...@ens-lyon.org
Switched to a new branch 'test'
48788f32b8 slirp: API is extern C
3d1cdcf3da slirp: pass opaque to all callbacks
0d81dddc82 slirp: use polling callbacks, drop glib requirement
d01c351f90 slirp: remove slirp_instances list
1270fcc441 slirp: replace global polling with per-instance & notifier
b8897fc434 slirp: improve send_packet() callback
b664c28b37 slirp: prefer c99 types over BSD kind
09e965067c slirp: replace remaining qemu headers dependency
3724a91777 slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/
53b357d14c slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
3ea01d196d slirp: replace qemu qtailq with slirp own copy
a481fdc029 slirp: replace net/eth.h inclusion with own defines
fa670ffa71 slirp: remove now useless QEMU headers inclusions
a30ea55480 slirp: remove qemu timer.h dependency
8d9af67bc6 slirp: add slirp own version of pstrcpy
8c230c3803 slirp: improve windows headers inclusion
ef56e8d421 slirp: do not include qemu headers in libslirp.h public API header
5ac5a10014 slirp: move QEMU state saving to a separate unit
0abf445228 slirp: replace qemu_notify_event() with a callback
12c6d0ef34 slirp: add unregister_poll_fd() callback
1985ed9e0c slirp: replace qemu_set_nonblock()
c6403fae65 slirp: replace most qemu socket utilities with slirp own version
bae9e17858 slirp: replace QEMU_PACKED with SLIRP_PACKED
cb52c8a00b slirp: replace trace functions with DEBUG calls
cc0a0b1889 slirp: add callbacks for timer
51a1cf007b net/slirp: fix leaks on forwarding rule registration error
9e775ae01f net/slirp: free forwarding rules on cleanup
2a3e11c41e net/slirp: simplify checking for cmd: prefix
18e1d03b03 slirp: generalize guestfwd with a callback based approach
60aeb1455e slirp: Don't mark struct ipq or struct ipasfrag as packed
81efc1aad8 slirp: Avoid marking naturally packed structs as QEMU_PACKED
9de8154ed7 slirp: Avoid unaligned 16bit memory access

=== OUTPUT BEGIN ===
1/32 Checking commit 9de8154ed708 (slirp: Avoid unaligned 16bit memory access)
2/32 Checking commit 81efc1aad888 (slirp: Avoid marking naturally packed 
structs as QEMU_PACKED)
3/32 Checking commit 60aeb1455ea7 (slirp: Don't mark struct ipq or struct 
ipasfrag as packed)
4/32 Checking commit 18e1d03b0387 (slirp: generalize guestfwd with a callback 
based approach)
ERROR: code indent should never use tabs
#148: FILE: slirp/misc.h:14:
+^ISlirpWriteCb write_cb;$

ERROR: code indent should never use tabs
#149: FILE: slirp/misc.h:15:
+^Ivoid *opaque;$

total: 2 errors, 0 warnings, 226 lines checked

Patch 4/32 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

5/32 Checking commit 2a3e11c41e31 (net/slirp: simplify checking for cmd: prefix)
6/32 Checking commit 9e775ae01fc4 (net/slirp: free forwarding rules on cleanup)
7/32 Checking commit 51a1cf007bb8 (net/slirp: fix leaks on forwarding rule 
registration error)
8/32 Checking commit cc0a0b1889f8 (slirp: add callbacks for timer)
9/32 Checking commit cb52c8a00b9f (slirp: replace trace functions with DEBUG 
calls)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#100: 
deleted file mode 100644

total: 0 errors, 1 warnings, 62 lines checked

Patch 9/32 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/32 Checking commit bae9e1785826 (slirp: replace QEMU_PACKED with 
SLIRP_PACKED)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#111: 
new file mode 100644

total: 0 errors, 1 warnings, 111 lines checked

Patch 10/32 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/32 Checking commit c6403fae651b (slirp: replace 

[Qemu-devel] [PULLv3 00/32] More work towards libslirp

2019-02-05 Thread Samuel Thibault
The following changes since commit 01a9a51ffaf4699827ea6425cb2b834a356e159d:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190205-pull-request' 
into staging (2019-02-05 14:01:29 +)

are available in the Git repository at:

  https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

for you to fetch changes up to 1e924479dce65a26a7432bf5920f89c1bf957d74:

  slirp: API is extern C (2019-02-05 20:27:27 +0200)


More work towards libslirp

Marc-André Lureau (27):
  slirp: generalize guestfwd with a callback based approach
  net/slirp: simplify checking for cmd: prefix
  net/slirp: free forwarding rules on cleanup
  net/slirp: fix leaks on forwarding rule registration error
  slirp: add callbacks for timer
  slirp: replace trace functions with DEBUG calls
  slirp: replace QEMU_PACKED with SLIRP_PACKED
  slirp: replace most qemu socket utilities with slirp own version
  slirp: replace qemu_set_nonblock()
  slirp: add unregister_poll_fd() callback
  slirp: replace qemu_notify_event() with a callback
  slirp: move QEMU state saving to a separate unit
  slirp: do not include qemu headers in libslirp.h public API header
  slirp: improve windows headers inclusion
  slirp: add slirp own version of pstrcpy
  slirp: remove qemu timer.h dependency
  slirp: remove now useless QEMU headers inclusions
  slirp: replace net/eth.h inclusion with own defines
  slirp: replace qemu qtailq with slirp own copy
  slirp: replace remaining qemu headers dependency
  slirp: prefer c99 types over BSD kind
  slirp: improve send_packet() callback
  slirp: replace global polling with per-instance & notifier
  slirp: remove slirp_instances list
  slirp: use polling callbacks, drop glib requirement
  slirp: pass opaque to all callbacks
  slirp: API is extern C

Peter Maydell (2):
  slirp: Avoid marking naturally packed structs as QEMU_PACKED
  slirp: Don't mark struct ipq or struct ipasfrag as packed

Samuel Thibault (3):
  slirp: Avoid unaligned 16bit memory access
  slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
  slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/


Marc-André Lureau (27):
  slirp: generalize guestfwd with a callback based approach
  net/slirp: simplify checking for cmd: prefix
  net/slirp: free forwarding rules on cleanup
  net/slirp: fix leaks on forwarding rule registration error
  slirp: add callbacks for timer
  slirp: replace trace functions with DEBUG calls
  slirp: replace QEMU_PACKED with SLIRP_PACKED
  slirp: replace most qemu socket utilities with slirp own version
  slirp: replace qemu_set_nonblock()
  slirp: add unregister_poll_fd() callback
  slirp: replace qemu_notify_event() with a callback
  slirp: move QEMU state saving to a separate unit
  slirp: do not include qemu headers in libslirp.h public API header
  slirp: improve windows headers inclusion
  slirp: add slirp own version of pstrcpy
  slirp: remove qemu timer.h dependency
  slirp: remove now useless QEMU headers inclusions
  slirp: replace net/eth.h inclusion with own defines
  slirp: replace qemu qtailq with slirp own copy
  slirp: replace remaining qemu headers dependency
  slirp: prefer c99 types over BSD kind
  slirp: improve send_packet() callback
  slirp: replace global polling with per-instance & notifier
  slirp: remove slirp_instances list
  slirp: use polling callbacks, drop glib requirement
  slirp: pass opaque to all callbacks
  slirp: API is extern C

Peter Maydell (2):
  slirp: Avoid marking naturally packed structs as QEMU_PACKED
  slirp: Don't mark struct ipq or struct ipasfrag as packed

Samuel Thibault (3):
  slirp: Avoid unaligned 16bit memory access
  slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
  slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/

 Makefile.objs|   1 -
 include/glib-compat.h|  57 ---
 include/net/net.h|   2 +-
 include/qemu/main-loop.h |  15 +
 net/net.c|   4 +-
 net/slirp.c  | 185 -
 slirp/Makefile.objs  |   4 +-
 slirp/arp_table.c|   3 +-
 slirp/bootp.c|   1 -
 slirp/cksum.c|   1 -
 slirp/debug.h|  13 +-
 slirp/dhcpv6.c   |   4 +-
 slirp/dnssearch.c|   1 -
 slirp/if.c   |   4 +-
 slirp/ip.h   |  17 +-
 slirp/ip6.h  |  14 +-
 slirp/ip6_icmp.c |  27 +-
 slirp/ip6_icmp.h |  26 +-
 slirp/ip6_input.c|   1 -
 slirp/ip6_output.c   |   2 -
 slirp/ip_icmp.c  |  14 +-
 slirp/ip_icmp.h  |  18 +-
 slirp/ip_input.c |   5 +-
 slirp/ip_output.c|   1 -
 slirp/libslirp.h |  71 +++-
 slirp/main.h |   2 +-
 slirp/mbuf.c |   1 -
 slirp/mbuf.h |   2 +-