[RFC,1/6] xen: link against xentoolcore

Commit Message

Anthony PERARD Sept. 25, 2017, 3:01 p.m. UTC

On Fri, Sep 15, 2017 at 07:09:54PM +0100, Ian Jackson wrote:
> Signed-off-by: Ian Jackson <[e-mail]>
> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Here is a patch that I think will work, if libxentoolcore is release in
Xen 4.10.

Comments

Ian Jackson Oct. 3, 2017, 5:25 p.m. UTC | #1

Anthony PERARD writes ("Re: [Qemu-devel] [PATCH RFC 1/6] xen: link against xentoolcore"):
> Here is a patch that I think will work, if libxentoolcore is release in
> Xen 4.10.

Thanks very much.  I have, more or less, adopted this.  Thanks also
for your other comments, which I have addressed.

Ian.

Patch

diff --git a/configure b/configure
index 133a5757ef..a22ff71294 100755
--- a/configure
+++ b/configure
@@ -2071,7 +2071,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"
@@ -2103,18 +2103,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