* [PULL 1/1] slirp: update submodule to v4.2.0 + mingw-fix
2020-03-19 11:29 [PULL 0/1] Slirp patches Marc-André Lureau
@ 2020-03-19 11:29 ` Marc-André Lureau
2020-03-20 8:19 ` [PULL 0/1] Slirp patches Aleksandar Markovic
2020-03-20 10:14 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Marc-André Lureau @ 2020-03-19 11:29 UTC (permalink / raw)
To: qemu-devel; +Cc: samuel.thibault, Marc-André Lureau, peter.maydell
git shortlog
126c04acbabd7ad32c2b018fe10dfac2a3bc1210..7012a2c62e5b54eab88c119383022ec7ce86e9b2
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 (54):
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"
Merge branch 'mingw-fix' into 'master'
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'
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
slirp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slirp b/slirp
index 126c04acba..7012a2c62e 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 126c04acbabd7ad32c2b018fe10dfac2a3bc1210
+Subproject commit 7012a2c62e5b54eab88c119383022ec7ce86e9b2
--
2.25.0.rc2.1.g09a9a1a997
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PULL 0/1] Slirp patches
2020-03-19 11:29 [PULL 0/1] Slirp patches Marc-André Lureau
2020-03-19 11:29 ` [PULL 1/1] slirp: update submodule to v4.2.0 + mingw-fix Marc-André Lureau
@ 2020-03-20 8:19 ` Aleksandar Markovic
2020-03-20 9:33 ` Peter Maydell
2020-03-20 10:14 ` Peter Maydell
2 siblings, 1 reply; 5+ messages in thread
From: Aleksandar Markovic @ 2020-03-20 8:19 UTC (permalink / raw)
To: Marc-André Lureau
Cc: samuel.thibault@ens-lyon.org, qemu-devel@nongnu.org,
peter.maydell@linaro.org
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
четвртак, 19. март 2020., Marc-André Lureau <marcandre.lureau@redhat.com>
је написао/ла:
> The following changes since commit f57587c7d47b35b2d9b31def3a74d8
> 1bdb5475d7:
>
> 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 9f6b9fcc153f6d4f2e10193014d2eaf7329fa181:
>
> slirp: update submodule to v4.2.0 + mingw-fix (2020-03-19 12:17:43 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (1):
> slirp: update submodule to v4.2.0 + mingw-fix
>
> slirp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --
> 2.25.0.rc2.1.g09a9a1a997
>
>
>
Marc-Andre, hi.
This pull request has a very unusual form to me. In its cover letter, it
appears as if only one line of code is changed, while the patch 1/1
strangely suggests that there are number of underlying patches. I am really
puzzled how this pill request is created at all, and what is its real
content.
Did you use some novel method for creating pull requests? What is the
intended content of the pull request?
Yours,
Aleksandar
[-- Attachment #2: Type: text/html, Size: 1884 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL 0/1] Slirp patches
2020-03-20 8:19 ` [PULL 0/1] Slirp patches Aleksandar Markovic
@ 2020-03-20 9:33 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-03-20 9:33 UTC (permalink / raw)
To: Aleksandar Markovic
Cc: Marc-André Lureau, qemu-devel@nongnu.org,
samuel.thibault@ens-lyon.org
On Fri, 20 Mar 2020 at 08:19, Aleksandar Markovic
<aleksandar.qemu.devel@gmail.com> wrote:
> This pull request has a very unusual form to me. In its cover letter, it appears as if only one
> line of code is changed, while the patch 1/1 strangely suggests that there are number of
> underlying patches. I am really puzzled how this pill request is created at all, and what
>is its real content.
It's a submodule update -- they always look like this. From the point
of view of the
main QEMU repository, the only change is the one-line "submodule X moves from
commit hash Y to commit hash Z". That represents potentially a large number of
changes inside the submodule's git repository (which has its own git
commit log).
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL 0/1] Slirp patches
2020-03-19 11:29 [PULL 0/1] Slirp patches Marc-André Lureau
2020-03-19 11:29 ` [PULL 1/1] slirp: update submodule to v4.2.0 + mingw-fix Marc-André Lureau
2020-03-20 8:19 ` [PULL 0/1] Slirp patches Aleksandar Markovic
@ 2020-03-20 10:14 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-03-20 10:14 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Samuel Thibault, QEMU Developers
On Thu, 19 Mar 2020 at 11:33, 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 9f6b9fcc153f6d4f2e10193014d2eaf7329fa181:
>
> slirp: update submodule to v4.2.0 + mingw-fix (2020-03-19 12:17:43 +0100)
>
> ----------------------------------------------------------------
Hi; this fails to build on NetBSD:
In file included from /usr/pkg/lib/glib-2.0/include/glibconfig.h:9:0,
from /usr/pkg/include/glib-2.0/glib/gtypes.h:32,
from /usr/pkg/include/glib-2.0/glib/galloca.h:32,
from /usr/pkg/include/glib-2.0/glib.h:30,
from /home/qemu/qemu-test.1QzWG1/src/slirp/src/util.h:27,
from /home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.h:47,
from /home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:25:
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c: In function 'slirp_new':
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:277:29: error:
'SlirpConfig {aka const struct SlirpConfig}' has no member named
'if_data'
g_return_val_if_fail(cfg->if_mtu >= IF_MTU_MIN || cfg->if_mtu == 0, NULL);
^
/usr/pkg/include/glib-2.0/glib/gmacros.h:928:8: note: in definition of
macro '_G_BOOLEAN_EXPR'
if (expr) \
^
/usr/pkg/include/glib-2.0/glib/gmessages.h:599:9: note: in expansion
of macro 'G_LIKELY'
if (G_LIKELY (expr)) \
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:277:5: note: in
expansion of macro 'g_return_val_if_fail'
g_return_val_if_fail(cfg->if_mtu >= IF_MTU_MIN || cfg->if_mtu == 0, NULL);
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:277:58: error:
'SlirpConfig {aka const struct SlirpConfig}' has no member named
'if_data'
g_return_val_if_fail(cfg->if_mtu >= IF_MTU_MIN || cfg->if_mtu == 0, NULL);
fcntl(): Invalid argument
^
/usr/pkg/include/glib-2.0/glib/gmacros.h:928:8: note: in definition of
macro '_G_BOOLEAN_EXPR'
if (expr) \
^
/usr/pkg/include/glib-2.0/glib/gmessages.h:599:9: note: in expansion
of macro 'G_LIKELY'
if (G_LIKELY (expr)) \
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:277:5: note: in
expansion of macro 'g_return_val_if_fail'
g_return_val_if_fail(cfg->if_mtu >= IF_MTU_MIN || cfg->if_mtu == 0, NULL);
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:278:29: error:
'SlirpConfig {aka const struct SlirpConfig}' has no member named
'if_data'
g_return_val_if_fail(cfg->if_mtu <= IF_MTU_MAX, NULL);
^
/usr/pkg/include/glib-2.0/glib/gmacros.h:928:8: note: in definition of
macro '_G_BOOLEAN_EXPR'
if (expr) \
^
/usr/pkg/include/glib-2.0/glib/gmessages.h:599:9: note: in expansion
of macro 'G_LIKELY'
if (G_LIKELY (expr)) \
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:278:5: note: in
expansion of macro 'g_return_val_if_fail'
g_return_val_if_fail(cfg->if_mtu <= IF_MTU_MAX, NULL);
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:324:10: error:
'Slirp {aka struct Slirp}' has no member named 'if_data'
slirp->if_mtu = cfg->if_mtu == 0 ? IF_MTU_DEFAULT : cfg->if_mtu;
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:324:24: error:
'SlirpConfig {aka const struct SlirpConfig}' has no member named
'if_data'
slirp->if_mtu = cfg->if_mtu == 0 ? IF_MTU_DEFAULT : cfg->if_mtu;
^
/home/qemu/qemu-test.1QzWG1/src/slirp/src/slirp.c:324:60: error:
'SlirpConfig {aka const struct SlirpConfig}' has no member named
'if_data'
slirp->if_mtu = cfg->if_mtu == 0 ? IF_MTU_DEFAULT : cfg->if_mtu;
^
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread