| Message ID | 20201012232939.48481-6-j@getutm.app |
|---|---|
| State | New |
| Headers | show |
| Series | iOS and Apple Silicon host support | expand |
On 10/13/20 1:29 AM, Joelle van Dyne wrote: > From: osy <osy86@users.noreply.github.com> > > We cannot access /etc/resolv.conf on iOS so libslirp is modified to use > libresolv instead. > > Signed-off-by: Joelle van Dyne <j@getutm.app> > --- > .gitmodules | 2 +- > meson.build | 2 ++ > slirp | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/.gitmodules b/.gitmodules > index 2bdeeacef8..f23e859210 100644 > --- a/.gitmodules > +++ b/.gitmodules > @@ -51,7 +51,7 @@ > url = https://git.qemu.org/git/edk2.git > [submodule "slirp"] > path = slirp > - url = https://git.qemu.org/git/libslirp.git > + url = https://github.com/utmapp/libslirp.git NAck. You can not take over the SLiRP project submodule that way. I suggest getting your SLiRP changes merged with mainstream instead, see: https://gitlab.freedesktop.org/slirp/libslirp#contributing > [submodule "roms/opensbi"] > path = roms/opensbi > url = https://git.qemu.org/git/opensbi.git > diff --git a/meson.build b/meson.build > index 32cf08619f..da96e296e0 100644 > --- a/meson.build > +++ b/meson.build > @@ -996,6 +996,8 @@ if have_system > slirp_deps = [] > if targetos == 'windows' > slirp_deps = cc.find_library('iphlpapi') > + elif targetos == 'darwin' > + slirp_deps = cc.find_library('resolv') > endif > slirp_conf = configuration_data() > slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.')[0]) > diff --git a/slirp b/slirp > index ce94eba204..452c389d82 160000 > --- a/slirp > +++ b/slirp > @@ -1 +1 @@ > -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 > +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e
Hi On Tue, Oct 13, 2020 at 5:34 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 10/13/20 1:29 AM, Joelle van Dyne wrote: > > From: osy <osy86@users.noreply.github.com> > > > > We cannot access /etc/resolv.conf on iOS so libslirp is modified to use > > libresolv instead. > > > > Signed-off-by: Joelle van Dyne <j@getutm.app> > > --- > > .gitmodules | 2 +- > > meson.build | 2 ++ > > slirp | 2 +- > > 3 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/.gitmodules b/.gitmodules > > index 2bdeeacef8..f23e859210 100644 > > --- a/.gitmodules > > +++ b/.gitmodules > > @@ -51,7 +51,7 @@ > > url = https://git.qemu.org/git/edk2.git > > [submodule "slirp"] > > path = slirp > > - url = https://git.qemu.org/git/libslirp.git > > + url = https://github.com/utmapp/libslirp.git > > NAck. > > You can not take over the SLiRP project submodule that way. > > I suggest getting your SLiRP changes merged with mainstream > instead, see: > https://gitlab.freedesktop.org/slirp/libslirp#contributing > > I think he did: https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54 Btw, I also noticed the coroutine library submodule proposed in this series is a fork from the original library. Not sure what the upstream status is and whether this is fine. > [submodule "roms/opensbi"] > > path = roms/opensbi > > url = https://git.qemu.org/git/opensbi.git > > diff --git a/meson.build b/meson.build > > index 32cf08619f..da96e296e0 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -996,6 +996,8 @@ if have_system > > slirp_deps = [] > > if targetos == 'windows' > > slirp_deps = cc.find_library('iphlpapi') > > + elif targetos == 'darwin' > > + slirp_deps = cc.find_library('resolv') > > endif > > slirp_conf = configuration_data() > > slirp_conf.set('SLIRP_MAJOR_VERSION', > meson.project_version().split('.')[0]) > > diff --git a/slirp b/slirp > > index ce94eba204..452c389d82 160000 > > --- a/slirp > > +++ b/slirp > > @@ -1 +1 @@ > > -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 > > +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e > > >
On 10/13/20 4:38 PM, Marc-André Lureau wrote: > Hi > > On Tue, Oct 13, 2020 at 5:34 PM Philippe Mathieu-Daudé > <philmd@redhat.com <mailto:philmd@redhat.com>> wrote: > > On 10/13/20 1:29 AM, Joelle van Dyne wrote: > > From: osy <osy86@users.noreply.github.com > <mailto:osy86@users.noreply.github.com>> > > > > We cannot access /etc/resolv.conf on iOS so libslirp is modified > to use > > libresolv instead. > > > > Signed-off-by: Joelle van Dyne <j@getutm.app> > > --- > > .gitmodules | 2 +- > > meson.build | 2 ++ > > slirp | 2 +- > > 3 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/.gitmodules b/.gitmodules > > index 2bdeeacef8..f23e859210 100644 > > --- a/.gitmodules > > +++ b/.gitmodules > > @@ -51,7 +51,7 @@ > > url = https://git.qemu.org/git/edk2.git > <https://git.qemu.org/git/edk2.git> > > [submodule "slirp"] > > path = slirp > > - url = https://git.qemu.org/git/libslirp.git > <https://git.qemu.org/git/libslirp.git> > > + url = https://github.com/utmapp/libslirp.git > <https://github.com/utmapp/libslirp.git> > > NAck. > > You can not take over the SLiRP project submodule that way. > > I suggest getting your SLiRP changes merged with mainstream > instead, see: > https://gitlab.freedesktop.org/slirp/libslirp#contributing > <https://gitlab.freedesktop.org/slirp/libslirp#contributing> > > > I think he did: > https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54 > <https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54> I am being wary because the series is not posted as RFC. But from the cover it looks like a RFC series: * slirp updated to support DNS resolving using libresolv; a separate patch will be submitted to the project. To allow for builds to succeed, the .gitmodule is temporarily changed. We're not entirely sure how cross-project patches should be handled here. > > Btw, I also noticed the coroutine library submodule proposed in this > series is a fork from the original library. Not sure what the upstream > status is and whether this is fine. > > > [submodule "roms/opensbi"] > > path = roms/opensbi > > url = https://git.qemu.org/git/opensbi.git > <https://git.qemu.org/git/opensbi.git> > > diff --git a/meson.build b/meson.build > > index 32cf08619f..da96e296e0 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -996,6 +996,8 @@ if have_system > > slirp_deps = [] > > if targetos == 'windows' > > slirp_deps = cc.find_library('iphlpapi') > > + elif targetos == 'darwin' > > + slirp_deps = cc.find_library('resolv') > > endif > > slirp_conf = configuration_data() > > slirp_conf.set('SLIRP_MAJOR_VERSION', > meson.project_version().split('.')[0]) > > diff --git a/slirp b/slirp > > index ce94eba204..452c389d82 160000 > > --- a/slirp > > +++ b/slirp > > @@ -1 +1 @@ > > -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 > > +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e > > > > > -- > Marc-André Lureau
Sorry, I was not aware of the rules for RFC. I will remove this one from the v2 patch set. If and when the libslirp changes are in, what are the procedures for sending the QEMU side changes? -j On Tue, Oct 13, 2020 at 7:59 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 10/13/20 4:38 PM, Marc-André Lureau wrote: > > Hi > > > > On Tue, Oct 13, 2020 at 5:34 PM Philippe Mathieu-Daudé > > <philmd@redhat.com <mailto:philmd@redhat.com>> wrote: > > > > On 10/13/20 1:29 AM, Joelle van Dyne wrote: > > > From: osy <osy86@users.noreply.github.com > > <mailto:osy86@users.noreply.github.com>> > > > > > > We cannot access /etc/resolv.conf on iOS so libslirp is modified > > to use > > > libresolv instead. > > > > > > Signed-off-by: Joelle van Dyne <j@getutm.app> > > > --- > > > .gitmodules | 2 +- > > > meson.build | 2 ++ > > > slirp | 2 +- > > > 3 files changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/.gitmodules b/.gitmodules > > > index 2bdeeacef8..f23e859210 100644 > > > --- a/.gitmodules > > > +++ b/.gitmodules > > > @@ -51,7 +51,7 @@ > > > url = https://git.qemu.org/git/edk2.git > > <https://git.qemu.org/git/edk2.git> > > > [submodule "slirp"] > > > path = slirp > > > - url = https://git.qemu.org/git/libslirp.git > > <https://git.qemu.org/git/libslirp.git> > > > + url = https://github.com/utmapp/libslirp.git > > <https://github.com/utmapp/libslirp.git> > > > > NAck. > > > > You can not take over the SLiRP project submodule that way. > > > > I suggest getting your SLiRP changes merged with mainstream > > instead, see: > > https://gitlab.freedesktop.org/slirp/libslirp#contributing > > <https://gitlab.freedesktop.org/slirp/libslirp#contributing> > > > > > > I think he did: > > https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54 > > <https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54> > > I am being wary because the series is not posted as RFC. > > But from the cover it looks like a RFC series: > > * slirp updated to support DNS resolving using libresolv; a separate > patch will be submitted to the project. To allow for builds to > succeed, the .gitmodule is temporarily changed. We're not entirely > sure how cross-project patches should be handled here. > > > > > Btw, I also noticed the coroutine library submodule proposed in this > > series is a fork from the original library. Not sure what the upstream > > status is and whether this is fine. > > > > > [submodule "roms/opensbi"] > > > path = roms/opensbi > > > url = https://git.qemu.org/git/opensbi.git > > <https://git.qemu.org/git/opensbi.git> > > > diff --git a/meson.build b/meson.build > > > index 32cf08619f..da96e296e0 100644 > > > --- a/meson.build > > > +++ b/meson.build > > > @@ -996,6 +996,8 @@ if have_system > > > slirp_deps = [] > > > if targetos == 'windows' > > > slirp_deps = cc.find_library('iphlpapi') > > > + elif targetos == 'darwin' > > > + slirp_deps = cc.find_library('resolv') > > > endif > > > slirp_conf = configuration_data() > > > slirp_conf.set('SLIRP_MAJOR_VERSION', > > meson.project_version().split('.')[0]) > > > diff --git a/slirp b/slirp > > > index ce94eba204..452c389d82 160000 > > > --- a/slirp > > > +++ b/slirp > > > @@ -1 +1 @@ > > > -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 > > > +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e > > > > > > > > > > -- > > Marc-André Lureau > > > <div dir="ltr">Sorry, I was not aware of the rules for RFC. I will remove this one from the v2 patch set. If and when the libslirp changes are in, what are the procedures for sending the QEMU side changes?<div><br></div><div>-j</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Oct 13, 2020 at 7:59 AM Philippe Mathieu-Daudé <<a href="mailto:philmd@redhat.com">philmd@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">On 10/13/20 4:38 PM, Marc-André Lureau wrote:<br> > Hi<br> > <br> > On Tue, Oct 13, 2020 at 5:34 PM Philippe Mathieu-Daudé <br> > <<a href="mailto:philmd@redhat.com" target="_blank">philmd@redhat.com</a> <mailto:<a href="mailto:philmd@redhat.com" target="_blank">philmd@redhat.com</a>>> wrote:<br> > <br> > On 10/13/20 1:29 AM, Joelle van Dyne wrote:<br> > > From: osy <<a href="mailto:osy86@users.noreply.github.com" target="_blank">osy86@users.noreply.github.com</a><br> > <mailto:<a href="mailto:osy86@users.noreply.github.com" target="_blank">osy86@users.noreply.github.com</a>>><br> > ><br> > > We cannot access /etc/resolv.conf on iOS so libslirp is modified<br> > to use<br> > > libresolv instead.<br> > ><br> > > Signed-off-by: Joelle van Dyne <j@getutm.app><br> > > ---<br> > > .gitmodules | 2 +-<br> > > meson.build | 2 ++<br> > > slirp | 2 +-<br> > > 3 files changed, 4 insertions(+), 2 deletions(-)<br> > ><br> > > diff --git a/.gitmodules b/.gitmodules<br> > > index 2bdeeacef8..f23e859210 100644<br> > > --- a/.gitmodules<br> > > +++ b/.gitmodules<br> > > @@ -51,7 +51,7 @@<br> > > url = <a href="https://git.qemu.org/git/edk2.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/edk2.git</a><br> > <<a href="https://git.qemu.org/git/edk2.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/edk2.git</a>><br> > > [submodule "slirp"]<br> > > path = slirp<br> > > - url = <a href="https://git.qemu.org/git/libslirp.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/libslirp.git</a><br> > <<a href="https://git.qemu.org/git/libslirp.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/libslirp.git</a>><br> > > + url = <a href="https://github.com/utmapp/libslirp.git" rel="noreferrer" target="_blank">https://github.com/utmapp/libslirp.git</a><br> > <<a href="https://github.com/utmapp/libslirp.git" rel="noreferrer" target="_blank">https://github.com/utmapp/libslirp.git</a>><br> > <br> > NAck.<br> > <br> > You can not take over the SLiRP project submodule that way.<br> > <br> > I suggest getting your SLiRP changes merged with mainstream<br> > instead, see:<br> > <a href="https://gitlab.freedesktop.org/slirp/libslirp#contributing" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/slirp/libslirp#contributing</a><br> > <<a href="https://gitlab.freedesktop.org/slirp/libslirp#contributing" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/slirp/libslirp#contributing</a>><br> > <br> > <br> > I think he did: <br> > <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54</a> <br> > <<a href="https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/54</a>><br> <br> I am being wary because the series is not posted as RFC.<br> <br> But from the cover it looks like a RFC series:<br> <br> * slirp updated to support DNS resolving using libresolv; a separate<br> patch will be submitted to the project. To allow for builds to<br> succeed, the .gitmodule is temporarily changed. We're not entirely<br> sure how cross-project patches should be handled here.<br> <br> > <br> > Btw, I also noticed the coroutine library submodule proposed in this <br> > series is a fork from the original library. Not sure what the upstream <br> > status is and whether this is fine.<br> > <br> > > [submodule "roms/opensbi"]<br> > > path = roms/opensbi<br> > > url = <a href="https://git.qemu.org/git/opensbi.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/opensbi.git</a><br> > <<a href="https://git.qemu.org/git/opensbi.git" rel="noreferrer" target="_blank">https://git.qemu.org/git/opensbi.git</a>><br> > > diff --git a/meson.build b/meson.build<br> > > index 32cf08619f..da96e296e0 100644<br> > > --- a/meson.build<br> > > +++ b/meson.build<br> > > @@ -996,6 +996,8 @@ if have_system<br> > > slirp_deps = []<br> > > if targetos == 'windows'<br> > > slirp_deps = cc.find_library('iphlpapi')<br> > > + elif targetos == 'darwin'<br> > > + slirp_deps = cc.find_library('resolv')<br> > > endif<br> > > slirp_conf = configuration_data()<br> > > slirp_conf.set('SLIRP_MAJOR_VERSION',<br> > meson.project_version().split('.')[0])<br> > > diff --git a/slirp b/slirp<br> > > index ce94eba204..452c389d82 160000<br> > > --- a/slirp<br> > > +++ b/slirp<br> > > @@ -1 +1 @@<br> > > -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275<br> > > +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e<br> > <br> > <br> > <br> > <br> > -- <br> > Marc-André Lureau<br> <br> <br> </blockquote></div>
diff --git a/.gitmodules b/.gitmodules index 2bdeeacef8..f23e859210 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,7 +51,7 @@ url = https://git.qemu.org/git/edk2.git [submodule "slirp"] path = slirp - url = https://git.qemu.org/git/libslirp.git + url = https://github.com/utmapp/libslirp.git [submodule "roms/opensbi"] path = roms/opensbi url = https://git.qemu.org/git/opensbi.git diff --git a/meson.build b/meson.build index 32cf08619f..da96e296e0 100644 --- a/meson.build +++ b/meson.build @@ -996,6 +996,8 @@ if have_system slirp_deps = [] if targetos == 'windows' slirp_deps = cc.find_library('iphlpapi') + elif targetos == 'darwin' + slirp_deps = cc.find_library('resolv') endif slirp_conf = configuration_data() slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.')[0]) diff --git a/slirp b/slirp index ce94eba204..452c389d82 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 +Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e