* [PULL v3 0/1] Slirp patches
@ 2020-03-22 17:16 Marc-André Lureau
2020-03-22 17:16 ` [PULL v3 1/1] slirp: update submodule to v4.2.0+ Marc-André Lureau
2020-03-23 8:55 ` [PULL v3 0/1] Slirp patches Peter Maydell
0 siblings, 2 replies; 5+ messages in thread
From: Marc-André Lureau @ 2020-03-22 17:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Marc-André Lureau, samuel.thibault
The following changes since commit f57587c7d47b35b2d9b31def3a74d81bdb5475d7:
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-03-17' into staging (2020-03-19 10:18:07 +0000)
are available in the Git repository at:
https://github.com/elmarco/qemu.git tags/slirp-pull-request
for you to fetch changes up to 9c1f4f1b9bb4e5df43c4267d519938c1a2aa8e27:
slirp: update submodule to v4.2.0+ (2020-03-22 18:04:14 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
Marc-André Lureau (1):
slirp: update submodule to v4.2.0+
slirp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.25.0.rc2.1.g09a9a1a997
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL v3 1/1] slirp: update submodule to v4.2.0+
2020-03-22 17:16 [PULL v3 0/1] Slirp patches Marc-André Lureau
@ 2020-03-22 17:16 ` Marc-André Lureau
2020-03-23 11:39 ` Alex Bennée
2020-03-23 8:55 ` [PULL v3 0/1] Slirp patches Peter Maydell
1 sibling, 1 reply; 5+ messages in thread
From: Marc-André Lureau @ 2020-03-22 17:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Marc-André Lureau, samuel.thibault
git shortlog
126c04acbabd7ad32c2b018fe10dfac2a3bc1210..55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
5eraph (1):
Use specific outbound IP address
Akihiro Suda (8):
remove confusing comment that exists from ancient slirp
add slirp_new(SlirpConfig *, SlirpCb *, void *)
allow custom MTU
add disable_host_loopback (prohibit connections to 127.0.0.1)
add SlirpConfig version
emu: remove dead code
emu: disable by default
fix a typo in a comment
Anders Waldenborg (1):
state: fix loading of guestfwd state
Giuseppe Scrivano (1):
socket: avoid getpeername after shutdown(SHUT_WR)
Jindrich Novy (1):
Don't leak memory when reallocation fails.
Jordi Pujol Palomer (1):
fork_exec: correctly parse command lines that contain spaces
Marc-André Lureau (60):
Merge branch 'AkihiroSuda/libslirp-slirp4netns'
Merge branch 'fix-typo' into 'master'
meson: make it subproject friendly
Merge branch 'meson' into 'master'
misc: fix compilation warnings
Merge branch 'fix-shutdown-wr' into 'master'
sbuf: remove unused and undefined sbcopy() path
sbuf: check more strictly sbcopy() bounds with offset
sbuf: replace a comment with a runtime warning
Replace remaining malloc/free user with glib
tcp_attach() can no longer fail
state: can't ENOMEM
sbuf: use unsigned types
sbuf: simplify sbreserve()
dnssearch: use g_strv_length()
vmstate: silence scan-build warning
gitlab-ci: run scan-build
Merge branch 'mem-cleanups' into 'master'
libslirp.map: bind slirp_new to SLIRP_4.1 version
meson: fix libtool versioning
Release v4.1.0
Merge branch '4.1.0' into 'master'
CHANGELOG: start unreleased section
Merge branch 'add-unix' into 'master'
util: add G_SIZEOF_MEMBER() macro
Check bootp_filename is not going to be truncated
bootp: remove extra cast
bootp: replace simple snprintf() with strcpy()
tftp: clarify what is actually OACK m_len
tcp_emu: add more fixme/warnings comments
util: add slirp_fmt() helpers
dhcpv6: use slirp_fmt()
misc: use slirp_fmt0()
tftp: use slirp_fmt0()
tcp_ctl: use slirp_fmt()
tcp_emu: fix unsafe snprintf() usages
misc: improve error report
Use g_snprintf()
util: add gnuc format function attribute to slirp_fmt*
Merge branch 'aw-guestfwd-state' into 'master'
Merge branch 'slirp-fmt' into 'master'
socket: remove extra label and variable
socket: factor out sotranslate ipv4/ipv6 handling
socket: remove need for extra scope_id variable
socket: do not fallback on host loopback if get_dns_addr() failed
socket: do not fallback on loopback addr for addresses in our mask/prefix
Prepare for v4.2.0 release
Merge branch 'translate-fix' into 'master'
Merge branch 'release-v4.2.0' into 'master'
changelog: post-release
changelog: fix link
.gitlab-ci: add --werror, treat CI build warnings as errors
Revert "socket: remove need for extra scope_id variable"
Teach slirp_version_string() to return vcs version
Merge branch 'mingw-fix' into 'master'
Merge branch 'vcs-version' into 'master'
meson: bump required version to 0.49
build-sys: fix NetBSD build regression
Merge branch 'netbsd-fix' into 'master'
build-sys: make libslirp-version.h depend on Makefile
PanNengyuan (1):
libslirp: fix NULL pointer dereference in tcp_sockclosed
Philippe Mathieu-Daudé (1):
Add a git-publish configuration file
Prasad J Pandit (4):
slirp: ncsi: compute checksum for valid data length
slirp: use correct size while emulating IRC commands
slirp: use correct size while emulating commands
slirp: tftp: restrict relative path access
Renzo Davoli (2):
Add slirp_remove_guestfwd()
Add slirp_add_unix()
Samuel Thibault (14):
ip_reass: explain why we should not always update the q pointer
Merge branch 'comment' into 'master'
Merge branch 'no-emu' into 'master'
Fix bogus indent, no source change
ip_reass: Fix use after free
Merge branch 'reass2' into 'master'
Make host receive broadcast packets
arp: Allow 0.0.0.0 destination address
Merge branch 'warnings' into 'master'
Merge branch 'arp_0' into 'master'
Merge branch 'broadcast' into 'master'
tcp_emu: Fix oob access
Merge branch 'oob' into 'master'
Merge branch 'master' into 'master'
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
slirp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slirp b/slirp
index 126c04acba..55ab21c9a3 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 126c04acbabd7ad32c2b018fe10dfac2a3bc1210
+Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
--
2.25.0.rc2.1.g09a9a1a997
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL v3 0/1] Slirp patches
2020-03-22 17:16 [PULL v3 0/1] Slirp patches Marc-André Lureau
2020-03-22 17:16 ` [PULL v3 1/1] slirp: update submodule to v4.2.0+ Marc-André Lureau
@ 2020-03-23 8:55 ` Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-03-23 8:55 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Samuel Thibault, QEMU Developers
On Sun, 22 Mar 2020 at 17:16, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> The following changes since commit f57587c7d47b35b2d9b31def3a74d81bdb5475d7:
>
> Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-03-17' into staging (2020-03-19 10:18:07 +0000)
>
> are available in the Git repository at:
>
> https://github.com/elmarco/qemu.git tags/slirp-pull-request
>
> for you to fetch changes up to 9c1f4f1b9bb4e5df43c4267d519938c1a2aa8e27:
>
> slirp: update submodule to v4.2.0+ (2020-03-22 18:04:14 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (1):
> slirp: update submodule to v4.2.0+
>
> slirp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL v3 1/1] slirp: update submodule to v4.2.0+
2020-03-22 17:16 ` [PULL v3 1/1] slirp: update submodule to v4.2.0+ Marc-André Lureau
@ 2020-03-23 11:39 ` Alex Bennée
2020-03-23 11:49 ` Marc-André Lureau
0 siblings, 1 reply; 5+ messages in thread
From: Alex Bennée @ 2020-03-23 11:39 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: peter.maydell, qemu-devel, samuel.thibault
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> git shortlog
> 126c04acbabd7ad32c2b018fe10dfac2a3bc1210..55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
>
<snip>
> build-sys: make libslirp-version.h depend on Makefile
FWIW I ran into a build error when I updated to the latest tree. It was
failing while building version.o. In the end I tracked it down to a
duplicate of slirp/src/libslirp-version.h (one in the build tree and one
in the src tree). I didn't spot it for a while because git was telling
me the tree was clean because of .gitignore:
/src/libslirp-version.h
Is this stale now? Is slirp always built out of tree?
--
Alex Bennée
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL v3 1/1] slirp: update submodule to v4.2.0+
2020-03-23 11:39 ` Alex Bennée
@ 2020-03-23 11:49 ` Marc-André Lureau
0 siblings, 0 replies; 5+ messages in thread
From: Marc-André Lureau @ 2020-03-23 11:49 UTC (permalink / raw)
To: Alex Bennée; +Cc: Peter Maydell, QEMU, Samuel Thibault
Hi
On Mon, Mar 23, 2020 at 12:40 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Marc-André Lureau <marcandre.lureau@redhat.com> writes:
>
> > git shortlog
> > 126c04acbabd7ad32c2b018fe10dfac2a3bc1210..55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
> >
> <snip>
> > build-sys: make libslirp-version.h depend on Makefile
>
> FWIW I ran into a build error when I updated to the latest tree. It was
> failing while building version.o. In the end I tracked it down to a
> duplicate of slirp/src/libslirp-version.h (one in the build tree and one
> in the src tree). I didn't spot it for a while because git was telling
> me the tree was clean because of .gitignore:
>
> /src/libslirp-version.h
>
> Is this stale now? Is slirp always built out of tree?
>
The rule to build libslirp-version.h hasn't changed much:
https://gitlab.freedesktop.org/slirp/libslirp/-/blob/master/Makefile#L26
I think this means that at some point, you built qemu/slirp in tree,
and /src/libslirp-version.h was left, conflicting with out-of-tree
version.
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-23 11:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-22 17:16 [PULL v3 0/1] Slirp patches Marc-André Lureau
2020-03-22 17:16 ` [PULL v3 1/1] slirp: update submodule to v4.2.0+ Marc-André Lureau
2020-03-23 11:39 ` Alex Bennée
2020-03-23 11:49 ` Marc-André Lureau
2020-03-23 8:55 ` [PULL v3 0/1] Slirp patches Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.