Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
was just wrong: there is one function from libxenguest used in the
bindings, so readd the library again.

While at it remove the unused PATH_LIBXL setting.

Fixes: 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/python/setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/python/setup.py b/tools/python/setup.py
index 8254464aff..1afe800479 100644
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -10,7 +10,7 @@ PATH_XEN      = XEN_ROOT + "/tools/include"
 PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog"
 PATH_LIBXENEVTCHN = XEN_ROOT + "/tools/libs/evtchn"
 PATH_LIBXENCTRL = XEN_ROOT + "/tools/libs/ctrl"
-PATH_LIBXL    = XEN_ROOT + "/tools/libxl"
+PATH_LIBXENGUEST = XEN_ROOT + "/tools/libs/guest"
 PATH_XENSTORE = XEN_ROOT + "/tools/libs/store"
 
 xc = Extension("xc",
@@ -19,10 +19,11 @@ xc = Extension("xc",
                                       PATH_LIBXENTOOLLOG + "/include",
                                       PATH_LIBXENEVTCHN + "/include",
                                       PATH_LIBXENCTRL + "/include",
+                                      PATH_LIBXENGUEST + "/include",
                                       "xen/lowlevel/xc" ],
-               library_dirs       = [ PATH_LIBXENCTRL ],
-               libraries          = [ "xenctrl" ],
-               depends            = [ PATH_LIBXENCTRL + "/libxenctrl.so" ],
+               library_dirs       = [ PATH_LIBXENCTRL, PATH_LIBXENGUEST ],
+               libraries          = [ "xenctrl", "xenguest" ],
+               depends            = [ PATH_LIBXENCTRL + "/libxenctrl.so", PATH_LIBXENGUEST + "/libxenguest.so" ],
                extra_link_args    = [ "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ],
                sources            = [ "xen/lowlevel/xc/xc.c" ])
 
-- 
2.26.2

On Sat, Sep 12, 2020 at 03:58:07PM +0200, Juergen Gross wrote:
> Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> was just wrong: there is one function from libxenguest used in the
> bindings, so readd the library again.
> 
> While at it remove the unused PATH_LIBXL setting.
> 
> Fixes: 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Wei Liu <wl@xen.org>

Since this blocks osstest and is just putting back old code I want to
commit it as quickly as possible.

On Mon, Sep 14, 2020 at 09:35:42AM +0000, Wei Liu wrote:
> On Sat, Sep 12, 2020 at 03:58:07PM +0200, Juergen Gross wrote:
> > Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> > was just wrong: there is one function from libxenguest used in the
> > bindings, so readd the library again.
> > 
> > While at it remove the unused PATH_LIBXL setting.
> > 
> > Fixes: 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> > Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Wei Liu <wl@xen.org>

Acked-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

> Since this blocks osstest and is just putting back old code I want to
> commit it as quickly as possible.

-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?

On Mon, Sep 14, 2020 at 11:38:19AM +0200, Marek Marczykowski-Górecki wrote:
> On Mon, Sep 14, 2020 at 09:35:42AM +0000, Wei Liu wrote:
> > On Sat, Sep 12, 2020 at 03:58:07PM +0200, Juergen Gross wrote:
> > > Commit 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> > > was just wrong: there is one function from libxenguest used in the
> > > bindings, so readd the library again.
> > > 
> > > While at it remove the unused PATH_LIBXL setting.
> > > 
> > > Fixes: 7c273ffdd0e91 ("tools/python: drop libxenguest from setup.py")
> > > Signed-off-by: Juergen Gross <jgross@suse.com>
> > 
> > Acked-by: Wei Liu <wl@xen.org>
> 
> Acked-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> 

Thanks for the quick turnaround, Marek.