diff mbox series

[v5.1,1/8] xen: link against xentoolcore

Message ID 1508506702-17704-1-git-send-email-ian.jackson@eu.citrix.com
State New
Headers show
Series [v5.1,1/8] xen: link against xentoolcore | expand

Commit Message

Ian Jackson Oct. 20, 2017, 1:38 p.m. UTC 
From: Anthony PERARD <anthony.perard@citrix.com>

Xen libraries in 4.10 include a new xentoolcore library.  This
contains the xentoolcore_restrict_all function which we are about to
want to use.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v5: More truthful commit message.
---
 configure | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Stefano Stabellini Oct. 26, 2017, 10:41 p.m. UTC | #1 
On Fri, 20 Oct 2017, Ian Jackson wrote:
> From: Anthony PERARD <anthony.perard@citrix.com>
> 
> Xen libraries in 4.10 include a new xentoolcore library.  This
> contains the xentoolcore_restrict_all function which we are about to
> want to use.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
> v5: More truthful commit message.
> ---
>  configure | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index fd7e3a5..6f691df 100755
> --- a/configure
> +++ b/configure
> @@ -2072,7 +2072,7 @@ if test "$xen" != "no" ; then
>        $($pkg_config --modversion xencontrol | sed 's/\./ /g') )"
>      xen=yes
>      xen_pc="xencontrol xenstore xenguest xenforeignmemory xengnttab"
> -    xen_pc="$xen_pc xenevtchn xendevicemodel"
> +    xen_pc="$xen_pc xenevtchn xendevicemodel xentoolcore"
>      QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)"
>      libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu"
>      LDFLAGS="$($pkg_config --libs $xen_pc) $LDFLAGS"
> @@ -2104,18 +2104,20 @@ EOF
>          cat > $TMPC <<EOF &&
>  #undef XC_WANT_COMPAT_MAP_FOREIGN_API
>  #include <xenforeignmemory.h>
> +#include <xentoolcore.h>
>  int main(void) {
>    xenforeignmemory_handle *xfmem;
>  
>    xfmem = xenforeignmemory_open(0, 0);
>    xenforeignmemory_map2(xfmem, 0, 0, 0, 0, 0, 0, 0);
> +  xentoolcore_restrict_all(0);
>  
>    return 0;
>  }
>  EOF
> -        compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs"
> +        compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs -lxentoolcore"
>        then
> -      xen_stable_libs="-lxendevicemodel $xen_stable_libs"
> +      xen_stable_libs="-lxendevicemodel $xen_stable_libs -lxentoolcore"

Is it on purpose that -lxentoolcore is at the end of this string rather
than before $xen_stable_libs?

In any case

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


>        xen_ctrl_version=41000
>        xen=yes
>      elif
> -- 
> 2.1.4
>
Ian Jackson Oct. 27, 2017, 10:12 a.m. UTC | #2 
Stefano Stabellini writes ("Re: [PATCH v5.1 1/8] xen: link against xentoolcore"):
> On Fri, 20 Oct 2017, Ian Jackson wrote:
> >        then
> > -      xen_stable_libs="-lxendevicemodel $xen_stable_libs"
> > +      xen_stable_libs="-lxendevicemodel $xen_stable_libs -lxentoolcore"
> 
> Is it on purpose that -lxentoolcore is at the end of this string rather
> than before $xen_stable_libs?

Yes.  xentoolcore is required by the other libraries, and this is
therefore the correct ordering for situations where the link order
matters.

> In any case
> 
> Acked-by: Stefano Stabellini <sstabellini@kernel.org>

Thanks,
Ian.
diff mbox series

Patch

diff --git a/configure b/configure
index fd7e3a5..6f691df 100755
--- a/configure
+++ b/configure
@@ -2072,7 +2072,7 @@  if test "$xen" != "no" ; then
       $($pkg_config --modversion xencontrol | sed 's/\./ /g') )"
     xen=yes
     xen_pc="xencontrol xenstore xenguest xenforeignmemory xengnttab"
-    xen_pc="$xen_pc xenevtchn xendevicemodel"
+    xen_pc="$xen_pc xenevtchn xendevicemodel xentoolcore"
     QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)"
     libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu"
     LDFLAGS="$($pkg_config --libs $xen_pc) $LDFLAGS"
@@ -2104,18 +2104,20 @@  EOF
         cat > $TMPC <<EOF &&
 #undef XC_WANT_COMPAT_MAP_FOREIGN_API
 #include <xenforeignmemory.h>
+#include <xentoolcore.h>
 int main(void) {
   xenforeignmemory_handle *xfmem;
 
   xfmem = xenforeignmemory_open(0, 0);
   xenforeignmemory_map2(xfmem, 0, 0, 0, 0, 0, 0, 0);
+  xentoolcore_restrict_all(0);
 
   return 0;
 }
 EOF
-        compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs"
+        compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs -lxentoolcore"
       then
-      xen_stable_libs="-lxendevicemodel $xen_stable_libs"
+      xen_stable_libs="-lxendevicemodel $xen_stable_libs -lxentoolcore"
       xen_ctrl_version=41000
       xen=yes
     elif