[v1] Slirp patches

[PULL 0/1] Slirp patches

Posted by Marc-André Lureau 5 years, 7 months ago

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)

----------------------------------------------------------------

----------------------------------------------------------------

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

Re: [PULL 0/1] Slirp patches

Posted by Peter Maydell 5 years, 7 months ago

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

Re: [PULL 0/1] Slirp patches

Posted by Aleksandar Markovic 5 years, 7 months ago

четвртак, 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

Re: [PULL 0/1] Slirp patches

Posted by Peter Maydell 5 years, 7 months ago

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